From 3a070af2e0076db5432ce00a012dc9a1ea31cbe8 Mon Sep 17 00:00:00 2001 From: navarrop Date: Tue, 9 Mar 2010 16:03:49 +0000 Subject: [PATCH] Correct some bug. git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@7211 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- buildtools/CPACK/src/CMakeMakeExeLib.txt | 4 ++-- buildtools/CPACK/src/CMakeTest.txt | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/buildtools/CPACK/src/CMakeMakeExeLib.txt b/buildtools/CPACK/src/CMakeMakeExeLib.txt index 21098a4ead..b5621646c6 100644 --- a/buildtools/CPACK/src/CMakeMakeExeLib.txt +++ b/buildtools/CPACK/src/CMakeMakeExeLib.txt @@ -120,7 +120,7 @@ add_subdirectory(${PROJECT_DIRECTORY}/examples/simdag/metaxml) add_subdirectory(${PROJECT_DIRECTORY}/examples/simdag/properties) add_subdirectory(${PROJECT_DIRECTORY}/examples/smpi) -if(HAVE_JAVA AND NOT init) +if(HAVE_JAVA) message("Make : src/simgrid.jar with : ${JAVA_COMPILE}") exec_program("rm -rf ${PROJECT_DIRECTORY}/src/.classes" OUTPUT_VARIABLE "SIM_JAR_OK") exec_program("rm ${PROJECT_DIRECTORY}/src/simgrid.jar" OUTPUT_VARIABLE "SIM_JAR_OK") @@ -140,4 +140,4 @@ if(HAVE_JAVA AND NOT init) exec_program("rm ${PROJECT_DIRECTORY}/examples/java/suspend/*.class" OUTPUT_VARIABLE "SIM_JAR_OK") exec_program("${JAVA_COMPILE}" ARGS "-d ${PROJECT_DIRECTORY}/examples/java/suspend -cp ${PROJECT_DIRECTORY}/src/simgrid.jar ${PROJECT_DIRECTORY}/examples/java/suspend/*.java" OUTPUT_VARIABLE "SIM_JAR_OK") -endif(HAVE_JAVA AND NOT init) +endif(HAVE_JAVA) diff --git a/buildtools/CPACK/src/CMakeTest.txt b/buildtools/CPACK/src/CMakeTest.txt index a1dafa333a..be905771aa 100644 --- a/buildtools/CPACK/src/CMakeTest.txt +++ b/buildtools/CPACK/src/CMakeTest.txt @@ -1,3 +1,7 @@ +### Be sure we can execut some launch file +exec_program("chmod a=rwx ${PROJECT_DIRECTORY}/buildtools/CPACK/test_java.sh" OUTPUT_VARIABLE "OKITOKI") +exec_program("chmod a=rwx ${PROJECT_DIRECTORY}/src/smpi/smpirun" OUTPUT_VARIABLE "OKITOKI") + ### For code coverage ### Set some variables SET(UPDATE_TYPE "svn") @@ -227,6 +231,3 @@ IF(${ARCH_32_BITS}) set_tests_properties(amok-bandwidth-sg-32 PROPERTIES WILL_FAIL true) set_tests_properties(amok-saturate-sg-32 PROPERTIES WILL_FAIL true) ENDIF(${ARCH_32_BITS}) - -### Be sure we can execut some launch file -exec_program("chmod a=rwx ${PROJECT_DIRECTORY}/buildtools/CPACK/test_java.sh ${PROJECT_DIRECTORY}/src/smpi/smpirun") -- 2.30.2