[openjfx] 01/03: Build with gradle-debian-helper
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Thu Oct 15 19:59:19 UTC 2015
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository openjfx.
commit cbd3302e37cdf89760c8ea60fe9a109670630eda
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Thu Oct 15 16:42:18 2015 +0200
Build with gradle-debian-helper
---
debian/changelog | 7 ++
debian/control | 2 +-
debian/maven.rules | 3 +
debian/patches/02-use-system-libraries.patch | 100 ++++-----------------------
debian/rules | 11 +--
5 files changed, 25 insertions(+), 98 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index adff4d9..70993cc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+openjfx (8u60-b27-5) UNRELEASED; urgency=medium
+
+ * Team upload.
+ * Build with gradle-debian-helper
+
+ -- Emmanuel Bourg <ebourg at apache.org> Thu, 15 Oct 2015 21:56:59 +0200
+
openjfx (8u60-b27-4) unstable; urgency=medium
* Team upload.
diff --git a/debian/control b/debian/control
index 8e1e0b5..484bc41 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Build-Depends: antlr3,
debhelper (>= 9),
flex,
gperf,
- gradle,
+ gradle-debian-helper,
junit4,
libasound2-dev,
libavcodec-dev,
diff --git a/debian/maven.rules b/debian/maven.rules
new file mode 100644
index 0000000..75bb1b9
--- /dev/null
+++ b/debian/maven.rules
@@ -0,0 +1,3 @@
+junit junit * s/.*/4.x/ * *
+org.antlr antlr* * s/.*/3.x/ * *
+org.antlr stringtemplate * s/.*/3.x/ * *
diff --git a/debian/patches/02-use-system-libraries.patch b/debian/patches/02-use-system-libraries.patch
index a05efee..e860f0c 100644
--- a/debian/patches/02-use-system-libraries.patch
+++ b/debian/patches/02-use-system-libraries.patch
@@ -3,62 +3,16 @@ Author: Emmanuel Bourg <ebourg at apache.org>
Forwarded: not-needed
--- a/build.gradle
+++ b/build.gradle
-@@ -1148,12 +1148,8 @@
- // closed gradle file instead.
- if (!BUILD_CLOSED) {
- repositories {
-- mavenCentral()
-- ivy {
-- url "http://download.eclipse.org/eclipse/updates/3.7/R-3.7.2-201202080800/plugins/"
-- layout "pattern", {
-- artifact "[artifact].[ext]"
-- }
-+ maven {
-+ url "file:/usr/share/maven-repo"
- }
- }
- }
-@@ -1161,7 +1157,7 @@
- // 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 group: "junit", name: "junit", version: "4.x"
- if (BUILD_CLOSED && DO_JCOV) {
- testCompile name: "jcov"
- }
-@@ -1299,12 +1295,12 @@
+@@ -1299,7 +1299,7 @@
dependencies {
compile project(":base"), BUILD_SRC
- compile name: SWT_FILE_NAME
-- stubCompile group: "junit", name: "junit", version: "4.8.2",
+ compile files("/usr/share/java/swt-gtk-3.8.jar")
-+ stubCompile group: "junit", name: "junit", version: "4.x",
+ stubCompile group: "junit", name: "junit", version: "4.8.2",
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 group: "org.antlr", name: "antlr", version: "3.x"
-+ antlr3 group: "org.antlr", name: "antlr-runtime", version: "3.x"
-+ antlr3 group: "org.antlr", name: "stringtemplate", version: "3.x"
- }
-
- // Create a single "native" task which will depend on all the individual native tasks for graphics
-@@ -1594,9 +1590,9 @@
- 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.x.jar"
-+ include "**/stringtemplate-3.x.jar"
-+ include "**/antlr-runtime-3.x.jar"
- includeEmptyDirs = false
- }
- // Have to rename the swt jar because it is some platform specific name but
-@@ -1680,7 +1676,7 @@
+ antlr3 group: "org.antlr", name: "antlr", version: "3.1.3"
+@@ -1680,7 +1680,7 @@
}
dependencies {
compile BUILD_SRC, project(":base"), project(":graphics")
@@ -67,16 +21,7 @@ Forwarded: not-needed
}
}
-@@ -1779,7 +1775,7 @@
- }
-
- dependencies {
-- compile group: "org.apache.ant", name: "ant", version: "1.8.2"
-+ compile group: "org.apache.ant", name: "ant", version: "debian"
- }
-
- // When producing the jar, we need to relocate a few class files
-@@ -2043,13 +2039,13 @@
+@@ -2043,13 +2043,13 @@
classes << {
// Copy all of the download libraries to libs directory for the sake of the IDEs
File libsDir = rootProject.file("build/libs");
@@ -92,7 +37,7 @@ Forwarded: not-needed
includeEmptyDirs = false
}
}
-@@ -2510,11 +2506,13 @@
+@@ -2510,11 +2510,13 @@
def compileNativeTask = task("compileNative${t.capital}", dependsOn: generateHeaders) << {
println "Building Webkit configuration /$webkitConfig/ into $webkitOutputDir"
@@ -108,32 +53,11 @@ Forwarded: not-needed
workingDir("$projectDir/src/main/native")
--- a/buildSrc/build.gradle
+++ b/buildSrc/build.gradle
-@@ -66,7 +66,9 @@
- }
- }
- } else {
-- mavenCentral()
-+ maven {
-+ url "file:/usr/share/maven-repo"
-+ }
- }
- }
-
-@@ -81,11 +83,12 @@
- getConfigurations().create("antlr3");
+@@ -82,6 +82,7 @@
dependencies {
-- compile group: "org.antlr", name: "antlr", version: "3.1.3"
-- testCompile group: "junit", name: "junit", version: "4.8.2"
-- 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: "antlr", version: "3.1.3"
-+ compile group: "org.antlr", name: "antlr", version: "3.x"
-+ compile group: "org.antlr", name: "stringtemplate", version: "3.x"
-+ testCompile group: "junit", name: "junit", version: "4.x"
-+ antlr3 group: "org.antlr", name: "antlr-runtime", version: "3.x"
-+ antlr3 group: "org.antlr", name: "stringtemplate", version: "3.x"
-+ antlr3 group: "org.antlr", name: "antlr", version: "3.x"
- }
-
- // At the moment the ASM library shipped with Gradle that is used to
+ compile group: "org.antlr", name: "antlr", version: "3.1.3"
++ compile group: "org.antlr", name: "stringtemplate", version: "3.2"
+ testCompile group: "junit", name: "junit", version: "4.8.2"
+ antlr3 group: "org.antlr", name: "antlr-runtime", version: "3.1.3"
+ antlr3 group: "org.antlr", name: "stringtemplate", version: "3.2"
diff --git a/debian/rules b/debian/rules
index 04445bd..ad93734 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,11 +3,6 @@
DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
-# gradle runs a long time without output
-ifneq (,$(filter $(DEB_HOST_ARCH), armel armhf arm64 mips mipsel))
- gradle_debug = --debug
-endif
-
# FIXME: looks like s390x is recognized as a 32bit arch ...
# more heap on s390x needed
ifneq (,$(filter $(DEB_HOST_ARCH), s390x))
@@ -29,10 +24,9 @@ jvm_arch := $(strip $(patsubst $(DEB_HOST_ARCH_CPU)=%, %, $(filter $(DEB_HOST_
arch_only = $(shell (dh_listpackages | fgrep -q libopenjfx-java-doc) || echo yes)
%:
- dh $@
+ dh $@ --buildsystem=gradle
override_dh_auto_build:
- dh_auto_build
ifeq ($(arch_only),yes)
cp debian/gradle.properties.arch gradle.properties
else
@@ -50,7 +44,7 @@ endif
cp modules/web/src/main/java/com/sun/webkit/dom/JSObject.java modules/web/build/linux/Release/WebCore/generated/java/com/sun/webkit/dom/
cp modules/web/src/main/java/com/sun/webkit/perf/PerfLogger.java modules/web/build/linux/Release/WebCore/generated/java/com/sun/webkit/perf/
- $(SET_JAVA_OPTS) gradle --offline --stacktrace $(gradle_debug) --refresh-dependencies --gradle-user-home .gradle
+ $(SET_JAVA_OPTS) dh_auto_build -- sdk
override_dh_install:
ifneq ($(arch_only),yes)
@@ -84,7 +78,6 @@ ifneq ($(arch_only),yes)
endif
override_dh_auto_clean:
- dh_auto_clean
rm -f gradle.properties
rm -Rf build .gradle buildSrc/.gradle/ buildSrc/build/
rm -Rf modules/base/build/
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/openjfx.git
More information about the pkg-java-commits
mailing list