ant: gerekmeyen dosyalar silindi.

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.insinto("/etc/ant/", "%s/etc/*" % WorkDir)
-        pisitools.dodir(d)
+    pisitools.remove("/etc/ant/ant-bootstrap.jar")
-
+    pisitools.insinto("/usr/share/java/ant/", "%s/lib/*" % WorkDir)
-    shelltools.cd("build/lib")
+    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")
-    for f in ("ant.jar", "ant-launcher.jar", "ant-bootstrap.jar"):
+    pisitools.insinto("/usr/share/ant/lib/", "%s/lib/*" % WorkDir)
-        pisitools.insinto(javadir, f, f.replace(".jar", "-%s.jar" % get.srcVERSION()))
+    pisitools.insinto("/usr/share/ant/bin/", "apache-ant-1.9.6/bin/*")
-        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 binsym in ["ant", "antRun", "antRun.pl", "complete-ant-cmd.pl", "runant.pl", "runant.py"]:
-    for f in glob.glob("*.bat"):
+            pisitools.dosym("/usr/share/ant/bin/%s" % binsym , "/usr/bin/%s" % binsym)
-        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.insinto("/usr/share/doc/ant/", "%s/manual/*" % WorkDir) #for and-docs
     pisitools.dodoc("KEYS", "NOTICE", "README", "WHATSNEW", "LICENSE")
-    #pisitools.dohtml("docs/*")

programming/build/ant/files/20ant

@@ -1 +0,0 @@
-ANT_HOME="/usr/share/ant"

programming/build/ant/files/apache-ant-no-test-jar.patch

@@ -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 @@
-        ===================================================================
-   -->
-   <target name="dist-lite"
--    depends="jars,test-jar"
-+    depends="jars"
-     description="--> creates a minimum distribution to run Apache Ant">
- 
-     <mkdir dir="${dist.dir}"/>

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 "$@"
+/usr/share/ant/bin/ant "$@"

programming/build/ant/pspec.xml

@@ -16,24 +16,19 @@
         <BuildDependencies>
             <Dependency>jdk7-openjdk</Dependency>
         </BuildDependencies>
-        <Patches>
-            <Patch level="1">apache-ant-no-test-jar.patch</Patch>
-        </Patches>
     </Source>
 
     <Package>
         <Name>ant</Name>
-        <RuntimeDependencies>
-            <!--<Dependency>jdk7-openjdk</Dependency>-->
-        </RuntimeDependencies>
         <Files>
             <Path fileType="config">/etc</Path>
+            <Path fileType="data">/usr/share/</Path>
             <Path fileType="executable">/usr/bin</Path>
-            <Path fileType="library">/usr/share/</Path>
         </Files>
         <AdditionalFiles>
-            <AdditionalFile owner="root" permission="0644" target="/etc/env.d/20ant">20ant</AdditionalFile>
+            <AdditionalFile target="/etc/ant/ant.conf" permission="0644" owner="root">ant.conf</AdditionalFile>
-            <AdditionalFile target="/etc/ant.conf" permission="0644" owner="root">ant.conf</AdditionalFile>
+            <AdditionalFile owner="root" permission="0644" target="/etc/profile.d/ant.sh">ant.sh</AdditionalFile>
+            <AdditionalFile owner="root" permission="0644" target="/etc/profile.d/ant.csh">ant.csh</AdditionalFile>
         </AdditionalFiles>
     </Package>
 
@@ -46,6 +41,13 @@
     </Package>
     
     <History>
+        <Update release="7">
+            <Date>2016-01-25</Date>
+            <Version>1.9.6</Version>
+            <Comment>Fixed.</Comment>
+            <Name>Osman Erkan</Name>
+            <Email>osman.erkan@pisilinux.org</Email>
+        </Update>
         <Update release="6">
             <Date>2015-08-22</Date>
             <Version>1.9.6</Version>