This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository openjfx9.
commit d282838f4ce583198cd86a350edd424b177873af
Author: Emmanuel Bourg <ebo...@apache.org>
Date: Thu Oct 12 00:56:09 2017 +0200
Adjusted the classpath to be able to build with OpenJDK
---
debian/patches/28-adjust-classpath.patch | 60 ++++++++++++++++++++++++++++++++
debian/patches/series | 1 +
2 files changed, 61 insertions(+)
diff --git a/debian/patches/28-adjust-classpath.patch
b/debian/patches/28-adjust-classpath.patch
new file mode 100644
index 0000000..a56fdbf
--- /dev/null
+++ b/debian/patches/28-adjust-classpath.patch
@@ -0,0 +1,60 @@
+Description: Adjusts the classpath to be able to build with OpenJDK
+Author: Mario Ivankovits <ma...@datenwort.at>
+Forwarded:
http://mail.openjdk.java.net/pipermail/openjfx-dev/2017-October/020883.html
+--- a/build.gradle
++++ b/build.gradle
+@@ -1266,7 +1266,7 @@
+ dependsOn: project.compileJava) {
+ description = "Compile the $name JSL Compilers"
+
+- classpath = project.files(project.sourceSets.main.output.classesDir) +
++ classpath =
project.files("${project.sourceSets.main.output.classesDir}/${project.ext.moduleName}")
+
+ project.files(project.sourceSets.jslc.output.classesDir) +
+ project.configurations.antlr
+ source = [project.file("src/main/jsl-$lowerName")]
+@@ -1881,6 +1881,9 @@
+
+ classpath += files("${project.projectDir}/src/jslc/resources")
+
++ classpath +=
files("${project.projectDir}/../javafx.base/build/classes/main/javafx.base")
++ classpath +=
files("${project.projectDir}/../javafx.graphics/build/classes/main/javafx.graphics")
++
+ classpath += files("$buildDir/classes/main")
+ classpath += files("$buildDir/classes/jsl-compilers/decora")
+ jvmArgs += decoraAddExports
+@@ -2079,6 +2082,8 @@
+ "$moduleDir/com/sun/javafx/scene/control/skin/modena/touch.css"].each
{ css ->
+ javaexec {
+ executable = JAVA
++ classpath =
files("${project.projectDir}/../javafx.base/build/classes/main/javafx.base")
++ classpath +=
files("${project.projectDir}/../javafx.graphics/build/classes/main/javafx.graphics")
+ workingDir = project.projectDir
+ jvmArgs += patchModuleArgs
+ main = "com.sun.javafx.css.parser.Css2Bin"
+@@ -2246,6 +2251,9 @@
+
+ commonModuleSetup(project, [ 'base', 'graphics', 'swing', 'controls',
'media', 'jmx' ])
+
++ compileJava.classpath +=
project.files("${project.projectDir}/../javafx.swing/build/classes/main")
++ compileJava.classpath +=
project.files("${project.projectDir}/../javafx.media/build/classes/main/javafx.media")
++
+ dependencies {
+ }
+
+@@ -2787,6 +2795,7 @@
+ options.compilerArgs.addAll([
+ '--add-exports',
'javafx.media/com.sun.media.jfxmedia=ALL-UNNAMED',
+ ])
++ classpath +=
project.files("${project.projectDir}/../javafx.media/build/classes/main/javafx.media")
+ }
+
+ project.ext.makeJobsFlag = IS_WINDOWS && IS_DEBUG_NATIVE ? "-j1" : "-j5";
+@@ -2809,7 +2818,7 @@
+ commandLine("$JAVA");
+ args += patchModuleArgs
+ args += [
'--add-exports=javafx.media/com.sun.media.jfxmedia=ALL-UNNAMED' ]
+- args += [ '-classpath', "${classpath.asPath}" ]
++ args += [ '-classpath',
"${classpath.asPath}:${project.projectDir}/../javafx.media/build/classes/main/javafx.media"
]
+ args += [ "headergen.HeaderGen", "$headerpath", "$srcRoot" ]
+ }
+ }
diff --git a/debian/patches/series b/debian/patches/series
index 699bc54..622e998 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -22,3 +22,4 @@ fix-arm32-build.patch
25-webkit-debug-level.patch
26-disable-webkit-jit-for-armv4.patch
27-add-java9-exports.patch
+28-adjust-classpath.patch
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-java/openjfx9.git
_______________________________________________
pkg-java-commits mailing list
pkg-java-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
