ant: convert from binary to source build

2019-12-23 23:06:08 +11:00 · 2019-12-23 23:06:08 +11:00 · 68c91a5ed2
commit 68c91a5ed2
parent e8d7c588b3
4 changed files with 95 additions and 103 deletions
--- a/ant/.footprint
+++ b/ant/.footprint
@ -1,91 +1,60 @@
+drwxr-xr-x	root/root	etc/
+-rw-r--r--	root/root	etc/ant.conf
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/bin/
-lrwxrwxrwx	root/root	usr/bin/ant -> /usr/lib/ant/bin/ant
-drwxr-xr-x	root/root	usr/lib/
-drwxr-xr-x	root/root	usr/lib/ant/
-drwxr-xr-x	root/root	usr/lib/ant/bin/
-rwxr-xr-x	root/root	usr/lib/ant/bin/ant
-rw-r--r--	root/root	usr/lib/ant/bin/ant.cmd
-rwxr-xr-x	root/root	usr/lib/ant/bin/antRun
-rwxr-xr-x	root/root	usr/lib/ant/bin/antRun.pl
-rw-r--r--	root/root	usr/lib/ant/bin/antenv.cmd
-rwxr-xr-x	root/root	usr/lib/ant/bin/complete-ant-cmd.pl
-rw-r--r--	root/root	usr/lib/ant/bin/envset.cmd
-rwxr-xr-x	root/root	usr/lib/ant/bin/runant.pl
-rwxr-xr-x	root/root	usr/lib/ant/bin/runant.py
-rw-r--r--	root/root	usr/lib/ant/bin/runrc.cmd
-rw-r--r--	root/root	usr/lib/ant/contributors.xml
-drwxr-xr-x	root/root	usr/lib/ant/etc/
-rw-r--r--	root/root	usr/lib/ant/etc/ant-bootstrap.jar
-rw-r--r--	root/root	usr/lib/ant/etc/changelog.xsl
-drwxr-xr-x	root/root	usr/lib/ant/etc/checkstyle/
-rw-r--r--	root/root	usr/lib/ant/etc/checkstyle/checkstyle-frames-sortby-check.xsl
-rw-r--r--	root/root	usr/lib/ant/etc/checkstyle/checkstyle-frames.xsl
-rw-r--r--	root/root	usr/lib/ant/etc/checkstyle/checkstyle-text.xsl
-rw-r--r--	root/root	usr/lib/ant/etc/checkstyle/checkstyle-xdoc.xsl
-rw-r--r--	root/root	usr/lib/ant/etc/coverage-frames.xsl
-rw-r--r--	root/root	usr/lib/ant/etc/jdepend-frames.xsl
-rw-r--r--	root/root	usr/lib/ant/etc/jdepend.xsl
-rw-r--r--	root/root	usr/lib/ant/etc/junit-frames-xalan1.xsl
-rw-r--r--	root/root	usr/lib/ant/etc/junit-frames.xsl
-rw-r--r--	root/root	usr/lib/ant/etc/junit-noframes.xsl
-rw-r--r--	root/root	usr/lib/ant/etc/log.xsl
-rw-r--r--	root/root	usr/lib/ant/etc/maudit-frames.xsl
-rw-r--r--	root/root	usr/lib/ant/etc/mmetrics-frames.xsl
-rw-r--r--	root/root	usr/lib/ant/etc/tagdiff.xsl
-rw-r--r--	root/root	usr/lib/ant/fetch.xml
-rw-r--r--	root/root	usr/lib/ant/get-m2.xml
-drwxr-xr-x	root/root	usr/lib/ant/lib/
-rw-r--r--	root/root	usr/lib/ant/lib/ant-antlr.jar
-rw-r--r--	root/root	usr/lib/ant/lib/ant-antlr.pom
-rw-r--r--	root/root	usr/lib/ant/lib/ant-apache-bcel.jar
-rw-r--r--	root/root	usr/lib/ant/lib/ant-apache-bcel.pom
-rw-r--r--	root/root	usr/lib/ant/lib/ant-apache-bsf.jar
-rw-r--r--	root/root	usr/lib/ant/lib/ant-apache-bsf.pom
-rw-r--r--	root/root	usr/lib/ant/lib/ant-apache-log4j.jar
-rw-r--r--	root/root	usr/lib/ant/lib/ant-apache-log4j.pom
-rw-r--r--	root/root	usr/lib/ant/lib/ant-apache-oro.jar
-rw-r--r--	root/root	usr/lib/ant/lib/ant-apache-oro.pom
-rw-r--r--	root/root	usr/lib/ant/lib/ant-apache-regexp.jar
-rw-r--r--	root/root	usr/lib/ant/lib/ant-apache-regexp.pom
-rw-r--r--	root/root	usr/lib/ant/lib/ant-apache-resolver.jar
-rw-r--r--	root/root	usr/lib/ant/lib/ant-apache-resolver.pom
-rw-r--r--	root/root	usr/lib/ant/lib/ant-apache-xalan2.jar
-rw-r--r--	root/root	usr/lib/ant/lib/ant-apache-xalan2.pom
-rw-r--r--	root/root	usr/lib/ant/lib/ant-commons-logging.jar
-rw-r--r--	root/root	usr/lib/ant/lib/ant-commons-logging.pom
-rw-r--r--	root/root	usr/lib/ant/lib/ant-commons-net.jar
-rw-r--r--	root/root	usr/lib/ant/lib/ant-commons-net.pom
-rw-r--r--	root/root	usr/lib/ant/lib/ant-imageio.jar
-rw-r--r--	root/root	usr/lib/ant/lib/ant-imageio.pom
-rw-r--r--	root/root	usr/lib/ant/lib/ant-jai.jar
-rw-r--r--	root/root	usr/lib/ant/lib/ant-jai.pom
-rw-r--r--	root/root	usr/lib/ant/lib/ant-javamail.jar
-rw-r--r--	root/root	usr/lib/ant/lib/ant-javamail.pom
-rw-r--r--	root/root	usr/lib/ant/lib/ant-jdepend.jar
-rw-r--r--	root/root	usr/lib/ant/lib/ant-jdepend.pom
-rw-r--r--	root/root	usr/lib/ant/lib/ant-jmf.jar
-rw-r--r--	root/root	usr/lib/ant/lib/ant-jmf.pom
-rw-r--r--	root/root	usr/lib/ant/lib/ant-jsch.jar
-rw-r--r--	root/root	usr/lib/ant/lib/ant-jsch.pom
-rw-r--r--	root/root	usr/lib/ant/lib/ant-junit.jar
-rw-r--r--	root/root	usr/lib/ant/lib/ant-junit.pom
-rw-r--r--	root/root	usr/lib/ant/lib/ant-junit4.jar
-rw-r--r--	root/root	usr/lib/ant/lib/ant-junit4.pom
-rw-r--r--	root/root	usr/lib/ant/lib/ant-junitlauncher.jar
-rw-r--r--	root/root	usr/lib/ant/lib/ant-junitlauncher.pom
-rw-r--r--	root/root	usr/lib/ant/lib/ant-launcher.jar
-rw-r--r--	root/root	usr/lib/ant/lib/ant-launcher.pom
-rw-r--r--	root/root	usr/lib/ant/lib/ant-netrexx.jar
-rw-r--r--	root/root	usr/lib/ant/lib/ant-netrexx.pom
-rw-r--r--	root/root	usr/lib/ant/lib/ant-parent.pom
-rw-r--r--	root/root	usr/lib/ant/lib/ant-swing.jar
-rw-r--r--	root/root	usr/lib/ant/lib/ant-swing.pom
-rw-r--r--	root/root	usr/lib/ant/lib/ant-testutil.jar
-rw-r--r--	root/root	usr/lib/ant/lib/ant-testutil.pom
-rw-r--r--	root/root	usr/lib/ant/lib/ant-xz.jar
-rw-r--r--	root/root	usr/lib/ant/lib/ant-xz.pom
-rw-r--r--	root/root	usr/lib/ant/lib/ant.jar
-rw-r--r--	root/root	usr/lib/ant/lib/ant.pom
-rw-r--r--	root/root	usr/lib/ant/lib/libraries.properties
-rw-r--r--	root/root	usr/lib/ant/patch.xml
+lrwxrwxrwx	root/root	usr/bin/ant -> /usr/share/ant/bin/ant
+drwxr-xr-x	root/root	usr/share/
+drwxr-xr-x	root/root	usr/share/ant/
+drwxr-xr-x	root/root	usr/share/ant/bin/
+-rwxr-xr-x	root/root	usr/share/ant/bin/ant
+-rwxr-xr-x	root/root	usr/share/ant/bin/antRun
+-rwxr-xr-x	root/root	usr/share/ant/bin/antRun.pl
+-rwxr-xr-x	root/root	usr/share/ant/bin/complete-ant-cmd.pl
+-rwxr-xr-x	root/root	usr/share/ant/bin/runant.pl
+-rwxr-xr-x	root/root	usr/share/ant/bin/runant.py
+drwxr-xr-x	root/root	usr/share/ant/etc/
+-rw-r--r--	root/root	usr/share/ant/etc/ant-bootstrap.jar
+-rw-r--r--	root/root	usr/share/ant/etc/changelog.xsl
+drwxr-xr-x	root/root	usr/share/ant/etc/checkstyle/
+-rw-r--r--	root/root	usr/share/ant/etc/checkstyle/checkstyle-frames-sortby-check.xsl
+-rw-r--r--	root/root	usr/share/ant/etc/checkstyle/checkstyle-frames.xsl
+-rw-r--r--	root/root	usr/share/ant/etc/checkstyle/checkstyle-text.xsl
+-rw-r--r--	root/root	usr/share/ant/etc/checkstyle/checkstyle-xdoc.xsl
+-rw-r--r--	root/root	usr/share/ant/etc/coverage-frames.xsl
+-rw-r--r--	root/root	usr/share/ant/etc/jdepend-frames.xsl
+-rw-r--r--	root/root	usr/share/ant/etc/jdepend.xsl
+-rw-r--r--	root/root	usr/share/ant/etc/junit-frames-xalan1.xsl
+-rw-r--r--	root/root	usr/share/ant/etc/junit-frames.xsl
+-rw-r--r--	root/root	usr/share/ant/etc/junit-noframes.xsl
+-rw-r--r--	root/root	usr/share/ant/etc/log.xsl
+-rw-r--r--	root/root	usr/share/ant/etc/maudit-frames.xsl
+-rw-r--r--	root/root	usr/share/ant/etc/mmetrics-frames.xsl
+-rw-r--r--	root/root	usr/share/ant/etc/tagdiff.xsl
+lrwxrwxrwx	root/root	usr/share/ant/lib -> /usr/share/java/ant
+drwxr-xr-x	root/root	usr/share/java/
+drwxr-xr-x	root/root	usr/share/java/ant/
+-rw-r--r--	root/root	usr/share/java/ant/ant-antlr.jar
+-rw-r--r--	root/root	usr/share/java/ant/ant-apache-bcel.jar
+-rw-r--r--	root/root	usr/share/java/ant/ant-apache-bsf.jar
+-rw-r--r--	root/root	usr/share/java/ant/ant-apache-log4j.jar
+-rw-r--r--	root/root	usr/share/java/ant/ant-apache-oro.jar
+-rw-r--r--	root/root	usr/share/java/ant/ant-apache-regexp.jar
+-rw-r--r--	root/root	usr/share/java/ant/ant-apache-resolver.jar
+-rw-r--r--	root/root	usr/share/java/ant/ant-apache-xalan2.jar
+-rw-r--r--	root/root	usr/share/java/ant/ant-commons-logging.jar
+-rw-r--r--	root/root	usr/share/java/ant/ant-commons-net.jar
+-rw-r--r--	root/root	usr/share/java/ant/ant-imageio.jar
+-rw-r--r--	root/root	usr/share/java/ant/ant-jai.jar
+-rw-r--r--	root/root	usr/share/java/ant/ant-javamail.jar
+-rw-r--r--	root/root	usr/share/java/ant/ant-jdepend.jar
+-rw-r--r--	root/root	usr/share/java/ant/ant-jmf.jar
+-rw-r--r--	root/root	usr/share/java/ant/ant-jsch.jar
+-rw-r--r--	root/root	usr/share/java/ant/ant-junit.jar
+-rw-r--r--	root/root	usr/share/java/ant/ant-junit4.jar
+-rw-r--r--	root/root	usr/share/java/ant/ant-junitlauncher.jar
+-rw-r--r--	root/root	usr/share/java/ant/ant-launcher.jar
+-rw-r--r--	root/root	usr/share/java/ant/ant-netrexx.jar
+-rw-r--r--	root/root	usr/share/java/ant/ant-swing.jar
+-rw-r--r--	root/root	usr/share/java/ant/ant-testutil.jar
+-rw-r--r--	root/root	usr/share/java/ant/ant-xz.jar
+-rw-r--r--	root/root	usr/share/java/ant/ant.jar
--- a/ant/.signature
+++ b/ant/.signature
@ -1,5 +1,6 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF34MH7L1K47DuWbKw9xlRgjxxTUOGLTgAYyu82Ha8WtQyqtB8+RZWkE16zlYo0yyynThQzz0E6+v7kydDhm8XHAM=
-SHA256 (Pkgfile) = 3300642d9e11c7d95d041e19f846480e3245b249622768be6d03fefa95cd26a1
-SHA256 (.footprint) = e00b1d7ccadc4330e0fe4dea95e8c396d276fbaffb5ebd283df53179422eedc0
-SHA256 (apache-ant-1.10.7-bin.tar.bz2) = d195e9eab83400b018e3736f1d8a71f962611bfbb380d68a1b2723b41cd7ada0
+RWSagIOpLGJF357cafrz6OxFGn0X55+xswDVV0ntyBfRrEgIoASEusUBJIEofzIsHBxMMdc/4WwiZQDF1Aqg0utMnnIoqpnaJQU=
+SHA256 (Pkgfile) = 01769a4d978b902451b3330c893810514af7649f855733e032fb5548691c49b5
+SHA256 (.footprint) = 12c3d185e494867aafcde175bb3f702fa4ba9fd9c17753c8ba16def4a28290d0
+SHA256 (apache-ant-1.10.7-src.tar.xz) = c8d68b396d9e44b49668bafe0c82f8c89497915254b5395d73d6f6e41d7a0e25
+SHA256 (ant.conf) = df69b76897e52764ad65e2536ce73dc98f4df014c88551dcdfc802c10ec26ee6
--- a/ant/Pkgfile
+++ b/ant/Pkgfile
@ -2,20 +2,39 @@
 # URL: http://ant.apache.org/
 # Maintainer: Danny Rawlins, crux at romster dot me
 # Depends on: openjdk8
