| 1 |
--- java-1.8.0-openjfx-1.8.0.102/build.gradle~ 2016-10-03 15:11:57.026966277 +0200 |
| 2 |
+++ java-1.8.0-openjfx-1.8.0.102/build.gradle 2016-10-03 15:09:41.899964203 +0200 |
| 3 |
@@ -1301,12 +1301,15 @@ |
| 4 |
|
| 5 |
dependencies { |
| 6 |
compile project(":base"), BUILD_SRC |
| 7 |
- compile name: SWT_FILE_NAME |
| 8 |
- stubCompile group: "junit", name: "junit", version: "4.8.2", |
| 9 |
+ //compile name: SWT_FILE_NAME |
| 10 |
+ compile files('/usr/lib/java/swt.jar') |
| 11 |
+ //stubCompile group: "junit", name: "junit", version: "4.8.2", |
| 12 |
+ stubCompile fileTree(dir: '/usr/share/java', include: ['junit.jar', 'antlr.jar']), |
| 13 |
project(":base").sourceSets.test.output, sourceSets.main.output |
| 14 |
- antlr3 group: "org.antlr", name: "antlr", version: "3.1.3" |
| 15 |
- antlr3 group: "org.antlr", name: "antlr-runtime", version: "3.1.3" |
| 16 |
- antlr3 group: "org.antlr", name: "stringtemplate", version: "3.2" |
| 17 |
+ //antlr3 group: "org.antlr", name: "antlr", version: "3.1.3" |
| 18 |
+ //antlr3 group: "org.antlr", name: "antlr-runtime", version: "3.1.3" |
| 19 |
+ //antlr3 group: "org.antlr", name: "stringtemplate", version: "3.2" |
| 20 |
+ antlr3 fileTree(dir: '/usr/share/java', include: ['antlr.jar', 'antlr3.jar', 'antlr3-runtime.jar', 'stringtemplate4.jar', 'stringtemplate.jar']) |
| 21 |
} |
| 22 |
|
| 23 |
// Create a single "native" task which will depend on all the individual native tasks for graphics |
| 24 |
@@ -1682,7 +1685,8 @@ |
| 25 |
} |
| 26 |
dependencies { |
| 27 |
compile BUILD_SRC, project(":base"), project(":graphics") |
| 28 |
- compile name: SWT_FILE_NAME |
| 29 |
+ //compile name: SWT_FILE_NAME |
| 30 |
+ compile files('/usr/lib/java/swt.jar') |
| 31 |
} |
| 32 |
} |
| 33 |
|
| 34 |
@@ -1781,7 +1785,8 @@ |
| 35 |
} |
| 36 |
|
| 37 |
dependencies { |
| 38 |
- compile group: "org.apache.ant", name: "ant", version: "1.8.2" |
| 39 |
+ //compile group: "org.apache.ant", name: "ant", version: "1.8.2" |
| 40 |
+ compile files('/usr/share/java/ant.jar') |
| 41 |
} |
| 42 |
|
| 43 |
// When producing the jar, we need to relocate a few class files |
| 44 |
@@ -2524,13 +2529,13 @@ |
| 45 |
|
| 46 |
def compileNativeTask = task("compileNative${t.capital}", dependsOn: generateHeaders) << { |
| 47 |
println "Building Webkit configuration /$webkitConfig/ into $webkitOutputDir" |
| 48 |
- |
| 49 |
+/* |
| 50 |
def dependencyFile = configurations.webkit.filter( |
| 51 |
{ File f -> f.getName().contains(classifier) } |
| 52 |
).getSingleFile() |
| 53 |
ant.unzip(src: dependencyFile, |
| 54 |
dest: webkitOutputDir) |
| 55 |
- |
| 56 |
+*/ |
| 57 |
exec { |
| 58 |
workingDir("$projectDir/src/main/native") |
| 59 |
commandLine("perl", "Tools/Scripts/set-webkit-configuration", "--$webkitConfig") |
| 60 |
--- java-1.8.0-openjfx-1.8.0.102/buildSrc/build.gradle~ 2016-10-03 15:11:57.021966277 +0200 |
| 61 |
+++ java-1.8.0-openjfx-1.8.0.102/buildSrc/build.gradle 2016-10-03 15:06:40.118961413 +0200 |
| 62 |
@@ -81,11 +81,14 @@ |
| 63 |
getConfigurations().create("antlr3"); |
| 64 |
|
| 65 |
dependencies { |
| 66 |
- compile group: "org.antlr", name: "antlr", version: "3.1.3" |
| 67 |
- testCompile group: "junit", name: "junit", version: "4.8.2" |
| 68 |
- antlr3 group: "org.antlr", name: "antlr-runtime", version: "3.1.3" |
| 69 |
- antlr3 group: "org.antlr", name: "stringtemplate", version: "3.2" |
| 70 |
- antlr3 group: "org.antlr", name: "antlr", version: "3.1.3" |
| 71 |
+ //compile group: "org.antlr", name: "antlr", version: "3.1.3" |
| 72 |
+ compile fileTree(dir: '/usr/share/java', include: ['antlr3.jar', 'antlr3-runtime.jar', 'stringtemplate4.jar', 'stringtemplate.jar', 'hamcrest/all.jar']) |
| 73 |
+ //testCompile group: "junit", name: "junit", version: "4.8.2" |
| 74 |
+ testCompile fileTree(dir: '/usr/share/java', include: ['junit.jar', 'antlr.jar']) |
| 75 |
+ //antlr3 group: "org.antlr", name: "antlr-runtime", version: "3.1.3" |
| 76 |
+ //antlr3 group: "org.antlr", name: "stringtemplate", version: "3.2" |
| 77 |
+ //antlr3 group: "org.antlr", name: "antlr", version: "3.1.3" |
| 78 |
+ antlr3 fileTree(dir: '/usr/share/java', include: ['antlr3.jar', 'antlr3-runtime.jar', 'stringtemplate4.jar']) |
| 79 |
} |
| 80 |
|
| 81 |
// At the moment the ASM library shipped with Gradle that is used to |
| 82 |
--- build.gradle~ 2016-10-03 15:33:30.851986135 +0200 |
| 83 |
+++ build.gradle 2016-10-03 16:32:00.613040005 +0200 |
Parent Directory
| 
Revision Log