From: navarrop <navarrop@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Date: Tue, 23 Mar 2010 09:11:40 +0000 (+0000)
Subject: Java sources.
X-Git-Tag: SVN~433
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/408547ca521e2624b17a3a5e29bc8efa0baef805?hp=d32b7bd0e7f81e57a139a5bcd719d04d2825b1a4

Java sources.

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

diff --git a/buildtools/Cmake/simgrid_CMakeList/CMakeLists.txt b/buildtools/Cmake/simgrid_CMakeList/CMakeLists.txt
index 67cb7216d7..61ff0dc481 100644
--- a/buildtools/Cmake/simgrid_CMakeList/CMakeLists.txt
+++ b/buildtools/Cmake/simgrid_CMakeList/CMakeLists.txt
@@ -23,7 +23,7 @@ exec_program("${PWD_EXE}" ARGS "| ${SED_EXE} 's/\\/Cmake//g'" OUTPUT_VARIABLE PR
 SET(PROJECT_SOURCE_DIRECTORY "${PROJECT_DIRECTORY}/src")
 set(EXECUTABLE_OUTPUT_PATH "${PROJECT_DIRECTORY}/bin")
 set(LIBRARY_OUTPUT_PATH "${PROJECT_DIRECTORY}/src/.libs")
-set(INCLUDES "-I${PROJECT_DIRECTORY}/include -I${PROJECT_DIRECTORY}/src/include -I${PROJECT_DIRECTORY}/src -I/usr/include -L${gtnets_path}/lib")
+set(INCLUDES "-I${PROJECT_DIRECTORY}/include -I${PROJECT_DIRECTORY}/src/include -I${PROJECT_DIRECTORY}/src -I/usr/include/ -L${gtnets_path}/lib")
 set(CMAKE_SOURCE_DIR ${PROJECT_SOURCE_DIRECTORY})
 
 add_definitions (${INCLUDES} -fprofile-arcs -ftest-coverage)
diff --git a/buildtools/Cmake/src/CMakeCompleteInFiles.txt b/buildtools/Cmake/src/CMakeCompleteInFiles.txt
index 474ab32055..913a936b84 100644
--- a/buildtools/Cmake/src/CMakeCompleteInFiles.txt
+++ b/buildtools/Cmake/src/CMakeCompleteInFiles.txt
@@ -37,9 +37,6 @@ else(disable_java)
 	endif(JAVA_INCLUDE_PATH)	
 	if(JAVA_RUNTIME AND JAVA_COMPILE AND JAVA_INCLUDE_PATH)
 		SET(HAVE_JAVA 1)
-		if(CMAKE_SYSTEM_NAME MATCHES "Darwin") #JAVA doesn't work yet on Mac
-			SET(HAVE_JAVA 0)
-		endif(CMAKE_SYSTEM_NAME MATCHES "Darwin")
 	else(JAVA_RUNTIME AND JAVA_COMPILE AND JAVA_INCLUDE_PATH) 
 		SET(HAVE_JAVA 0)
 	endif(JAVA_RUNTIME AND JAVA_COMPILE AND JAVA_INCLUDE_PATH)
@@ -207,11 +204,16 @@ if(NOT disable_lua)
 	NAMES lualib.h 
 	PATHS "/sw/include/" "/usr/include/lua5.1/"
 	)
-	if(HAVE_LUA5_1_LUALIB_H)
+	find_path(HAVE_LUA5_1_LAUXLIB_H
+	NAMES lauxlib.h
+	PATHS "/sw/include/" "/usr/include/lua5.1/"
+	)
+	if(HAVE_LUA5_1_LUALIB_H AND HAVE_LUA5_1_LAUXLIB_H)
 		set(HAVE_LUA 1)
-	endif(HAVE_LUA5_1_LUALIB_H)
+	endif(HAVE_LUA5_1_LUALIB_H AND HAVE_LUA5_1_LAUXLIB_H)
 endif(NOT disable_lua)
 #message("HAVE_LUA ${HAVE_LUA}")
+#message("${HAVE_LUA5_1_LUALIB_H} AND ${HAVE_LUA5_1_LAUXLIB_H}")
 
 #message("______END_CONTEXT______")
 
diff --git a/buildtools/Cmake/src/CMakeDefinePackages.txt b/buildtools/Cmake/src/CMakeDefinePackages.txt
index d2a59a4151..3a03eff2a1 100644
--- a/buildtools/Cmake/src/CMakeDefinePackages.txt
+++ b/buildtools/Cmake/src/CMakeDefinePackages.txt
@@ -112,18 +112,22 @@ set(JMSG_C_SRC
 )
 
 set(JMSG_JAVA_SRC
-	${PROJECT_DIRECTORY}/src/java/simgrid/msg/MsgException.java
+	${PROJECT_DIRECTORY}/src/java/simgrid/msg/ApplicationHandler.java
+	${PROJECT_DIRECTORY}/src/java/simgrid/msg/Host.java
+	${PROJECT_DIRECTORY}/src/java/simgrid/msg/HostFailureException.java	
+	${PROJECT_DIRECTORY}/src/java/simgrid/msg/HostNotFoundException.java	
 	${PROJECT_DIRECTORY}/src/java/simgrid/msg/JniException.java
-	${PROJECT_DIRECTORY}/src/java/simgrid/msg/NativeException.java
-	${PROJECT_DIRECTORY}/src/java/simgrid/msg/HostNotFoundException.java
-	${PROJECT_DIRECTORY}/src/java/simgrid/msg/ProcessNotFoundException.java
 	${PROJECT_DIRECTORY}/src/java/simgrid/msg/Msg.java
-	${PROJECT_DIRECTORY}/src/java/simgrid/msg/Process.java
-	${PROJECT_DIRECTORY}/src/java/simgrid/msg/Host.java
-	${PROJECT_DIRECTORY}/src/java/simgrid/msg/Task.java
+	${PROJECT_DIRECTORY}/src/java/simgrid/msg/MsgException.java
 	${PROJECT_DIRECTORY}/src/java/simgrid/msg/MsgNative.java
-	${PROJECT_DIRECTORY}/src/java/simgrid/msg/ApplicationHandler.java
+	${PROJECT_DIRECTORY}/src/java/simgrid/msg/NativeException.java
+	${PROJECT_DIRECTORY}/src/java/simgrid/msg/Process.java
+	${PROJECT_DIRECTORY}/src/java/simgrid/msg/ProcessNotFoundException.java
 	${PROJECT_DIRECTORY}/src/java/simgrid/msg/Sem.java
+	${PROJECT_DIRECTORY}/src/java/simgrid/msg/Task.java
+	${PROJECT_DIRECTORY}/src/java/simgrid/msg/TimeoutException.java
+	${PROJECT_DIRECTORY}/src/java/simgrid/msg/TransferFailureException.java	
+
 )
 
 set(GRAS_RL_SRC