Add make distcheck command and rename make package by make dist.

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

diff --git a/.gitignore b/.gitignore
index ad5f0b9..2bb0937 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -30,6 +30,7 @@ src/*_unit.c
 src/supernovae_*.c
 src/simgrid_units_main.c
 src/gras_config.h.in
+make_simgrid_java.sh
 
 testgraph.dot
 testgraph.xml

diff --git a/buildtools/Cmake/src/CMakeDistrib.txt b/buildtools/Cmake/src/CMakeDistrib.txt
index 6930171..8ebffaf 100644 (file)
--- a/buildtools/Cmake/src/CMakeDistrib.txt
+++ b/buildtools/Cmake/src/CMakeDistrib.txt
@@ -101,4 +101,21 @@ COMMAND rm ${PROJECT_DIRECTORY}/buildtools/Cmake/src/doc/Makefile
 WORKING_DIRECTORY "${PROJECT_DIRECTORY}/buildtools/Cmake/src/doc"
 )
 
+add_custom_target(dist
+COMMAND make package
+COMMAND rm -rf ${PROJECT_DIRECTORY}/_CPack_Packages
+WORKING_DIRECTORY "${PROJECT_DIRECTORY}"
+)
+add_custom_target(distcheck
+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} && make
+COMMAND cd ${CPACK_PACKAGE_FILE_NAME} && make test
+COMMAND rm -rf ${CPACK_PACKAGE_FILE_NAME}
+WORKING_DIRECTORY "${PROJECT_DIRECTORY}"
+)
+
 include(CPack)

diff --git a/buildtools/Cmake/src/CMakeMakeExeLib.txt b/buildtools/Cmake/src/CMakeMakeExeLib.txt
index 3b54818..547f4c2 100644 (file)
--- a/buildtools/Cmake/src/CMakeMakeExeLib.txt
+++ b/buildtools/Cmake/src/CMakeMakeExeLib.txt
@@ -125,25 +125,55 @@ add_subdirectory(${PROJECT_DIRECTORY}/examples/simdag/properties)
 add_subdirectory(${PROJECT_DIRECTORY}/examples/smpi)
 
 if(HAVE_JAVA)
-       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")
-       exec_program("mkdir ${PROJECT_DIRECTORY}/src/.classes" OUTPUT_VARIABLE "SIM_JAR_OK")
+
+       add_custom_command(TARGET simgrid
+       POST_BUILD
+       COMMAND echo "[  0%] Building JAR object src/simgrid.jar"
+       COMMAND /bin/sh ${PROJECT_DIRECTORY}/make_simgrid_java.sh
+       COMMAND echo "[100%] Building JAR object src/simgrid.jar"
+       WORKING_DIRECTORY "${PROJECT_DIRECTORY}"
+       )
+
        foreach(file ${JMSG_JAVA_SRC})
                set(java_src_to_compile "${java_src_to_compile} ${file}")       
        endforeach(file ${JMSG_JAVA_SRC})
 
-       exec_program("${JAVA_COMPILE}" ARGS "-d ${PROJECT_DIRECTORY}/src/.classes -cp ${PROJECT_DIRECTORY}/src/.classes ${java_src_to_compile}" OUTPUT_VARIABLE "SIM_COMPILE_OK")       
-       exec_program("mkdir ${PROJECT_DIRECTORY}/src/.classes/surf" OUTPUT_VARIABLE "SIM_JAR_OK")
-       exec_program("cp ${PROJECT_DIRECTORY}/src/surf/simgrid.dtd ${PROJECT_DIRECTORY}/src/.classes/surf/simgrid.dtd" OUTPUT_VARIABLE "SIM_JAR_OK")
-       exec_program("${JAVA_ARCHIVE}" ARGS "cvf ./src/simgrid.jar -C ${PROJECT_DIRECTORY}/src/.classes ." OUTPUT_VARIABLE "SIM_JAR_OK")
+file(WRITE     ${PROJECT_DIRECTORY}/make_simgrid_java.sh 
+"\#! /bin/sh\n\n")
+
+file(APPEND    ${PROJECT_DIRECTORY}/make_simgrid_java.sh "rm -rf ${PROJECT_DIRECTORY}/src/.classes\n")
+file(APPEND    ${PROJECT_DIRECTORY}/make_simgrid_java.sh "rm ${PROJECT_DIRECTORY}/src/simgrid.jar\n")
+file(APPEND    ${PROJECT_DIRECTORY}/make_simgrid_java.sh "mkdir ${PROJECT_DIRECTORY}/src/.classes\n")
+
+file(APPEND    ${PROJECT_DIRECTORY}/make_simgrid_java.sh  "\n")
+file(APPEND    ${PROJECT_DIRECTORY}/make_simgrid_java.sh "${JAVA_COMPILE} -d ${PROJECT_DIRECTORY}/src/.classes -cp ${PROJECT_DIRECTORY}/src/.classes ${java_src_to_compile}\n")
+
+file(APPEND    ${PROJECT_DIRECTORY}/make_simgrid_java.sh  "\n")
+file(APPEND    ${PROJECT_DIRECTORY}/make_simgrid_java.sh "mkdir ${PROJECT_DIRECTORY}/src/.classes/surf\n")
+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")
 
-       exec_program("rm ${PROJECT_DIRECTORY}/examples/java/basic/*.class" OUTPUT_VARIABLE "SIM_JAR_OK")
-       exec_program("${JAVA_COMPILE}" ARGS "-d ${PROJECT_DIRECTORY}/examples/java/basic -cp ${PROJECT_DIRECTORY}/src/simgrid.jar ${PROJECT_DIRECTORY}/examples/java/basic/*.java"  OUTPUT_VARIABLE "SIM_JAR_OK")
-       exec_program("rm ${PROJECT_DIRECTORY}/examples/java/ping_pong/*.class" OUTPUT_VARIABLE "SIM_JAR_OK")
-       exec_program("${JAVA_COMPILE}" ARGS "-d ${PROJECT_DIRECTORY}/examples/java/ping_pong -cp ${PROJECT_DIRECTORY}/src/simgrid.jar ${PROJECT_DIRECTORY}/examples/java/ping_pong/*.java"  OUTPUT_VARIABLE "SIM_JAR_OK")
-       exec_program("rm ${PROJECT_DIRECTORY}/examples/java/comm_time/*.class" OUTPUT_VARIABLE "SIM_JAR_OK")
-       exec_program("${JAVA_COMPILE}" ARGS "-d ${PROJECT_DIRECTORY}/examples/java/comm_time -cp ${PROJECT_DIRECTORY}/src/simgrid.jar ${PROJECT_DIRECTORY}/examples/java/comm_time/*.java"  OUTPUT_VARIABLE "SIM_JAR_OK")
-       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")
+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")
+
+file(APPEND    ${PROJECT_DIRECTORY}/make_simgrid_java.sh  "\n")
+file(APPEND    ${PROJECT_DIRECTORY}/make_simgrid_java.sh "rm ${PROJECT_DIRECTORY}/examples/java/basic/*.class\n")
+file(APPEND    ${PROJECT_DIRECTORY}/make_simgrid_java.sh "${JAVA_COMPILE} -d ${PROJECT_DIRECTORY}/examples/java/basic -cp ${PROJECT_DIRECTORY}/src/simgrid.jar ${PROJECT_DIRECTORY}/examples/java/basic/*.java\n")
+
+file(APPEND    ${PROJECT_DIRECTORY}/make_simgrid_java.sh  "\n")
+file(APPEND    ${PROJECT_DIRECTORY}/make_simgrid_java.sh "rm ${PROJECT_DIRECTORY}/examples/java/ping_pong/*.class\n")
+file(APPEND    ${PROJECT_DIRECTORY}/make_simgrid_java.sh "${JAVA_COMPILE} -d ${PROJECT_DIRECTORY}/examples/java/ping_pong -cp ${PROJECT_DIRECTORY}/src/simgrid.jar ${PROJECT_DIRECTORY}/examples/java/ping_pong/*.java\n")
+
+file(APPEND    ${PROJECT_DIRECTORY}/make_simgrid_java.sh  "\n")
+file(APPEND    ${PROJECT_DIRECTORY}/make_simgrid_java.sh  "rm ${PROJECT_DIRECTORY}/examples/java/comm_time/*.class\n")
+file(APPEND    ${PROJECT_DIRECTORY}/make_simgrid_java.sh "${JAVA_COMPILE} -d ${PROJECT_DIRECTORY}/examples/java/comm_time -cp ${PROJECT_DIRECTORY}/src/simgrid.jar ${PROJECT_DIRECTORY}/examples/java/comm_time/*.java\n")
+
+file(APPEND    ${PROJECT_DIRECTORY}/make_simgrid_java.sh "\n")
+file(APPEND    ${PROJECT_DIRECTORY}/make_simgrid_java.sh "rm ${PROJECT_DIRECTORY}/examples/java/suspend/*.class\n")
+file(APPEND    ${PROJECT_DIRECTORY}/make_simgrid_java.sh "${JAVA_COMPILE} -d ${PROJECT_DIRECTORY}/examples/java/suspend -cp ${PROJECT_DIRECTORY}/src/simgrid.jar ${PROJECT_DIRECTORY}/examples/java/suspend/*.java\n")
 
 endif(HAVE_JAVA)
+
+