Try to compil java examples.

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

diff --git a/buildtools/CPACK/src/CMakeCompleteInFiles.txt b/buildtools/CPACK/src/CMakeCompleteInFiles.txt
index ee3fd34..84350ff 100644 (file)
--- a/buildtools/CPACK/src/CMakeCompleteInFiles.txt
+++ b/buildtools/CPACK/src/CMakeCompleteInFiles.txt
@@ -44,13 +44,13 @@ else(disable_gtnets)
        SET(BUILDNAME "GTNETS" CACHE TYPE INTERNAL FORCE)
        set(GTNETS_LDFLAGS "-L${gtnets_path}/lib")
        set(GTNETS_CPPFLAGS "-I${gtnets_path}/include/gtnets")
        SET(BUILDNAME "GTNETS" CACHE TYPE INTERNAL FORCE)
        set(GTNETS_LDFLAGS "-L${gtnets_path}/lib")
        set(GTNETS_CPPFLAGS "-I${gtnets_path}/include/gtnets")

-       exec_program("${CMAKE_CXX_COMPILER} ${GTNETS_CPPFLAGS} -lgtnets ${GTNETS_LDFLAGS} ${PROJECT_DIRECTORY}/CPACK/prog_test/prog_gtnets.cpp" OUTPUT_VARIABLE COMPILE_GTNETS_VAR)     
+       exec_program("${CMAKE_CXX_COMPILER} ${GTNETS_CPPFLAGS} -lgtnets ${GTNETS_LDFLAGS} ${PROJECT_DIRECTORY}/CPACK/prog_test/prog_gtnets.cpp " OUTPUT_VARIABLE COMPILE_GTNETS_VAR)    

        if(COMPILE_GTNETS_VAR)
                SET(HAVE_GTNETS 0)
                message("GTnetS doesn't works : set -Ddisable_gtnets=on")
        else(COMPILE_GTNETS_VAR)
                SET(HAVE_GTNETS 1)
        if(COMPILE_GTNETS_VAR)
                SET(HAVE_GTNETS 0)
                message("GTnetS doesn't works : set -Ddisable_gtnets=on")
        else(COMPILE_GTNETS_VAR)
                SET(HAVE_GTNETS 1)

-               SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${GTNETS_LDFLAGS} ${GTNETS_CPPFLAGS}")
+               SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${GTNETS_LDFLAGS} ${GTNETS_CPPFLAGS} ")

        endif(COMPILE_GTNETS_VAR)
 endif(disable_gtnets)
 #message("HAVE_GTNETS ${HAVE_GTNETS}")
        endif(COMPILE_GTNETS_VAR)
 endif(disable_gtnets)
 #message("HAVE_GTNETS ${HAVE_GTNETS}")

diff --git a/buildtools/CPACK/src/CMakeDefinePackages.txt b/buildtools/CPACK/src/CMakeDefinePackages.txt
index 854d47e..1ebc363 100644 (file)
--- a/buildtools/CPACK/src/CMakeDefinePackages.txt
+++ b/buildtools/CPACK/src/CMakeDefinePackages.txt
@@ -194,7 +194,6 @@ set(JMSG_JAVA_SRC
        ${PROJECT_DIRECTORY}/src/java/simgrid/msg/Host.java
        ${PROJECT_DIRECTORY}/src/java/simgrid/msg/Task.java
        ${PROJECT_DIRECTORY}/src/java/simgrid/msg/MsgNative.java
        ${PROJECT_DIRECTORY}/src/java/simgrid/msg/Host.java
        ${PROJECT_DIRECTORY}/src/java/simgrid/msg/Task.java
        ${PROJECT_DIRECTORY}/src/java/simgrid/msg/MsgNative.java

-       ${PROJECT_DIRECTORY}/src/java/simgrid/msg/DTDResolver.java

        ${PROJECT_DIRECTORY}/src/java/simgrid/msg/ApplicationHandler.java
        ${PROJECT_DIRECTORY}/src/java/simgrid/msg/Sem.java
 )
        ${PROJECT_DIRECTORY}/src/java/simgrid/msg/ApplicationHandler.java
        ${PROJECT_DIRECTORY}/src/java/simgrid/msg/Sem.java
 )


