From 686e6360d6323f4daa25cf8685ede9690cc57fea Mon Sep 17 00:00:00 2001 From: namso-01 Date: Mon, 25 Jan 2016 22:20:44 +0200 Subject: [PATCH] ant: gerekmeyen dosyalar silindi. --- programming/build/ant/actions.py | 50 ++++++------------- programming/build/ant/files/20ant | 1 - .../ant/files/apache-ant-no-test-jar.patch | 11 ---- programming/build/ant/files/bin_ant | 4 +- programming/build/ant/pspec.xml | 22 ++++---- 5 files changed, 28 insertions(+), 60 deletions(-) delete mode 100644 programming/build/ant/files/20ant delete mode 100644 programming/build/ant/files/apache-ant-no-test-jar.patch diff --git a/programming/build/ant/actions.py b/programming/build/ant/actions.py index 65e5825054..226ecd8ab3 100644 --- a/programming/build/ant/actions.py +++ b/programming/build/ant/actions.py @@ -8,9 +8,6 @@ from pisi.actionsapi import pisitools from pisi.actionsapi import shelltools from pisi.actionsapi import get -import os -import glob - shelltools.export("JAVA_HOME","/usr/lib/jvm/java-7-openjdk") WorkDir = "apache-ant-%s" % get.srcVERSION() @@ -19,39 +16,20 @@ javadir = "/usr/share/java" def build(): shelltools.export("ANT_OPTS", "-Duser.home=%s" % WorkDir) - shelltools.system("./bootstrap.sh") + shelltools.system("./build.sh dist") def install(): - for d in (anthome, os.path.join(anthome, "lib"), os.path.join(anthome, "etc"), os.path.join(anthome, "bin"), javadir, os.path.join(javadir, "ant")): - pisitools.dodir(d) + pisitools.insinto("/etc/ant/", "%s/etc/*" % WorkDir) + pisitools.remove("/etc/ant/ant-bootstrap.jar") + pisitools.insinto("/usr/share/java/ant/", "%s/lib/*" % WorkDir) + pisitools.insinto("/usr/share/java/", "lib/optional/junit-4.11.jar", "junit.jar") + pisitools.insinto("/usr/share/java/", "lib/optional/hamcrest-core-1.3.jar", "hamcrest.jar") + pisitools.insinto("/usr/share/ant/lib/", "%s/lib/*" % WorkDir) + pisitools.insinto("/usr/share/ant/bin/", "apache-ant-1.9.6/bin/*") + - shelltools.cd("build/lib") - - for f in ("ant.jar", "ant-launcher.jar", "ant-bootstrap.jar"): - pisitools.insinto(javadir, f, f.replace(".jar", "-%s.jar" % get.srcVERSION())) - pisitools.dosym(os.path.join(javadir, f.replace(".jar", "-%s.jar" % get.srcVERSION())), os.path.join(anthome, "lib", f)) - pisitools.dosym(os.path.join(javadir, f.replace(".jar", "-%s.jar" % get.srcVERSION())), os.path.join(javadir, f)) - - #Install optional JAR files to /usr/share/java/ant - for f in ("ant-jmf.jar", "ant-junit.jar", "ant-swing.jar"): - pisitools.insinto(os.path.join(javadir, "ant"), f, f.replace(".jar", "-%s.jar" % get.srcVERSION())) - pisitools.dosym(os.path.join(javadir, "ant", f.replace(".jar", "-%s.jar" % get.srcVERSION())), os.path.join(anthome, "lib", f)) - pisitools.dosym(os.path.join(javadir, "ant", f.replace(".jar", "-%s.jar" % get.srcVERSION())), os.path.join(javadir, "ant", f)) - - - shelltools.cd("../../src/script") - for f in glob.glob("*.bat"): - shelltools.unlink(f) - - for f in glob.glob("*.cmd"): - shelltools.unlink(f) - - pisitools.dobin("*") - pisitools.domove("/usr/bin/antRun*", os.path.join(anthome, "bin")) - shelltools.cd("../../") - - #Install XSLs - pisitools.insinto(os.path.join(anthome, "etc"), "src/etc/*.xsl") - - pisitools.dodoc("KEYS", "NOTICE", "README", "WHATSNEW", "LICENSE") - #pisitools.dohtml("docs/*") + for binsym in ["ant", "antRun", "antRun.pl", "complete-ant-cmd.pl", "runant.pl", "runant.py"]: + pisitools.dosym("/usr/share/ant/bin/%s" % binsym , "/usr/bin/%s" % binsym) + + pisitools.insinto("/usr/share/doc/ant/", "%s/manual/*" % WorkDir) #for and-docs + pisitools.dodoc("KEYS", "NOTICE", "README", "WHATSNEW", "LICENSE") \ No newline at end of file diff --git a/programming/build/ant/files/20ant b/programming/build/ant/files/20ant deleted file mode 100644 index b4bcea575e..0000000000 --- a/programming/build/ant/files/20ant +++ /dev/null @@ -1 +0,0 @@ -ANT_HOME="/usr/share/ant" diff --git a/programming/build/ant/files/apache-ant-no-test-jar.patch b/programming/build/ant/files/apache-ant-no-test-jar.patch deleted file mode 100644 index d4bdfed1bb..0000000000 --- a/programming/build/ant/files/apache-ant-no-test-jar.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- apache-ant-1.8.0.orig/build.xml 2010-04-13 14:09:27.501531982 +0200 -+++ apache-ant-1.8.0/build.xml 2010-04-13 14:57:08.321408006 +0200 -@@ -832,7 +832,7 @@ - =================================================================== - --> - - - \ No newline at end of file diff --git a/programming/build/ant/files/bin_ant b/programming/build/ant/files/bin_ant index a88165d71a..fdd47160fb 100644 --- a/programming/build/ant/files/bin_ant +++ b/programming/build/ant/files/bin_ant @@ -1,6 +1,6 @@ #!/bin/sh -. /etc/apache-ant/ant.conf +. /etc/ant/ant.conf export LOCALCLASSPATH=${OPT_JAR_LIST} -/usr/share/apache-ant/bin/ant "$@" \ No newline at end of file +/usr/share/ant/bin/ant "$@" \ No newline at end of file diff --git a/programming/build/ant/pspec.xml b/programming/build/ant/pspec.xml index 789a35b71a..4bfe490598 100644 --- a/programming/build/ant/pspec.xml +++ b/programming/build/ant/pspec.xml @@ -16,24 +16,19 @@ jdk7-openjdk - - apache-ant-no-test-jar.patch - ant - - - /etc + /usr/share/ /usr/bin - /usr/share/ - 20ant - ant.conf + ant.conf + ant.sh + ant.csh @@ -46,6 +41,13 @@ + + 2016-01-25 + 1.9.6 + Fixed. + Osman Erkan + osman.erkan@pisilinux.org + 2015-08-22 1.9.6 @@ -82,4 +84,4 @@ admins@pisilinux.org - + \ No newline at end of file