mirror of
https://git.freebsd.org/ports.git
synced 2025-06-17 10:40:46 -04:00
aa76e1de42
Add a missing build dependency on junit to the Makefile, and fix the path to Hamcrest in build.gradle. Also, reset MAINTAINER by request of the current maintainer. PR: 215677 Reviewed by: brd, Tobias Kortkamp Approved by: brd (ports) Sponsored by: Spectra Logic Corp Differential Revision: https://reviews.freebsd.org/D9005
78 lines
3.3 KiB
Groovy
78 lines
3.3 KiB
Groovy
--- build.gradle.orig 2016-02-28 12:54:50 UTC
|
|
+++ build.gradle
|
|
@@ -125,7 +125,7 @@ void loadProperties(String sourceFileNam
|
|
def propFile = new File(sourceFileName)
|
|
if (propFile.canRead()) {
|
|
config.load(new FileInputStream(propFile))
|
|
- for (Map.Entry property in config) {
|
|
+ for (property in config) {
|
|
def keySplit = property.key.split("\\.");
|
|
def key = keySplit[0];
|
|
for (int i = 1; i < keySplit.length; i++) {
|
|
@@ -1167,7 +1167,8 @@ allprojects {
|
|
// By default all of our projects require junit for testing so we can just
|
|
// setup this dependency here.
|
|
dependencies {
|
|
- testCompile group: "junit", name: "junit", version: "4.8.2"
|
|
+ testCompile files("%%PREFIX%%/share/java/classes/junit4.jar",
|
|
+ "%%PREFIX%%/share/java/classes/hamcrest.jar")
|
|
if (BUILD_CLOSED && DO_JCOV) {
|
|
testCompile name: "jcov"
|
|
}
|
|
@@ -1307,11 +1308,10 @@ project(":graphics") {
|
|
dependencies {
|
|
compile project(":base"), BUILD_SRC
|
|
compile files("/usr/local/share/java/classes/swt-devel.jar")
|
|
- stubCompile group: "junit", name: "junit", version: "4.8.2",
|
|
+ stubCompile files("%%PREFIX%%/share/java/classes/junit4.jar",
|
|
+ "%%PREFIX%%/share/java/classes/hamcrest.jar"),
|
|
project(":base").sourceSets.test.output, sourceSets.main.output
|
|
- 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: "stringtemplate", version: "3.2"
|
|
+ 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
|
|
@@ -1601,9 +1601,7 @@ project(":graphics") {
|
|
copy {
|
|
into libsDir
|
|
from f.getParentFile()
|
|
- include "**/antlr-3.1.3.jar"
|
|
- include "**/stringtemplate-3.2.jar"
|
|
- include "**/antlr-runtime-3.1.3.jar"
|
|
+ include "**/antlr-3.5.2-complete.jar"
|
|
includeEmptyDirs = false
|
|
}
|
|
// Have to rename the swt jar because it is some platform specific name but
|
|
@@ -1787,7 +1785,7 @@ project(":fxpackager") {
|
|
}
|
|
|
|
dependencies {
|
|
- compile group: "org.apache.ant", name: "ant", version: "1.8.2"
|
|
+ compile files("%%PREFIX%%/share/java/apache-ant/lib/ant.jar")
|
|
}
|
|
|
|
// When producing the jar, we need to relocate a few class files
|
|
@@ -2048,21 +2046,6 @@ project(":fxpackager") {
|
|
jar.dependsOn buildJavaPackager
|
|
jar.dependsOn packagerJar
|
|
|
|
- classes << {
|
|
- // Copy all of the download libraries to libs directory for the sake of the IDEs
|
|
- File libsDir = rootProject.file("build/libs");
|
|
- File antLib = new File(libsDir, "ant-1.8.2.jar")
|
|
- libsDir.mkdirs();
|
|
- for (File f : configurations.compile.files) {
|
|
- copy {
|
|
- into libsDir
|
|
- from f.getParentFile()
|
|
- include "**/ant-1.8.2.jar"
|
|
- includeEmptyDirs = false
|
|
- }
|
|
- }
|
|
- }
|
|
-
|
|
task packagerFakeJar(type: Jar) {
|
|
dependsOn compileTestJava
|
|
from compileTestJava.destinationDir
|