From: navarrop <navarrop@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Date: Tue, 30 Mar 2010 15:23:18 +0000 (+0000)
Subject: Enable java with distcheck.
X-Git-Tag: SVN~340
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/60def087fd2fb718926d91c8fdcd30e04ba696a7

Enable java with distcheck.

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@7400 48e7efb5-ca39-0410-a469-dd3cf9ba447f
---

diff --git a/buildtools/Cmake/src/CMakeDistrib.txt b/buildtools/Cmake/src/CMakeDistrib.txt
index 8ebffaf3a4..725f4a266a 100644
--- a/buildtools/Cmake/src/CMakeDistrib.txt
+++ b/buildtools/Cmake/src/CMakeDistrib.txt
@@ -111,7 +111,7 @@ COMMAND make package
 COMMAND rm -rf ${PROJECT_DIRECTORY}/_CPack_Packages
 COMMAND tar xvf ${CPACK_PACKAGE_FILE_NAME}.tar.bz2
 COMMAND cd ${CPACK_PACKAGE_FILE_NAME}
-COMMAND cd ${CPACK_PACKAGE_FILE_NAME} && cmake -Ddisable_java=on .
+COMMAND cd ${CPACK_PACKAGE_FILE_NAME} && cmake .
 COMMAND cd ${CPACK_PACKAGE_FILE_NAME} && make
 COMMAND cd ${CPACK_PACKAGE_FILE_NAME} && make test
 COMMAND rm -rf ${CPACK_PACKAGE_FILE_NAME}
diff --git a/buildtools/Cmake/src/CMakeMakeExeLib.txt b/buildtools/Cmake/src/CMakeMakeExeLib.txt
index 547f4c2ac7..95cdf3fe7a 100644
--- a/buildtools/Cmake/src/CMakeMakeExeLib.txt
+++ b/buildtools/Cmake/src/CMakeMakeExeLib.txt
@@ -153,7 +153,7 @@ file(APPEND	${PROJECT_DIRECTORY}/make_simgrid_java.sh "mkdir ${PROJECT_DIRECTORY
 file(APPEND	${PROJECT_DIRECTORY}/make_simgrid_java.sh "cp ${PROJECT_DIRECTORY}/src/surf/simgrid.dtd ${PROJECT_DIRECTORY}/src/.classes/surf/simgrid.dtd\n")
 
 file(APPEND	${PROJECT_DIRECTORY}/make_simgrid_java.sh  "\n")
-file(APPEND	${PROJECT_DIRECTORY}/make_simgrid_java.sh "${JAVA_ARCHIVE} cvf ./src/simgrid.jar -C ${PROJECT_DIRECTORY}/src/.classes -silent . &>/dev/null\n")
+file(APPEND	${PROJECT_DIRECTORY}/make_simgrid_java.sh "${JAVA_ARCHIVE} cvf ./src/simgrid.jar -C ${PROJECT_DIRECTORY}/src/.classes . &>/dev/null\n")
 
 file(APPEND	${PROJECT_DIRECTORY}/make_simgrid_java.sh  "\n")
 file(APPEND	${PROJECT_DIRECTORY}/make_simgrid_java.sh "echo \"[ 50%] Building JAR object src/simgrid.jar\"\n")