From f3f4529d8415a9c2e6a06a5ec648c03bf148e56f Mon Sep 17 00:00:00 2001
From: kytv <kytv@mail.i2p>
Date: Mon, 24 Dec 2012 22:09:10 +0000
Subject: [PATCH] use ant features instead of Unix commands where possible in
 the installer2app target. Also make izpack2app a settable property

---
 build.xml | 39 +++++++++++++++++++--------------------
 1 file changed, 19 insertions(+), 20 deletions(-)

diff --git a/build.xml b/build.xml
index 024acce502..5e46dfb17d 100644
--- a/build.xml
+++ b/build.xml
@@ -1251,29 +1251,28 @@
     </target>
 
     <target name="checkForIzpack2App">
-        <available property="izpack2app.available" file="${user.home}/IzPack/utils/wrappers/izpack2app/izpack2app.py" />
+        <!-- we'll set the izpack2app binary name if it's not been set elsewhere yet -->
+        <property name="izpack2app.binary" value="${user.home}/IzPack/utils/wrappers/izpack2app/izpack2app.py" />
+        <available property="izpack2app.available" file="${izpack2app.binary}" />
     </target>
 
     <target name="installer2app" if="izpack2app.available">
-	<mkdir dir="pkg-temp/osx" />
-	<exec executable="python" failonerror="true">
-	    <arg value="${user.home}/IzPack/utils/wrappers/izpack2app/izpack2app.py" />
-	    <arg value="${basedir}/i2pinstall_${full.version}_osx-only.jar" />
-	    <arg value="${basedir}/pkg-temp/osx/i2p-${full.version}_osx-install.app" />
-	</exec>
-	<exec executable="chmod" failonerror="true" osfamily="unix">
-		<arg value="755" />
-		<arg value="${basedir}/pkg-temp/osx/i2p-${full.version}_osx-install.app/Contents/MacOS/JavaApplicationStub" />
-	</exec>
-	<exec executable="tar" osfamily="unix" failonerror="true">
-		<arg value="--owner=root" />
-		<arg value="--group=root" />
-		<arg value="-cjvf" />
-		<arg value="${basedir}/i2pinstall_${full.version}_osx.tar.bz2" />
-		<arg value="-C" />
-		<arg value="${basedir}/pkg-temp/osx" />
-		<arg value="i2p-${full.version}_osx-install.app" />
-	</exec>
+        <mkdir dir="pkg-temp/osx" />
+        <exec executable="python" failonerror="true">
+            <arg value="${izpack2app.binary}" />
+            <arg value="${basedir}/i2pinstall_${full.version}_osx-only.jar" />
+            <arg value="${basedir}/pkg-temp/osx/i2p-${full.version}_osx-install.app" />
+        </exec>
+
+        <tar longfile="gnu" destfile="${basedir}/i2pinstall_${full.version}_osx.tar.bz2" compression="bzip2">
+            <tarfileset dir="${basedir}/pkg-temp/osx/i2p-${full.version}_osx-install.app" prefix="/i2p-${full.version}_osx-install.app" filemode="644">
+                <include name="**/**" />
+                <exclude name="Contents/MacOS/*" />
+            </tarfileset>
+            <tarfileset dir="${basedir}/pkg-temp/osx/i2p-${full.version}_osx-install.app" prefix="/i2p-${full.version}_osx-install.app" filemode="755">
+                <include name="Contents/MacOS/*" />
+            </tarfileset>
+        </tar>
     </target>
 
     <!-- call between installer-xxx and installer-windows -->