Let’s use Ivy (properly!) and drop Maven Ant tasks, Commons OpenPGP, …

…Python, etc
apache · Dec 26, 2017 · 86494a6 · 86494a6
1 parent 4a8ef26
commit 86494a6
Show file tree

Hide file tree

Showing 13 changed files with 306 additions and 562 deletions.
diff --git a/release/build-osx-pkg.py → attic/build-osx-pkg.py b/release/build-osx-pkg.py → attic/build-osx-pkg.py
diff --git a/get-m2.xml → attic/get-m2.xml b/get-m2.xml → attic/get-m2.xml
diff --git a/lib/libraries.properties → attic/libraries.properties b/lib/libraries.properties → attic/libraries.properties
diff --git a/release/signit.xml → attic/signit.xml b/release/signit.xml → attic/signit.xml
diff --git a/build.xml b/build.xml
@@ -32,7 +32,7 @@
   -->
   <property name="Name" value="Apache Ant"/>
   <property name="name" value="ant"/>
-  <!-- this is the groupId of ant in the Maven repository -->
+  <!-- this is the groupId of Ant in the Maven repository -->
   <property name="groupid" value="org/apache/ant"/>
   <property name="project.version" value="1.10.2alpha"/>
   <!-- pom.version is used when doing a distribution and must match with what is checked in under src/etc/poms -->
@@ -93,6 +93,7 @@
   <property name="manifest.tmp" value="${build.dir}/optional.manifest"/>
   <!-- the absolute path -->
   <property name="build.tests.value" location="${build.tests}"/>
+  <property name="build.pkg.dir" value="${build.dir}/pkg"/>
 
   <!--
        ===================================================================
@@ -973,7 +974,7 @@
     <mkdir dir="${dist.etc}"/>
 
     <copy todir="${dist.lib}" file="${lib.dir}/README"/>
-    <copy todir="${dist.lib}" file="${lib.dir}/libraries.properties"/>
+    <copy todir="${dist.lib}" file="${basedir}/ivy.xml"/>
 
     <copy todir="${dist.lib}">
       <fileset dir="${src.dir}/etc/poms">
@@ -1091,7 +1092,7 @@
         <include name="optional/junit*.jar"/>
         <include name="optional/hamcrest*.jar"/>
         <include name="README"/>
-        <include name="libraries.properties"/>
+        <include name="ivy.xml"/>
       </fileset>
     </copy>
 
@@ -1214,10 +1215,28 @@
   </condition>
 
   <target name="pkg-distribution" depends="zip-distribution" if="buildosxpackage">
-    <exec executable="release/build-osx-pkg.py">
-      <arg value="--output-dir"/>
-      <arg value="${dist.base.binaries}"/>
-      <arg value="${dist.base.binaries}/${dist.name}-bin.zip"/>
+    <mkdir dir="${build.pkg.dir}"/>
+    <unzip src="${dist.base.binaries}/${dist.name}-bin.zip" dest="${build.pkg.dir}">
+      <mapper type="regexp" from="^([^/]*)/(.*)$$" to="\2"/>
+    </unzip>
+    <chmod perm="+x" type="file">
+      <fileset dir="${build.pkg.dir}/bin">
+        <include name="ant"/>
+        <include name="antRun"/>
+        <include name="*.pl"/>
+        <include name="*.py"/>
+      </fileset>
+    </chmod>
+    <exec executable="/usr/bin/pkgbuild">
+      <arg value="--root"/>
+      <arg value="${build.pkg.dir}"/>
+      <arg value="--identifier"/>
+      <arg value="org.apache.ant"/>
+      <arg value="--version"/>
+      <arg value="${project.version}"/>
+      <arg value="--install-location"/>
+      <arg value="/usr/local/ant"/>
+      <arg value="${dist.base.binaries}/${dist.name}.pkg"/>
     </exec>
   </target>