[SCM] advanced 3D real time strategy game engine branch, master, updated. debian/0.81.2.1+dfsg1-4-5-ga6c6a92

[Jan Dittberner]

The following commit has been merged in the master branch:
commit 9819c98b58049d758145c74689c55c2d27fa27fb
Author: Jan Dittberner <jandd at debian.org>
Date:   Thu May 27 23:29:51 2010 +0200

    extend changes to AI/Skirmish/HughAI/CMakeLists.txt

diff --git a/debian/changelog b/debian/changelog
index 2fb128a..fd9d00d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,7 +2,8 @@ spring (0.81.2.1+dfsg1-5) UNRELEASED; urgency=low
 
   * debian/patches/0002-use-Debian-java-libs.patch:
     - remove empty ${myJLibDir} from classpath in
-      AI/Interfaces/Java/CMakeLists.txt
+      AI/Interfaces/Java/CMakeLists.txt and
+      AI/Skirmish/HughAI/CMakeLists.txt
     - use -classpath instead of -cp
   * refresh debian/patches/0001-Minor-spelling-fix.patch
 
diff --git a/debian/patches/0002-use-Debian-java-libs.patch b/debian/patches/0002-use-Debian-java-libs.patch
index 506bbe5..f2488f7 100644
--- a/debian/patches/0002-use-Debian-java-libs.patch
+++ b/debian/patches/0002-use-Debian-java-libs.patch
@@ -47,12 +47,38 @@ Author: Jan Dittberner <jandd at debian.org>
  		WORKING_DIRECTORY "${myJavaGeneratedSourceDir}"
 --- a/AI/Skirmish/HughAI/CMakeLists.txt
 +++ b/AI/Skirmish/HughAI/CMakeLists.txt
-@@ -47,7 +47,7 @@
+@@ -41,13 +41,13 @@
+ 		set(myAiBinJarFile       "${myAiJarFile}.jar")
+ 		set(myLoaderSrcJarFile   "${myLoaderJarFile}-src.jar")
+ 		set(myAiSrcJarFile       "${myAiJarFile}-src.jar")
+-		set(myJLibDir            "${myDir}/data/jlib")
++		#set(myJLibDir            "${myDir}/data/jlib")
+ 
+ 		SkirmishAIMessage(STATUS "Found Skirmish AI: ${myName} ${myVersion}")
  
  		# Create our full Java class-path
- 		CreateClasspath(myJavaLibs ${myJLibDir})
+-		CreateClasspath(myJavaLibs ${myJLibDir})
 -		ConcatClasspaths(myClassPath "${CLASSPATH_Java_AIINTERFACE}" "${myJavaLibs}" ${myAiSourceDir} ${myLoaderSourceDir})
-+		ConcatClasspaths(myClassPath "${CLASSPATH_Java_AIINTERFACE}" "${myJavaLibs}" ${myAiSourceDir} ${myLoaderSourceDir} "/usr/share/java/jna.jar" "/usr/share/java/vecmath.jar")
++		#CreateClasspath(myJavaLibs ${myJLibDir})
++		ConcatClasspaths(myClassPath "${CLASSPATH_Java_AIINTERFACE}" ${myAiSourceDir} ${myLoaderSourceDir} "/usr/share/java/jna.jar" "/usr/share/java/vecmath.jar")
  
  		# Create a list of all the AIs source files
  		file(GLOB_RECURSE myLoaderSources RELATIVE "${myLoaderSourceDir}" FOLLOW_SYMLINKS "${myLoaderSourceDir}/*.java")
+@@ -60,7 +60,7 @@
+ 			DEPENDS ${Java_AIINTERFACE_TARGET}
+ 			COMMAND "${JAVA_COMPILE}"
+ 				"${JAVA_COMPILE_FLAG_CONDITIONAL}"
+-				"-cp" "${myClassPath}"
++				"-classpath" "${myClassPath}"
+ 				"-d" "${myJavaLoaderBuildDir}"
+ 				${myLoaderSources}
+ 			COMMAND "${JAVA_ARCHIVE}"
+@@ -76,7 +76,7 @@
+ 			DEPENDS ${Java_AIINTERFACE_TARGET}
+ 			COMMAND "${JAVA_COMPILE}"
+ 				"${JAVA_COMPILE_FLAG_CONDITIONAL}"
+-				"-cp" "${myClassPath}"
++				"-classpath" "${myClassPath}"
+ 				"-d" "${myJavaAiBuildDir}"
+ 				${myAiSources}
+ 			COMMAND "${JAVA_ARCHIVE}"

-- 
advanced 3D real time strategy game engine