cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

java/openjfx8-devel fix build with Gradle 3.2.1

Browse Source 
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
This commit is contained in:
Alan Somers 2017-01-04 15:54:28 +00:00
parent ab2bd489eb
commit aa76e1de42
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=430571
3 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
java/openjfx8-devel/Makefile
View File

@ -11,7 +11,7 @@ PKGNAMESUFFIX= -devel
DISTNAME= freebsd${PORTVERSION}
DIST_SUBDIR= ${PORTNAME}
MAINTAINER= t@tobik.me
MAINTAINER= ports@FreeBSD.org
COMMENT= JavaFX (OpenJFX) SDK overlay for OpenJDK 8
LICENSE= GPLv2
@ -20,6 +20,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
BUILD_DEPENDS= apache-ant>0:devel/apache-ant \
antlr3>0:devel/antlr3 \
gradle:devel/gradle \
${JAVALIBDIR}/junit.jar:java/junit \
swt-devel>0:x11-toolkits/swt-devel
RUN_DEPENDS= swt-devel>0:x11-toolkits/swt-devel

16
java/openjfx8-devel/files/patch-build.gradle
View File

@ -9,21 +9,23 @@
def keySplit = property.key.split("\\.");
def key = keySplit[0];
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
// setup this dependency here.
dependencies {
- 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) {
testCompile name: "jcov"
}
@@ -1307,11 +1307,9 @@ project(":graphics") {
@@ -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"),
+ 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"
@ -32,7 +34,7 @@
}
// 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 {
into libsDir
from f.getParentFile()
@ -43,7 +45,7 @@
includeEmptyDirs = false
}
// 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 {
@ -52,7 +54,7 @@
}
// 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 packagerJar

5
java/openjfx8-devel/files/patch-buildSrc_build.gradle
View File

@ -1,6 +1,6 @@
--- buildSrc/build.gradle.orig 2016-02-28 12:54:50 UTC
+++ buildSrc/build.gradle
@@ -81,11 +81,9 @@ sourceSets {
@@ -81,11 +81,10 @@ sourceSets {
getConfigurations().create("antlr3");
dependencies {
@ -10,7 +10,8 @@
- antlr3 group: "org.antlr", name: "stringtemplate", version: "3.2"
- antlr3 group: "org.antlr", name: "antlr", version: "3.1.3"
+ compile files("%%PREFIX%%/share/java/classes/antlr-3.5.2-complete.jar")
+ testCompile files("%%PREFIX%%/share/java/classes/junit4.jar")
+ testCompile files("%%PREFIX%%/share/java/classes/junit4.jar",
+ "%%PREFIX%%/share/java/classes/hamcrest.jar")
+ antlr3 files("%%PREFIX%%/share/java/classes/antlr-3.5.2-complete.jar")
}