1
1
Add a missing value for the configure file. 
Fix the bug that generating wrong svn version number.
Correct the wrong string length of the headnode name.

cmr:v1.5
cmr:v1.3.4

This commit was SVN r22219.
Этот коммит содержится в:
Shiqing Fan 2009-11-18 09:43:47 +00:00
родитель 840766a894
Коммит 11ad25fa77
4 изменённых файлов: 8 добавлений и 5 удалений

Просмотреть файл

@ -1,6 +1,8 @@
IF(${WANT_SVN})
SET(${PROJECT_NAME}_WANT_SVN 1)
ELSE(${WANT_SVN})
SET(${PROJECT_NAME}_WANT_SVN 0)
ENDIF(${WANT_SVN})
STRING(TOLOWER ${PROJECT_NAME} PROJECT_NAME_LOWERCASE)

Просмотреть файл

@ -79,12 +79,13 @@ IF("${WANT_SVN}" STREQUAL "1")
ENDIF(${RESULT} EQUAL 0 AND NOT "${OUTPUT}" STREQUAL "exported")
ENDIF(NOT RESULT STREQUAL "0")
ELSE("${SVN_R}" STREQUAL "-1")
SET(SVN_VERSION ${SVN_R})
ENDIF("${SVN_R}" STREQUAL "-1")
SET(VERSION_STRING ${VERSION_STRING}${SVN_VERSION})
ELSE("${WANT_SVN}" STREQUAL "1")
SET(SVN_VERSION ${SVN_R})
ENDIF("${WANT_SVN}" STREQUAL "1")
# Set opal versions

Просмотреть файл

@ -569,7 +569,7 @@
#cmakedefine HAVE_UINT8_T 1
/* Define to 1 if the system has the type `uintptr_t'. */
#cmakedefine HAVE_UINTPTR_T
#cmakedefine HAVE_UINTPTR_T 1
/* Define to 1 if you have the <ulimit.h> header file. */
#cmakedefine HAVE_ULIMIT_H 1

Просмотреть файл

@ -2,7 +2,7 @@
* Copyright (c) 2004-2007 The University of Tennessee and The University
* of Tennessee Research Foundation. All rights
* reserved.
* Copyright (c) 2004-2008 High Performance Computing Center Stuttgart,
* Copyright (c) 2004-2009 High Performance Computing Center Stuttgart,
* University of Stuttgart. All rights reserved.
* $COPYRIGHT$
*
@ -94,7 +94,7 @@ static int orte_ras_ccp_allocate(opal_list_t *nodes)
}
/* Get rid of the beginning '//'. */
for( i = 0; i < sizeof(cluster_head) * 2 - 2; i++){
for( i = 0; i < len - 2; i++){
cluster_head[i] = cluster_head[i+2];
cluster_head[i+2] = '\0';
}