From 3c17d7e5f5bfaf161f82fc92d38a09102f07dc41 Mon Sep 17 00:00:00 2001
From: navarrop <navarrop@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Date: Fri, 9 Apr 2010 10:32:42 +0000
Subject: [PATCH] Add sources for distrib.

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@7509 48e7efb5-ca39-0410-a469-dd3cf9ba447f
---
 buildtools/Cmake/src/CMakeDefinePackages.txt | 23 +++++++++++++++++++-
 buildtools/Cmake/src/CMakeMakeExeLib.txt     | 15 ++++---------
 2 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/buildtools/Cmake/src/CMakeDefinePackages.txt b/buildtools/Cmake/src/CMakeDefinePackages.txt
index 1b1f7986b5..72c1f14c4c 100644
--- a/buildtools/Cmake/src/CMakeDefinePackages.txt
+++ b/buildtools/Cmake/src/CMakeDefinePackages.txt
@@ -283,7 +283,6 @@ set(AMOK_SRC
 
 set(LUA_SRC
 	${PROJECT_DIRECTORY}/src/simix/smx_context_lua.c
-	#${PROJECT_DIRECTORY}/src/bindings/lua/Msglua.c
 	${PROJECT_DIRECTORY}/src/bindings/lua/simgrid_lua.c
 )
 
@@ -687,6 +686,28 @@ set(to_svg
 	${PROJECT_DIRECTORY}/./src/bindings/ruby_bindings.h
 	${PROJECT_DIRECTORY}/./src/simix/smx_context_sysv_private.h
 	${PROJECT_DIRECTORY}/./src/simgrid_units_main.c
+	${PROJECT_DIRECTORY}/./src/bindings/lua/master_slave.lua
+	${PROJECT_DIRECTORY}/./src/bindings/lua/mult_matrix.lua
+	${PROJECT_DIRECTORY}/./examples/lua/master_slave.lua
+	${PROJECT_DIRECTORY}/./examples/lua/mult_matrix.lua
+	${PROJECT_DIRECTORY}/./examples/lua/README
+	${PROJECT_DIRECTORY}/./src/bindings/ruby/MasterSlave.rb
+	${PROJECT_DIRECTORY}/./src/bindings/ruby/MasterSlaveData.rb
+	${PROJECT_DIRECTORY}/./src/bindings/ruby/PingPong.rb
+	${PROJECT_DIRECTORY}/./src/bindings/ruby/Quicksort.rb
+	${PROJECT_DIRECTORY}/./src/bindings/ruby/simgrid.rb
+	${PROJECT_DIRECTORY}/./examples/ruby/README
+	${PROJECT_DIRECTORY}/./examples/ruby/MasterSlave.rb
+	${PROJECT_DIRECTORY}/./examples/ruby/PingPong.rb
+	${PROJECT_DIRECTORY}/./examples/ruby/Quicksort.rb
+	${PROJECT_DIRECTORY}/./src/bindings/rubyDag/example.rb
+	${PROJECT_DIRECTORY}/./src/bindings/rubyDag/extconfig.rb
+	${PROJECT_DIRECTORY}/./src/bindings/rubyDag/rb_SD_task.c
+	${PROJECT_DIRECTORY}/./src/bindings/rubyDag/rb_SD_task.h
+	${PROJECT_DIRECTORY}/./src/bindings/rubyDag/rb_SD_workstation.c
+	${PROJECT_DIRECTORY}/./src/bindings/rubyDag/rb_SD_workstation.h
+	${PROJECT_DIRECTORY}/./src/bindings/rubyDag/rb_simdag.c
+	${PROJECT_DIRECTORY}/./src/bindings/rubyDag/simdag.rb
 )
 set(script_to_install
 	${PROJECT_DIRECTORY}/./src/smpi/smpicc
diff --git a/buildtools/Cmake/src/CMakeMakeExeLib.txt b/buildtools/Cmake/src/CMakeMakeExeLib.txt
index 0e88a6196f..cceeba2021 100644
--- a/buildtools/Cmake/src/CMakeMakeExeLib.txt
+++ b/buildtools/Cmake/src/CMakeMakeExeLib.txt
@@ -135,19 +135,15 @@ add_subdirectory(${PROJECT_DIRECTORY}/examples/simdag/properties)
 add_subdirectory(${PROJECT_DIRECTORY}/examples/smpi)
 
 if(HAVE_JAVA)
+	foreach(file ${JMSG_JAVA_SRC})
+		set(java_src_to_compile "${java_src_to_compile} ${file}")	
+	endforeach(file ${JMSG_JAVA_SRC})
 
-	add_custom_command(TARGET simgrid
-	POST_BUILD
-	COMMAND echo "[  0%] Building JAR object src/simgrid.jar"
+	add_custom_target(simgrid.jar	ALL
 	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})
-
 file(WRITE	${PROJECT_DIRECTORY}/make_simgrid_java.sh 
 "\#! /bin/sh\n\n")
 
@@ -165,9 +161,6 @@ file(APPEND	${PROJECT_DIRECTORY}/make_simgrid_java.sh "cp ${PROJECT_DIRECTORY}/s
 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 . &>/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")
-
 file(APPEND	${PROJECT_DIRECTORY}/make_simgrid_java.sh  "\n")
 file(APPEND	${PROJECT_DIRECTORY}/make_simgrid_java.sh "rm -f ${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")
-- 
2.20.1