@@ -369,6 +368,7 @@ ${PROJECT_DIRECTORY}/src/bindings/ruby/rb_msg_host.c
 ${PROJECT_DIRECTORY}/src/bindings/ruby/rb_msg_task.c
 ${PROJECT_DIRECTORY}/src/bindings/ruby/rb_application_handler.c
 )
 ${PROJECT_DIRECTORY}/src/bindings/ruby/rb_msg_task.c
 ${PROJECT_DIRECTORY}/src/bindings/ruby/rb_application_handler.c
 )

+

 ### depend of some variables setted upper
 # -->CONTEXT_THREADS
 if(${CONTEXT_THREADS})
 ### depend of some variables setted upper
 # -->CONTEXT_THREADS
 if(${CONTEXT_THREADS})

diff --git a/buildtools/CPACK/src/CMakeMakeExeLib.txt b/buildtools/CPACK/src/CMakeMakeExeLib.txt
index 8e173fb..ce60cf6 100644 (file)
--- a/buildtools/CPACK/src/CMakeMakeExeLib.txt
+++ b/buildtools/CPACK/src/CMakeMakeExeLib.txt
@@ -8,11 +8,12 @@ else(supernovae)
        add_library(smpi STATIC ${SMPI_SRC})
 endif(supernovae)
 
        add_library(smpi STATIC ${SMPI_SRC})
 endif(supernovae)
 

+add_library(simgrid_ruby STATIC ${PROJECT_DIRECTORY}/src/bindings/ruby/simgrid_ruby.c)
+

 set(GRAS_DEP "pthread")
 set(GRAS_DEP "pthread")

-if(HAVE_RUBY_H)
-       set(SIMGRID_DEP "ruby1.8")
-endif(HAVE_RUBY_H)
+set(SIMGRID_DEP "ruby1.8")

 set(SMPI_DEP "")
 set(SMPI_DEP "")

+set(RUBY_DEP "-lm -module")

 
 if(CMAKE_SYSTEM_NAME MATCHES "Darwin")
        add_definitions("-D_XOPEN_SOURCE")
 
 if(CMAKE_SYSTEM_NAME MATCHES "Darwin")
        add_definitions("-D_XOPEN_SOURCE")


@@ -37,24 +38,25 @@ if(HAVE_GTNETS)
        SET(SIMGRID_DEP "${SIMGRID_DEP} -lgtnets")
 endif(HAVE_GTNETS)
 
        SET(SIMGRID_DEP "${SIMGRID_DEP} -lgtnets")
 endif(HAVE_GTNETS)
 

-### Add definitions for compile
-#set(CMAKE_CXX_FLAGS "-fprofile-arcs -ftest-coverage")
-#set(CMAKE_C_FLAGS "-fprofile-arcs -ftest-coverage")
+if(NOT HAVE_RUBY_H)
+string(REPLACE "ruby1.8 " "" SIMGRID_DEP ${SIMGRID_DEP})
+endif(NOT HAVE_RUBY_H)

 
 

-#add_definitions (-fprofile-arcs -ftest-coverage)

 target_link_libraries(simgrid  ${SIMGRID_DEP} -fprofile-arcs)
 target_link_libraries(gras     ${GRAS_DEP} -fprofile-arcs)
 target_link_libraries(smpi     simgrid ${SMPI_DEP} -fprofile-arcs)
 target_link_libraries(simgrid  ${SIMGRID_DEP} -fprofile-arcs)
 target_link_libraries(gras     ${GRAS_DEP} -fprofile-arcs)
 target_link_libraries(smpi     simgrid ${SMPI_DEP} -fprofile-arcs)

+target_link_libraries(simgrid_ruby     simgrid ${RUBY_DEP} -fprofile-arcs)
+

 ### Make EXEs
 
 #tools
 ### Make EXEs
 
 #tools

