Skip to content

Commit 71d8f70

Browse files
authored
Merge pull request #1197 from diorcety/windows_path_separator
Java: use File.pathSeparator instead of :
2 parents 1188323 + 479b3ef commit 71d8f70

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

zproject_java.gsl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ wrapper.gradleVersion = '5.4.1'
163163

164164
task generateJniHeaders(type: Exec, dependsOn: 'classes') {
165165
def classpath = sourceSets.main.output.classesDirs
166-
def appclasspath = configurations.runtime.files*.getAbsolutePath().join(":")
166+
def appclasspath = configurations.runtime.files*.getAbsolutePath().join(File.pathSeparator)
167167
def nativeIncludes = "src/native/include"
168168
def jniClasses = [
169169
. for project.class where class.okay
@@ -173,10 +173,10 @@ task generateJniHeaders(type: Exec, dependsOn: 'classes') {
173173
def utilityClasses = [
174174
'src/main/java/org/zeromq/tools/ZmqNativeLoader.java'
175175
]
176-
commandLine("javac", "-h", "$nativeIncludes", "-classpath", "$classpath:$appclasspath", *jniClasses, *utilityClasses)
176+
commandLine("javac", "-h", "$nativeIncludes", "-classpath", "$classpath" + File.pathSeparator + "$appclasspath", *jniClasses, *utilityClasses)
177177
}
178178
tasks.withType(Test) {
179-
systemProperty "java.library.path", "/usr/lib:/usr/local/lib:$projectDir"
179+
systemProperty "java.library.path", "/usr/lib" + File.pathSeparator + "/usr/local/lib" + File.pathSeparator + "$projectDir"
180180
}
181181
task initCMake(type: Exec, dependsOn: 'generateJniHeaders') {
182182
commandLine "cmake", "."

0 commit comments

Comments
 (0)