Changeset View
Changeset View
Standalone View
Standalone View
head/java/openjfx8-devel/files/patch-build.gradle
| --- build.gradle.orig 2016-02-28 12:54:50 UTC | --- build.gradle.orig 2016-02-28 12:54:50 UTC | ||||
| +++ build.gradle | +++ build.gradle | ||||
| @@ -125,7 +125,7 @@ void loadProperties(String sourceFileNam | @@ -125,7 +125,7 @@ void loadProperties(String sourceFileNam | ||||
| def propFile = new File(sourceFileName) | def propFile = new File(sourceFileName) | ||||
| if (propFile.canRead()) { | if (propFile.canRead()) { | ||||
| config.load(new FileInputStream(propFile)) | config.load(new FileInputStream(propFile)) | ||||
| - for (Map.Entry property in config) { | - for (Map.Entry property in config) { | ||||
| + for (property in config) { | + for (property in config) { | ||||
| def keySplit = property.key.split("\\."); | def keySplit = property.key.split("\\."); | ||||
| def key = keySplit[0]; | def key = keySplit[0]; | ||||
| for (int i = 1; i < keySplit.length; i++) { | for (int i = 1; i < keySplit.length; i++) { | ||||
| @@ -1167,7 +1167,7 @@ allprojects { | @@ -1167,7 +1167,8 @@ allprojects { | ||||
| // By default all of our projects require junit for testing so we can just | // By default all of our projects require junit for testing so we can just | ||||
| // setup this dependency here. | // setup this dependency here. | ||||
| dependencies { | dependencies { | ||||
| - testCompile group: "junit", name: "junit", version: "4.8.2" | - testCompile group: "junit", name: "junit", version: "4.8.2" | ||||
| + testCompile files("%%PREFIX%%/share/java/classes/junit4.jar") | + testCompile files("%%PREFIX%%/share/java/classes/junit4.jar", | ||||
| + "%%PREFIX%%/share/java/classes/hamcrest.jar") | |||||
| if (BUILD_CLOSED && DO_JCOV) { | if (BUILD_CLOSED && DO_JCOV) { | ||||
| testCompile name: "jcov" | testCompile name: "jcov" | ||||
| } | } | ||||
| @@ -1307,11 +1307,9 @@ project(":graphics") { | @@ -1307,11 +1308,10 @@ project(":graphics") { | ||||
| dependencies { | dependencies { | ||||
| compile project(":base"), BUILD_SRC | compile project(":base"), BUILD_SRC | ||||
| compile files("/usr/local/share/java/classes/swt-devel.jar") | compile files("/usr/local/share/java/classes/swt-devel.jar") | ||||
| - stubCompile group: "junit", name: "junit", version: "4.8.2", | - stubCompile group: "junit", name: "junit", version: "4.8.2", | ||||
| + stubCompile files("%%PREFIX%%/share/java/classes/junit4.jar"), | + stubCompile files("%%PREFIX%%/share/java/classes/junit4.jar", | ||||
| + "%%PREFIX%%/share/java/classes/hamcrest.jar"), | |||||
| project(":base").sourceSets.test.output, sourceSets.main.output | project(":base").sourceSets.test.output, sourceSets.main.output | ||||
| - antlr3 group: "org.antlr", name: "antlr", version: "3.1.3" | - antlr3 group: "org.antlr", name: "antlr", version: "3.1.3" | ||||
| - antlr3 group: "org.antlr", name: "antlr-runtime", version: "3.1.3" | - antlr3 group: "org.antlr", name: "antlr-runtime", version: "3.1.3" | ||||
| - antlr3 group: "org.antlr", name: "stringtemplate", version: "3.2" | - antlr3 group: "org.antlr", name: "stringtemplate", version: "3.2" | ||||
| + antlr3 files("%%PREFIX%%/share/java/classes/antlr-3.5.2-complete.jar") | + antlr3 files("%%PREFIX%%/share/java/classes/antlr-3.5.2-complete.jar") | ||||
| } | } | ||||
| // Create a single "native" task which will depend on all the individual native tasks for graphics | // Create a single "native" task which will depend on all the individual native tasks for graphics | ||||
| @@ -1601,9 +1599,7 @@ project(":graphics") { | @@ -1601,9 +1601,7 @@ project(":graphics") { | ||||
| copy { | copy { | ||||
| into libsDir | into libsDir | ||||
| from f.getParentFile() | from f.getParentFile() | ||||
| - include "**/antlr-3.1.3.jar" | - include "**/antlr-3.1.3.jar" | ||||
| - include "**/stringtemplate-3.2.jar" | - include "**/stringtemplate-3.2.jar" | ||||
| - include "**/antlr-runtime-3.1.3.jar" | - include "**/antlr-runtime-3.1.3.jar" | ||||
| + include "**/antlr-3.5.2-complete.jar" | + include "**/antlr-3.5.2-complete.jar" | ||||
| includeEmptyDirs = false | includeEmptyDirs = false | ||||
| } | } | ||||
| // Have to rename the swt jar because it is some platform specific name but | // Have to rename the swt jar because it is some platform specific name but | ||||
| @@ -1787,7 +1783,7 @@ project(":fxpackager") { | @@ -1787,7 +1785,7 @@ project(":fxpackager") { | ||||
| } | } | ||||
| dependencies { | dependencies { | ||||
| - compile group: "org.apache.ant", name: "ant", version: "1.8.2" | - compile group: "org.apache.ant", name: "ant", version: "1.8.2" | ||||
| + compile files("%%PREFIX%%/share/java/apache-ant/lib/ant.jar") | + compile files("%%PREFIX%%/share/java/apache-ant/lib/ant.jar") | ||||
| } | } | ||||
| // When producing the jar, we need to relocate a few class files | // When producing the jar, we need to relocate a few class files | ||||
| @@ -2048,21 +2044,6 @@ project(":fxpackager") { | @@ -2048,21 +2046,6 @@ project(":fxpackager") { | ||||
| jar.dependsOn buildJavaPackager | jar.dependsOn buildJavaPackager | ||||
| jar.dependsOn packagerJar | jar.dependsOn packagerJar | ||||
| - classes << { | - classes << { | ||||
| - // Copy all of the download libraries to libs directory for the sake of the IDEs | - // Copy all of the download libraries to libs directory for the sake of the IDEs | ||||
| - File libsDir = rootProject.file("build/libs"); | - File libsDir = rootProject.file("build/libs"); | ||||
| - File antLib = new File(libsDir, "ant-1.8.2.jar") | - File antLib = new File(libsDir, "ant-1.8.2.jar") | ||||
| - libsDir.mkdirs(); | - libsDir.mkdirs(); | ||||
| Show All 13 Lines | |||||