-#tools/tesh
-add_subdirectory(${PROJECT_DIRECTORY}/tools/tesh)
-

 #tools/gras
 add_subdirectory(${PROJECT_DIRECTORY}/tools/gras)
 
 if(NOT init)
 #tools/gras
 add_subdirectory(${PROJECT_DIRECTORY}/tools/gras)
 
 if(NOT init)

+       #tools/tesh
+       add_subdirectory(${PROJECT_DIRECTORY}/tools/tesh)
+

        #testsuite/xbt
        add_subdirectory(${PROJECT_DIRECTORY}/testsuite/xbt)
 
        #testsuite/xbt
        add_subdirectory(${PROJECT_DIRECTORY}/testsuite/xbt)
 


@@ -117,6 +119,7 @@ if(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")
        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")

                exec_program("mkdir ${PROJECT_DIRECTORY}/src/.classes" OUTPUT_VARIABLE "SIM_JAR_OK")
                exec_program("${JAVA_COMPILE}" ARGS "-d ${PROJECT_DIRECTORY}/src/.classes -cp ${PROJECT_DIRECTORY}/src/.classes ${PROJECT_DIRECTORY}/src/java/simgrid/msg/*.java" OUTPUT_VARIABLE "SIM_JAR_OK")
                exec_program("mkdir ${PROJECT_DIRECTORY}/src/.classes/surf" OUTPUT_VARIABLE "SIM_JAR_OK")
                exec_program("mkdir ${PROJECT_DIRECTORY}/src/.classes" OUTPUT_VARIABLE "SIM_JAR_OK")
                exec_program("${JAVA_COMPILE}" ARGS "-d ${PROJECT_DIRECTORY}/src/.classes -cp ${PROJECT_DIRECTORY}/src/.classes ${PROJECT_DIRECTORY}/src/java/simgrid/msg/*.java" OUTPUT_VARIABLE "SIM_JAR_OK")
                exec_program("mkdir ${PROJECT_DIRECTORY}/src/.classes/surf" OUTPUT_VARIABLE "SIM_JAR_OK")


@@ -125,13 +128,13 @@ if(NOT init)
 
                message("Make examples/java with : ${JAVA_COMPILE}")
                exec_program("rm ${PROJECT_DIRECTORY}/examples/java/basic/*.class" OUTPUT_VARIABLE "SIM_JAR_OK")
 
                message("Make examples/java with : ${JAVA_COMPILE}")
                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/.classes ${PROJECT_DIRECTORY}/examples/java/basic/*.java"  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("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/.classes ${PROJECT_DIRECTORY}/examples/java/ping_pong/*.java"  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("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/.classes ${PROJECT_DIRECTORY}/examples/java/comm_time/*.java"  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("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/.classes ${PROJECT_DIRECTORY}/examples/java/suspend/*.java"  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)
 
 
        endif(HAVE_JAVA)
 

diff --git a/buildtools/CPACK/src/CMakePrintArgs.txt b/buildtools/CPACK/src/CMakePrintArgs.txt
index 98a5588..0630489 100644 (file)
--- a/buildtools/CPACK/src/CMakePrintArgs.txt
+++ b/buildtools/CPACK/src/CMakePrintArgs.txt
@@ -27,7 +27,7 @@ message("     Supernovae mode:        ${supernovae}")
 message("")
 message("      Simgrid dependencies:   ${SIMGRID_DEP}")
 message("      Gras dependencies:      ${GRAS_DEP}")
 message("")
 message("      Simgrid dependencies:   ${SIMGRID_DEP}")
 message("      Gras dependencies:      ${GRAS_DEP}")

-message("      Msg dependencies:       ${MSG_DEP}")
+message("      Ruby dependencies:      ${RUBY_DEP}")

 message("      Smpi dependencies:      ${SMPI_DEP}\n\n")
 
 
 message("      Smpi dependencies:      ${SMPI_DEP}\n\n")