+# Optional: python

 name=ant
 version=1.10.7
-release=1
-source=(https://www.apache.org/dist/ant/binaries/apache-$name-$version-bin.tar.bz2)
+release=2
+source=(https://www-eu.apache.org/dist/ant/source/apache-$name-$version-src.tar.xz
+	ant.conf)

 build() {
 	cd apache-$name-$version
-	install -d $PKG/usr/{bin,lib/ant}
-	cp -rf * $PKG/usr/lib/ant
-	ln -sf /usr/lib/ant/bin/ant $PKG/usr/bin/ant
-	rm  $PKG/usr/lib/ant/{CONTRIBUTORS,INSTALL,KEYS}
-	rm  $PKG/usr/lib/ant/{LICENS*,NOTICE,README,WHATSNEW}
-	rm  $PKG/usr/lib/ant/bin/*.bat
-	rm  $PKG/usr/lib/ant/lib/README
-	rm -r $PKG/usr/lib/ant/manual
+
+	sed -i 's|/usr/bin/python|/usr/bin/python2|' \
+		src/script/runant.py
+
+	unset JAVA_HOME
+	export JAVA_HOME='/usr/lib/java/openjdk8'
+
+	./bootstrap.sh
+	bootstrap/bin/ant -Ddest=optional -f fetch.xml
+	bootstrap/bin/ant dist
+
+	cd apache-$name-$version
+
+	install -d $PKG/usr/share/ant
+	cp -Rp etc $PKG/usr/share/ant
+
+	find bin -type f -a ! -name \*.bat -a ! -name \*.cmd \
+		-exec install -Dm 755 {} -t "$PKG/usr/share/ant/bin" \;
+
+	install -d "$PKG/usr/bin"
+	ln -s /usr/share/ant/bin/ant "$PKG/usr/bin/ant"
+
+	install -Dm 644 "$SRC/ant.conf" -t "$PKG/etc"
+	install -Dm 644 lib/*.jar -t "$PKG/usr/share/java/ant"
+	ln -s /usr/share/java/ant "$PKG/usr/share/ant/lib"
 }
--- a/ant/ant.conf
+++ b/ant/ant.conf
@ -0,0 +1,3 @@
+# Apache Ant start script configuration file
+ANT_HOME=/usr/share/ant
+