Ajout de ant#1.7.1-1, remplace apache-ant

3 files changed, 54 insertions, 11 deletions

diff --git a/base/ant/.footprint b/base/ant/.footprint
new file mode 100644
index 000000000..2c319bb38
--- /dev/null
+++ b/base/ant/.footprint
@@ -0,0 +1,34 @@
+drwxr-xr-x	root/root	etc/
+drwxr-xr-x	root/root	etc/ant/
+-rw-r--r--	root/root	etc/ant/ant.conf (EMPTY)
+drwxr-xr-x	root/root	etc/profile.d/
+-rw-r--r--	root/root	etc/profile.d/apache-ant.sh
+drwxr-xr-x	root/root	opt/
+lrwxrwxrwx	root/root	opt/ant -> ant-1.7.1
+drwxr-xr-x	root/root	opt/ant-1.7.1/
+drwxr-xr-x	root/root	opt/ant-1.7.1/bin/
+-rwxr-xr-x	root/root	opt/ant-1.7.1/bin/ant
+-rw-r--r--	root/root	opt/ant-1.7.1/bin/ant.bat
+-rw-r--r--	root/root	opt/ant-1.7.1/bin/ant.cmd
+-rwxr-xr-x	root/root	opt/ant-1.7.1/bin/antRun
+-rw-r--r--	root/root	opt/ant-1.7.1/bin/antRun.bat
+-rwxr-xr-x	root/root	opt/ant-1.7.1/bin/antRun.pl
+-rw-r--r--	root/root	opt/ant-1.7.1/bin/antenv.cmd
+-rwxr-xr-x	root/root	opt/ant-1.7.1/bin/complete-ant-cmd.pl
+-rw-r--r--	root/root	opt/ant-1.7.1/bin/envset.cmd
+-rw-r--r--	root/root	opt/ant-1.7.1/bin/lcp.bat
+-rwxr-xr-x	root/root	opt/ant-1.7.1/bin/runant.pl
+-rwxr-xr-x	root/root	opt/ant-1.7.1/bin/runant.py
+-rw-r--r--	root/root	opt/ant-1.7.1/bin/runrc.cmd
+lrwxrwxrwx	root/root	opt/ant-1.7.1/etc -> /etc/ant
+drwxr-xr-x	root/root	opt/ant-1.7.1/lib/
+-rw-r--r--	root/root	opt/ant-1.7.1/lib/ant-jmf.jar
+-rw-r--r--	root/root	opt/ant-1.7.1/lib/ant-junit.jar
+-rw-r--r--	root/root	opt/ant-1.7.1/lib/ant-launcher.jar
+-rw-r--r--	root/root	opt/ant-1.7.1/lib/ant-nodeps.jar
+-rw-r--r--	root/root	opt/ant-1.7.1/lib/ant-swing.jar
+-rw-r--r--	root/root	opt/ant-1.7.1/lib/ant-testutil.jar
+-rw-r--r--	root/root	opt/ant-1.7.1/lib/ant-trax.jar
+-rw-r--r--	root/root	opt/ant-1.7.1/lib/ant.jar
+-rw-r--r--	root/root	opt/ant-1.7.1/lib/xercesImpl.jar
+-rw-r--r--	root/root	opt/ant-1.7.1/lib/xml-apis.jar
diff --git a/base/ant/Pkgfile b/base/ant/Pkgfile
index b504caf4a..9728cc13b 100644
--- a/base/ant/Pkgfile
+++ b/base/ant/Pkgfile
@@ -2,22 +2,29 @@
 # URL: http://ant.apache.org/
 # Maintainer: NutyX core team
 # Packager: thierryn1 at hispeed dot ch
-# Depends on: jdk
+# Depends on: jdk, junit
 
 name=ant
 version=1.7.1
-release=2
-source=(http://archive.apache.org/dist/ant/binaries/apache-ant-$version-bin.tar.bz2)
+release=1
+source=(http://apache.org/dist/ant/source/apache-ant-$version-src.tar.bz2\
+	apache-ant.sh)
 
 
 build() {
+	export CLASSPATH=$CLASSPATH:/usr/share/junit-4.5/junit-4.5.jar:/usr/share/junit-4.5
 	cd apache-ant-$version
-	mkdir -p $PKG/etc/profile.d
-	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 -r $PKG/usr/lib/ant/bin/*.bat
-	rm -r $PKG/usr/lib/ant/docs
-	rm -r $PKG/usr/lib/ant/{KEYS,LICENS*,README,NOTICE,WHATSNEW,INSTALL}
-	rm -r $PKG/usr/lib/ant/lib/README
+        sed -i 's|/etc/ant.conf|/etc/ant/ant.conf|' src/script/ant
+        mkdir dist
+	./build.sh -Ddist.dir=dist/ dist
+	mkdir $PKG/opt
+	mkdir -p $PKG/etc/{profile.d,ant}
+	touch $PKG/etc/ant/ant.conf
+	export ANT_HOME=$PKG/opt/ant-$version
+#	export JAVA_HOME=/opt/jdk
+	./build.sh install-lite
+	install -m644  ../apache-ant.sh $PKG/etc/profile.d/
+	ln -svf ant-$version $PKG/opt/$name
+	ln -v -sf /etc/$name $PKG/opt/$name-$version/etc
 }
+
diff --git a/base/ant/apache-ant.sh b/base/ant/apache-ant.sh
new file mode 100644
index 000000000..0e7f59518
--- /dev/null
+++ b/base/ant/apache-ant.sh
@@ -0,0 +1,2 @@
+export PATH=$PATH:/opt/ant/bin
+export ANT_HOME=/opt/ant