This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository gluegen2.
commit 1ad6973a1f351dce4bd779e244c637db40436751 Author: Emmanuel Bourg <[email protected]> Date: Tue Dec 5 14:54:38 2017 +0100 Build with the DH sequencer instead of CDBS --- debian/ant.properties | 8 ++++ debian/changelog | 1 + debian/clean | 6 +++ debian/control | 1 - debian/libgluegen2-build-java.install | 7 +++ debian/libgluegen2-doc.install | 1 + debian/libgluegen2-jni.install | 1 + debian/patches/jarPath.diff | 19 --------- debian/patches/series | 2 +- debian/rules | 80 ++++++++++++----------------------- 10 files changed, 52 insertions(+), 74 deletions(-) diff --git a/debian/ant.properties b/debian/ant.properties new file mode 100644 index 0000000..bd551ee --- /dev/null +++ b/debian/ant.properties @@ -0,0 +1,8 @@ +target.sourcelevel=1.7 +target.targetlevel=1.7 +target.rt.jar=1.7 +antlr.jar=/usr/share/java/antlr.jar +junit.jar=/usr/share/java/junit4.jar +ant.jar=/usr/share/java/ant.jar +ant-junit.jar=/usr/share/ant/lib/ant-junit.jar +ant-junit4.jar=/usr/share/ant/lib/ant-junit4.jar diff --git a/debian/changelog b/debian/changelog index 39fe1a7..0307d86 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ gluegen2 (2.3.2-6) UNRELEASED; urgency=medium * Fixed the build failure with Java 9 (Closes: #874643) * Added mips64(el) and mipsn32(el) support. Thanks to YunQiang Su and Dejan Latinovic for the patch (Closes: #774832) + * Build with the DH sequencer instead of CDBS * Changed the source/target level to 1.7 * Standards-Version updated to 4.1.2 * Switch to debhelper level 10 diff --git a/debian/clean b/debian/clean new file mode 100644 index 0000000..a1dd241 --- /dev/null +++ b/debian/clean @@ -0,0 +1,6 @@ +build/ +build-temp/ +GnuCTreeParserTokenTypes.txt +STDCTokenTypes.txt +runtest.log +test/TestJarsInJar/TestJarsInJar.jar diff --git a/debian/control b/debian/control index 138298a..2e466bf 100644 --- a/debian/control +++ b/debian/control @@ -8,7 +8,6 @@ Build-Depends: ant-contrib, ant-contrib-cpptasks, ant-optional, - cdbs, debhelper (>= 10), default-jdk (>= 2:1.7), junit4, diff --git a/debian/libgluegen2-build-java.install b/debian/libgluegen2-build-java.install new file mode 100644 index 0000000..4d35d1e --- /dev/null +++ b/debian/libgluegen2-build-java.install @@ -0,0 +1,7 @@ +make/* /usr/share/gluegen2/make/ +build/artifact.properties /usr/share/gluegen2/ +jnlp-files/* /usr/share/gluegen2/jnlp-files/ +src/java/* /usr/share/gluegen2/src/java/ +src/junit/* /usr/share/gluegen2/src/junit/ +src/native/* /usr/share/gluegen2/src/native/ +test/junit/* /usr/share/gluegen2/test/junit diff --git a/debian/libgluegen2-doc.install b/debian/libgluegen2-doc.install new file mode 100644 index 0000000..688b316 --- /dev/null +++ b/debian/libgluegen2-doc.install @@ -0,0 +1 @@ +build/javadoc/gluegen/javadoc/* /usr/share/doc/libgluegen2-java/api/ diff --git a/debian/libgluegen2-jni.install b/debian/libgluegen2-jni.install new file mode 100644 index 0000000..399b926 --- /dev/null +++ b/debian/libgluegen2-jni.install @@ -0,0 +1 @@ +build/obj/libgluegen2-rt.so /usr/lib/jni/ diff --git a/debian/patches/jarPath.diff b/debian/patches/jarPath.diff deleted file mode 100644 index d6eb24a..0000000 --- a/debian/patches/jarPath.diff +++ /dev/null @@ -1,19 +0,0 @@ ---- a/make/gluegen-properties.xml -+++ b/make/gluegen-properties.xml -@@ -50,11 +50,11 @@ - <property file="${gluegen.user.properties.file.set}" /> - <echo message="Loaded ${gluegen.user.properties.file.set}." /> - <echo message="Setting defaults:" /> -- <property name="antlr.jar" value="${gluegen.root}/make/lib/antlr.jar" /> -- <property name="junit.jar" value="${gluegen.root}/make/lib/junit.jar" /> -- <property name="ant.jar" value="${ant.home}/lib/ant.jar" /> -- <property name="ant-junit.jar" value="${ant.home}/lib/ant-junit.jar" /> -- <property name="ant-junit4.jar" value="${ant.home}/lib/ant-junit4.jar" /> -+ <property name="antlr.jar" value="/usr/share/java/antlr.jar" /> -+ <property name="junit.jar" value="/usr/share/java/junit4.jar" /> -+ <property name="ant.jar" value="/usr/share/java/ant.jar" /> -+ <property name="ant-junit.jar" value="/usr/share/ant/lib/ant-junit.jar" /> -+<!-- <property name="ant-junit4.jar" value="${ant.home}/lib/ant-junit4.jar" />--> - <property name="semver.jar" value="${gluegen.root}/make/lib/semantic-versioning/semver.jar" /> - - <property name="android.version" value="9" /> <!-- default - if not set by jogamp-env.xml:jogamp.env.init --> diff --git a/debian/patches/series b/debian/patches/series index e68522c..74c2a01 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,5 +1,5 @@ ppc64el-support.diff -jarPath.diff +#jarPath.diff renamedLibrary.diff disableArchive7z.diff #other-archs.diff diff --git a/debian/rules b/debian/rules index 6a41f45..3536836 100755 --- a/debian/rules +++ b/debian/rules @@ -1,70 +1,44 @@ #!/usr/bin/make -f -include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/ant.mk - -JAVA_HOME := /usr/lib/jvm/default-java/ -DEB_JARS := ant-launcher antlrall ant-antlr ant-contrib ant-contrib-cpptasks ant-junit jsr305 -DEB_ANT_CLEAN_TARGET := clean -DEB_BUILDDIR := make -DEB_ANT_BUILD_TARGET := all -DEB_ANT_ARGS += -Dtarget.sourcelevel=1.7 -Dtarget.targetlevel=1.7 -Dtarget.rt.jar=1.7 +include /usr/share/dpkg/pkg-info.mk ifeq ($(DEB_HOST_ARCH),armhf) -DEB_ANT_ARGS += -DisAbiEabiGnuArmhf=true +EXTRA_ANT_ARGS = -DisAbiEabiGnuArmhf=true endif -install/libgluegen2-rt-java:: - mh_install -plibgluegen2-rt-java +export CLASSPATH=/usr/share/java/jsr305.jar:/usr/share/java/ant-contrib-cpptasks.jar -install/libgluegen2-build-java:: - mkdir -p $(CURDIR)/debian/libgluegen2-build-java/usr/share/gluegen2/make/ - cp -R make/* debian/libgluegen2-build-java/usr/share/gluegen2/make/ - cp -R build/artifact.properties debian/libgluegen2-build-java/usr/share/gluegen2/ - mkdir -p $(CURDIR)/debian/libgluegen2-build-java/usr/share/gluegen2/jnlp-files/ - cp -R jnlp-files/* debian/libgluegen2-build-java/usr/share/gluegen2/jnlp-files/ - mkdir -p $(CURDIR)/debian/libgluegen2-build-java/usr/share/gluegen2/src/java/ - cp -R src/java/* debian/libgluegen2-build-java/usr/share/gluegen2/src/java/ - mkdir -p $(CURDIR)/debian/libgluegen2-build-java/usr/share/gluegen2/src/native/ - cp -R src/junit/* debian/libgluegen2-build-java/usr/share/gluegen2/src/junit/ - mkdir -p $(CURDIR)/debian/libgluegen2-build-java/usr/share/gluegen2/src/junit/ - cp -Rf src/native/* debian/libgluegen2-build-java/usr/share/gluegen2/src/native/ - mkdir -p $(CURDIR)/debian/libgluegen2-build-java/usr/share/gluegen2/test/junit/ - cp -Rf test/junit/* debian/libgluegen2-build-java/usr/share/gluegen2/test/junit - install -m 644 -D build/gluegen.jar debian/libgluegen2-build-java/usr/share/java/gluegen2-$(DEB_UPSTREAM_VERSION).jar - ln -s gluegen2-$(DEB_UPSTREAM_VERSION).jar debian/libgluegen2-build-java/usr/share/java/gluegen2.jar - find debian/libgluegen2-build-java/usr/share/gluegen2/ -type f -exec chmod a-x {} \; -#extra license - chmod +x debian/libgluegen2-build-java/usr/share/gluegen2/make/scripts/*.sh - rm debian/libgluegen2-build-java/usr/share/gluegen2/src/java/com/jogamp/gluegen/cgram/license.txt +%: + dh $@ --buildsystem=ant --with maven-repo-helper + +override_dh_auto_configure: + -mv src/junit/com/jogamp/junit/util/VersionSemanticsUtil.java src/junit/com/jogamp/junit/util/VersionSemanticsUtil.java.disabled + -mv src/junit/com/jogamp/common/util/TestVersionSemantics.java src/junit/com/jogamp/common/util/TestVersionSemantics.java.disabled + +override_dh_auto_build: + dh_auto_build -- -f make/build.xml all javadoc $(EXTRA_ANT_ARGS) -install/libgluegen2-jni:: - install -m 644 -D build/obj/libgluegen2-rt.so debian/libgluegen2-jni/usr/lib/jni/libgluegen2-rt.so +override_dh_auto_test: + ANT_PATH=/usr/share/ant make/scripts/runtest.sh build -install/libgluegen2-doc:: - $(DEB_ANT_INVOKE) javadoc - mkdir -p debian/libgluegen2-doc/usr/share/doc/libgluegen2-java/ - cp -Rf build/javadoc/gluegen/javadoc/* debian/libgluegen2-doc/usr/share/doc/libgluegen2-java/ +override_dh_install-indep: + dh_install -i -# Run the test suite -common-post-build-arch:: - ANT_PATH=/usr/share/ant make/scripts/runtest.sh $(CURDIR)/build + install -m 644 -D build/gluegen.jar debian/libgluegen2-build-java/usr/share/java/gluegen2-$(DEB_VERSION_UPSTREAM).jar + ln -s gluegen2-$(DEB_VERSION_UPSTREAM).jar debian/libgluegen2-build-java/usr/share/java/gluegen2.jar -DISABLED_TESTS := junit/util/VersionSemanticsUtil common/util/TestVersionSemantics -post-patches:: - cd src/junit/com/jogamp && \ - $(foreach test,$(DISABLED_TESTS),if [ -f $(test).java ]; then mv $(test).java $(test).java.disabled; fi &&) true + find debian/libgluegen2-build-java/usr/share/gluegen2/ -type f -exec chmod a-x {} \; + + chmod +x debian/libgluegen2-build-java/usr/share/gluegen2/make/scripts/*.sh + + rm debian/libgluegen2-build-java/usr/share/gluegen2/src/java/com/jogamp/gluegen/cgram/license.txt -clean:: - mh_clean - $(RM) -r gluegen/build build-temp - $(RM) make/GnuCTreeParserTokenTypes.txt make/STDCTokenTypes.txt - cd src/junit/com/jogamp && \ - $(foreach test,$(DISABLED_TESTS),if [ -f $(test).java.disabled ]; then mv $(test).java.disabled $(test).java; fi &&) true - $(RM) test/TestJarsInJar/TestJarsInJar.jar runtest.log +override_dh_auto_clean: + -mv src/junit/com/jogamp/junit/util/VersionSemanticsUtil.java.disabled src/junit/com/jogamp/junit/util/VersionSemanticsUtil.java + -mv src/junit/com/jogamp/common/util/TestVersionSemantics.java.disabled src/junit/com/jogamp/common/util/TestVersionSemantics.java get-orig-pom: - wget https://repo1.maven.org/maven2/org/jogamp/gluegen/gluegen-rt/$(DEB_UPSTREAM_VERSION)/gluegen-rt-$(DEB_UPSTREAM_VERSION).pom -O debian/pom-gluegen-rt.xml + wget https://repo1.maven.org/maven2/org/jogamp/gluegen/gluegen-rt/$(DEB_VERSION_UPSTREAM)/gluegen-rt-$(DEB_VERSION_UPSTREAM).pom -O debian/pom-gluegen-rt.xml get-orig-source:: uscan --download-current-version --no-symlink --force-download -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/gluegen2.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
