1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
|
From: Jan Dittberner <jandd@debian.org>
Date: Sun, 8 Dec 2013 16:22:37 +0100
Subject: use Debian java libs
Forwarded: not-needed
---
AI/Interfaces/Java/CMakeLists.txt | 17 ++++++++---------
AI/Skirmish/HughAI/CMakeLists.txt | 10 +++++-----
2 files changed, 13 insertions(+), 14 deletions(-)
diff --git a/AI/Interfaces/Java/CMakeLists.txt b/AI/Interfaces/Java/CMakeLists.txt
index 8c74470..f7ebe4b 100644
--- a/AI/Interfaces/Java/CMakeLists.txt
+++ b/AI/Interfaces/Java/CMakeLists.txt
@@ -42,7 +42,6 @@ macro (ConfigureCMakeOrMavenJavaSkirmishAI requireMaven wrapperNames)
set(myJarFile "SkirmishAI")
set(myBinJarFile "${myJarFile}.jar")
set(mySrcJarFile "${myJarFile}-src.jar")
- set(myJLibDir "${myDir}/data/jlib")
GetVersionPlusDepFile(myVersion myVersionDepFile)
set(myTarget "${myName}")
set(myInstLibsDir "${SKIRMISH_AI_LIBS}/${myName}/${myVersion}")
@@ -169,8 +168,8 @@ macro (ConfigureCMakeOrMavenJavaSkirmishAI requireMaven wrapperNames)
add_dependencies(${myTarget} ${myBinaryTarget} ${mySourceTarget})
# Create our full Java class-path
- CreateClasspath(myJavaLibs ${myJLibDir})
- ConcatClasspaths(myClassPath "${CLASSPATH_Java_AIINTERFACE}" "${myJavaLibs}")
+ #CreateClasspath(myJavaLibs ${myJLibDir})
+ ConcatClasspaths(myClassPath "${CLASSPATH_Java_AIINTERFACE}" "/usr/share/java/jna.jar" "/usr/share/java/vecmath.jar")
foreach (wrapperName ${wrapperNames})
ConcatClasspaths(myClassPath "${myClassPath}" "${${wrapperName}_AIWRAPPER_JAR_CLASSPATH}")
endforeach (wrapperName)
@@ -207,7 +206,7 @@ macro (ConfigureCMakeOrMavenJavaSkirmishAI requireMaven wrapperNames)
COMMAND "${JAVA_COMPILE}"
"${JAVA_COMPILE_FLAG_CONDITIONAL}"
"-Xlint:deprecation"
- "-cp" "${myClassPath}"
+ "-classpath" "${myClassPath}"
"-d" "${myJavaBuildDir}"
"@${mySrcArgFile}"
COMMAND "${JAVA_ARCHIVE}"
@@ -386,9 +385,9 @@ if (BUILD_${myName}_AIINTERFACE)
set(myGeneratedSourceDir "${myBuildDir}/src-generated/main")
set(myJavaGeneratedSourceDir "${myGeneratedSourceDir}/java")
set(myNativeGeneratedSourceDir "${myGeneratedSourceDir}/native")
- set(myJLibDir "${myDir}/data/jlib")
- CreateClasspath(myJavaLibs ${myJLibDir})
- set(myClassPath ".${PATH_DELIM_H}${myJavaLibs}${PATH_DELIM_H}${myJavaSourceDir}")
+ #set(myJLibDir "${myDir}/data/jlib")
+ #CreateClasspath(myJavaLibs ${myJLibDir})
+ set(myClassPath ".${PATH_DELIM_H}${myJavaSourceDir}${PATH_DELIM_H}/usr/share/java/jna.jar${PATH_DELIM_H}/usr/share/java/vecmath.jar")
# Used by Java Skirmish AIs
SetGlobal(SOURCE_ROOT_${myName}_AIINTERFACE "${myDir}")
@@ -396,7 +395,7 @@ if (BUILD_${myName}_AIINTERFACE)
SetGlobal(${myName}_AIINTERFACE_JAR_BIN "${myBuildDir}/${myBinJarFile}")
SetGlobal(${myName}_AIINTERFACE_JAR_SRC "${myBuildDir}/${mySrcJarFile}")
SetGlobal(${myName}_AIINTERFACE_POM "${myBuildDir}/pom-generated.xml")
- SetGlobal(CLASSPATH_${myName}_AIINTERFACE "${myJavaLibs}${PATH_DELIM_H}${myBuildDir}/${myBinJarFile}")
+ SetGlobal(CLASSPATH_${myName}_AIINTERFACE "${myClassPath}${PATH_DELIM_H}${myBuildDir}/${myBinJarFile}")
SetGlobal(JAVA_SRC_DIR_${myName}_AIINTERFACE "${myJavaSourceDir}")
SetGlobal(JAVA_GEN_SRC_DIR_${myName}_AIINTERFACE "${myJavaGeneratedSourceDir}")
SetGlobal(${myName}_AIINTERFACE_TARGET_MVN_INSTALL "${myMavenInstallTarget}")
@@ -645,7 +644,7 @@ if (BUILD_${myName}_AIINTERFACE)
COMMAND "${JAVA_COMPILE}" ARGS
"${JAVA_COMPILE_FLAG_CONDITIONAL}"
"-Xlint:deprecation"
- "-cp" "${myClassPath}"
+ "-classpath" "${myClassPath}"
"-d" "${myJavaBuildDir}"
"@${mySrcArgFile}"
COMMAND "${JAVA_ARCHIVE}" ARGS
diff --git a/AI/Skirmish/HughAI/CMakeLists.txt b/AI/Skirmish/HughAI/CMakeLists.txt
index 9299bbb..fceb9df 100644
--- a/AI/Skirmish/HughAI/CMakeLists.txt
+++ b/AI/Skirmish/HughAI/CMakeLists.txt
@@ -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})
- ConcatClasspaths(myClassPath "${CLASSPATH_Java_AIINTERFACE}" "${myJavaLibs}" ${myAiSourceDir} ${myLoaderSourceDir} ${JavaOO_AIWRAPPER_JAR_CLASSPATH})
+ #CreateClasspath(myJavaLibs ${myJLibDir})
+ ConcatClasspaths(myClassPath "${CLASSPATH_Java_AIINTERFACE}" "/usr/share/java/jna.jar" "/usr/share/java/vecmath.jar" ${myAiSourceDir} ${myLoaderSourceDir} ${JavaOO_AIWRAPPER_JAR_CLASSPATH})
# Create a list of all the AIs source files (for compiling)
file(GLOB_RECURSE myLoaderSources RELATIVE "${myLoaderSourceDir}" FOLLOW_SYMLINKS "${myLoaderSourceDir}/*.java")
@@ -86,7 +86,7 @@
"-E" "make_directory" "${myJavaLoaderBuildDir}"
COMMAND "${JAVA_COMPILE}"
"${JAVA_COMPILE_FLAG_CONDITIONAL}"
- "-cp" "${myClassPath}"
+ "-classpath" "${myClassPath}"
"-d" "${myJavaLoaderBuildDir}"
${myLoaderSources}
COMMAND "${JAVA_ARCHIVE}"
@@ -109,7 +109,7 @@
"-E" "make_directory" "${myJavaAiBuildDir}"
COMMAND "${JAVA_COMPILE}"
"${JAVA_COMPILE_FLAG_CONDITIONAL}"
- "-cp" "${myClassPath}"
+ "-classpath" "${myClassPath}"
"-d" "${myJavaAiBuildDir}"
${myAiSources}
COMMAND "${JAVA_ARCHIVE}"
|
