This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository antlr.
commit 5d90cb582eb90657e9c1d24e46d573b39c44e757 Author: Emmanuel Bourg <[email protected]> Date: Tue Oct 24 16:23:02 2017 +0200 Build with the DH sequencer --- debian/Makefile.debian | 28 -------- debian/antlr-doc.dirs | 1 - debian/antlr.dirs | 2 - debian/antlr.install | 1 + debian/changelog | 1 + debian/clean | 26 +++++++ debian/libantlr-dev.dirs | 3 - debian/libantlr-dev.install | 2 + debian/libantlr-java.dirs | 2 - debian/libantlr-java.links | 2 + debian/libantlr-java.poms | 2 +- debian/rules | 172 ++++++++------------------------------------ 12 files changed, 64 insertions(+), 178 deletions(-) diff --git a/debian/Makefile.debian b/debian/Makefile.debian deleted file mode 100644 index 8402916..0000000 --- a/debian/Makefile.debian +++ /dev/null @@ -1,28 +0,0 @@ -# *** Debian rules start here *** -JAVAC=/usr/lib/jvm/default-java/bin/javac -JAR=/usr/lib/jvm/default-java/bin/jar - -build_antlr: compile makejar - -JAVA_FILES=`find antlr -name '*.java'` -#compile the java files from scratch and make an executable -compile: - $(JAVAC) -source 1.7 $(JAVA_FILES) - -makejar: - $(JAR) cf antlr.jar `find . -name '*.class'` -# cp antlr.jar antlrall.jar -# cp antlr.jar antlr.debug.jar - -clean: - rm -f `find . -name '*.class'` - rm -f `find . -name '*.jar'` - -install: - mkdir -p $(DESTDIR)/usr/share/java - install -m644 antlr.jar $(DESTDIR)/usr/share/java -# install -m644 antlrall.jar $(DESTDIR)/usr/share/java -# install -m644 antlr.debug.jar $(DESTDIR)/usr/share/java - mkdir -p $(DESTDIR)/usr/bin - cp bin/antlr $(DESTDIR)/usr/bin/runantlr - chmod 755 $(DESTDIR)/usr/bin/runantlr diff --git a/debian/antlr-doc.dirs b/debian/antlr-doc.dirs deleted file mode 100644 index 4e85e76..0000000 --- a/debian/antlr-doc.dirs +++ /dev/null @@ -1 +0,0 @@ -usr/share/doc/antlr-doc diff --git a/debian/antlr.dirs b/debian/antlr.dirs deleted file mode 100644 index dbc27cc..0000000 --- a/debian/antlr.dirs +++ /dev/null @@ -1,2 +0,0 @@ -usr/bin -usr/share/doc/antlr diff --git a/debian/antlr.install b/debian/antlr.install new file mode 100644 index 0000000..9c18146 --- /dev/null +++ b/debian/antlr.install @@ -0,0 +1 @@ +target/runantlr usr/bin/ diff --git a/debian/changelog b/debian/changelog index 82fdce1..c40bb64 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ antlr (2.7.7+dfsg-8) UNRELEASED; urgency=medium * Fixed the build failure with Java 9 (Closes: #873971) + * Build with the DH sequencer * Removed the remaining references to cantlr and gcj * Removed the no longer used antlr.snk file (C# signing key) * Moved the package to Git diff --git a/debian/clean b/debian/clean new file mode 100644 index 0000000..0967382 --- /dev/null +++ b/debian/clean @@ -0,0 +1,26 @@ +lib/cpp/src/.deps +lib/cpp/config.sub +lib/cpp/config.guess +lib/cpp/config.cache +lib/cpp/config.log +lib/cpp/scripts/config.sub +lib/cpp/scripts/config.guess +lib/cpp/scripts/config.cache +lib/cpp/scripts/config.log +config.status +config.log +scripts/*.sh +scripts/run-antlr +scripts/antlr-config +scripts/antlr.spec +scripts/config.deps +scripts/config.make +scripts/config.vars +scripts/config.guess +scripts.config.sub +antlr/Version.java +debian/libantlr-pic.a +debian/.wapi +debian/tmp +target/ +antlr.jar diff --git a/debian/libantlr-dev.dirs b/debian/libantlr-dev.dirs deleted file mode 100644 index 2a5d8dc..0000000 --- a/debian/libantlr-dev.dirs +++ /dev/null @@ -1,3 +0,0 @@ -usr/bin -usr/lib -usr/share/doc/libantlr-dev diff --git a/debian/libantlr-dev.install b/debian/libantlr-dev.install new file mode 100644 index 0000000..809fdc4 --- /dev/null +++ b/debian/libantlr-dev.install @@ -0,0 +1,2 @@ +scripts/antlr-config usr/bin/ +debian/libantlr-pic.a usr/lib/ diff --git a/debian/libantlr-java.dirs b/debian/libantlr-java.dirs deleted file mode 100644 index 524b6bf..0000000 --- a/debian/libantlr-java.dirs +++ /dev/null @@ -1,2 +0,0 @@ -usr/share/doc/libantlr-java -usr/share/java diff --git a/debian/libantlr-java.links b/debian/libantlr-java.links new file mode 100644 index 0000000..e55f577 --- /dev/null +++ b/debian/libantlr-java.links @@ -0,0 +1,2 @@ +usr/share/java/antlr.jar usr/share/java/antlr.debug.jar +usr/share/java/antlr.jar usr/share/java/antlrall.jar diff --git a/debian/libantlr-java.poms b/debian/libantlr-java.poms index 1a7e280..90a819b 100644 --- a/debian/libantlr-java.poms +++ b/debian/libantlr-java.poms @@ -1 +1 @@ -debian/pom.xml +debian/pom.xml --java-lib --artifact=antlr.jar diff --git a/debian/rules b/debian/rules index 6926273..547fb6b 100755 --- a/debian/rules +++ b/debian/rules @@ -1,163 +1,53 @@ #!/usr/bin/make -f -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 +include /usr/share/dpkg/pkg-info.mk -PACKAGE := antlr -VERSION := $(shell dpkg-parsechangelog | grep ^Version: | cut -d' ' -f2 | cut -d- -f1 | cut -d+ -f1) +%: + dh $@ --with maven-repo-helper --with python2 -configure: configure-stamp -configure-stamp: - dh_testdir +override_dh_auto_configure: cp /usr/share/misc/config.* scripts JAVAC='/usr/lib/jvm/default-java/bin/javac -source 1.7' CLASSPATH=`pwd` JAVA=/usr/lib/jvm/default-java/bin/java \ - ./configure \ - --prefix=/usr \ - --mandir=\$${prefix}/share/man - touch configure-stamp + ./configure --prefix=/usr --mandir=\$${prefix}/share/man -build-indep: configure build-stamp-indep -build-stamp-indep: - dh_testdir - $(MAKE) -f debian/Makefile.debian build_antlr - touch build-stamp-indep +override_dh_auto_build-indep: + mkdir -p target/classes + javac -source 1.7 -target 1.7 -d target/classes $(shell find antlr -name '*.java') + jar cvf antlr.jar -C target/classes . -# Do not depend on build-indep as B-D-I may not be available and -# buildd blindly call build. Instead, binary depends on binary-indep -# which in turn depends on build-indep (via install-indep). -build: build-arch -build-arch: configure build-stamp -build-stamp: - dh_testdir - $(MAKE) -f debian/Makefile.debian compile build_antlr + cp bin/antlr target/runantlr + +override_dh_auto_build-arch: $(MAKE) -C lib/cpp CXXFLAGS="+ -fPIC -DPIC" mv -f lib/cpp/src/libantlr.a debian/libantlr-pic.a - $(MAKE) -C lib/cpp clean - $(MAKE) -C lib/cpp - touch build-stamp -clean: - dh_testdir - dh_testroot - -rm -f build-stamp build-stamp-indep configure-stamp - [ ! -f debian/Makefile.debian ] || $(MAKE) -f debian/Makefile.debian clean - -cd lib/cpp; $(MAKE) clean - -rm -rf lib/cpp/src/.deps - -rm -f lib/cpp/config.sub lib/cpp/config.guess lib/cpp/config.cache lib/cpp/config.log - -rm -f lib/cpp/scripts/config.sub lib/cpp/scripts/config.guess lib/cpp/scripts/config.cache lib/cpp/scripts/config.log - -rm config.status config.log - -find -name Makefile | xargs rm -f - -rm -f scripts/*.sh - -rm -f scripts/antlr-config scripts/config.deps scripts/antlr.spec scripts/config.make scripts/config.vars - -rm -f scripts/config.guess scripts.config.sub - -rm -f antlr/Version.java - -rm -f debian/libantlr-pic.a - -rm -rf debian/.wapi - -rm -rf debian/tmp - dh_clean + $(MAKE) -C lib/cpp clean all + +override_dh_auto_test: -install-indep: build-indep - dh_testdir - dh_testroot - dh_prep -i - dh_installdirs -i - dh_install -i - dh_link -i - $(MAKE) -f debian/Makefile.debian install DESTDIR=`pwd`/debian/antlr - mv debian/antlr/usr/share/java/* debian/libantlr-java/usr/share/java/ - rmdir debian/antlr/usr/share/java/ +override_dh_auto_install-indep: mkdir -p debian/python-antlr/usr/lib/$$(pyversions -d)/dist-packages - install -m644 lib/python/antlr/antlr.py \ - debian/python-antlr/usr/lib/$$(pyversions -d)/dist-packages/. - install -m644 -D CHANGES.txt debian/antlr/usr/share/doc/antlr/changelog - install -m644 -D CHANGES.txt debian/antlr-doc/usr/share/doc/antlr-doc/changelog - mh_installpoms -plib$(PACKAGE)-java - mh_linkjar -plib$(PACKAGE)-java -l debian/pom.xml usr/share/java/antlr.jar + install -m644 lib/python/antlr/antlr.py debian/python-antlr/usr/lib/$$(pyversions -d)/dist-packages/. -install: build - dh_testdir - dh_testroot - dh_prep -a - dh_installdirs -a - dh_install -a - dh_link -a +override_dh_auto_install-arch: $(MAKE) -C lib/cpp install prefix=`pwd`/debian/libantlr-dev/usr - install -m755 scripts/antlr-config debian/libantlr-dev/usr/bin - install -m644 -D CHANGES.txt debian/libantlr-dev/usr/share/doc/libantlr-dev/changelog - install -m644 debian/libantlr-pic.a debian/libantlr-dev/usr/lib/ -binary-indep: build-indep install-indep - dh_testdir - dh_testroot - # antlr-doc - dh_installdocs -pantlr-doc - dh_installexamples -pantlr-doc - dh_installchangelogs -pantlr-doc - rm -rf debian/antlr-doc/usr/share/doc/antlr-doc/examples/csharp +override_dh_installchangelogs: + dh_installchangelogs -- CHANGES.txt + +override_dh_installdocs: + dh_installdocs rm -f debian/antlr-doc/usr/share/doc/antlr-doc/csharp-runtime.html rm -f debian/antlr-doc/usr/share/doc/antlr-doc/Makefile* - find debian/antlr-doc/usr/share/doc/antlr-doc/examples -type f -print | xargs chmod 0644 - dh_fixperms -pantlr-doc - dh_compress -pantlr-doc - dh_installdeb -pantlr-doc - dh_gencontrol -pantlr-doc - dh_md5sums -pantlr-doc - dh_builddeb -pantlr-doc - # antlr - dh_installman -pantlr - dh_installdocs -pantlr - dh_installchangelogs -pantlr - dh_compress -pantlr - dh_fixperms -pantlr - dh_installdeb -pantlr - dh_gencontrol -pantlr - dh_md5sums -pantlr - dh_builddeb -pantlr - # antlr - dh_installman -plibantlr-java - dh_installdocs -plibantlr-java - dh_installchangelogs -plibantlr-java - dh_link -plibantlr-java \ - usr/share/java/antlr.jar usr/share/java/antlr.debug.jar \ - usr/share/java/antlr.jar usr/share/java/antlrall.jar - dh_compress -plibantlr-java - dh_fixperms -plibantlr-java - dh_installdeb -plibantlr-java - dh_gencontrol -plibantlr-java - dh_md5sums -plibantlr-java - dh_builddeb -plibantlr-java - # python-antlr - dh_installdocs -ppython-antlr - dh_installchangelogs -ppython-antlr - dh_python2 -ppython-antlr - dh_compress -ppython-antlr - dh_fixperms -ppython-antlr - dh_installdeb -ppython-antlr - dh_gencontrol -ppython-antlr - dh_md5sums -ppython-antlr - dh_builddeb -ppython-antlr +override_dh_installexamples: + dh_installexamples + find debian/antlr-doc/usr/share/doc/antlr-doc/examples -type f -print | xargs chmod 0644 + rm -rf debian/antlr-doc/usr/share/doc/antlr-doc/examples/csharp -binary-arch: build install - # libantlr-dev - dh_testdir - dh_testroot - dh_installdocs -plibantlr-dev - dh_installexamples -plibantlr-dev - dh_installchangelogs -plibantlr-dev - dh_strip -plibantlr-dev - dh_compress -plibantlr-dev - dh_fixperms -plibantlr-dev - dh_makeshlibs -plibantlr-dev - dh_installdeb -plibantlr-dev - dh_shlibdeps -plibantlr-dev - dh_gencontrol -plibantlr-dev - dh_md5sums -plibantlr-dev - dh_builddeb -plibantlr-dev - -binary: binary-indep binary-arch -.PHONY: build build-arch build-indep clean binary-indep binary-arch binary install +override_dh_auto_clean: + -cd lib/cpp; $(MAKE) clean + -find -name Makefile | xargs rm -f get-orig-pom: - wget -O debian/pom.xml http://repository.sonatype.org/service/local/repositories/central/content/antlr/antlr/$(VERSION)/antlr-$(VERSION).pom - + wget -O debian/pom.xml http://repository.sonatype.org/service/local/repositories/central/content/antlr/antlr/$(DEB_VERSION_UPSTREAM)/antlr-$(DEB_VERSION_UPSTREAM).pom -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/antlr.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
