Changeset 28726 for other-projects/expeditee-release-kits

Timestamp:

2013-12-02T13:48:23+13:00 (10 years ago)

Author:

ak19

Message:

Expeditee team (jts21) - Changes to make the Mac binary inside .app be self-extracting as well as include the JRE with it

Location:

other-projects/expeditee-release-kits

Files:

• kits/rke/ant-scripts/wrap.xml (modified) (4 diffs)
• shared/mac/wrapper.cpp (added)

other-projects/expeditee-release-kits/kits/rke/ant-scripts/wrap.xml

@@ -66 +66 @@
             </exec>
 
-        <!-- (linux) -->
-        <else><if><bool><equals arg1="${rk.os}" arg2="linux"/></bool>
+        <!-- (linux and mac) -->
+        <else><if><bool><or><equals arg1="${rk.os}" arg2="linux"/><equals arg1="${rk.os}" arg2="mac"/></or></bool>
             <!-- create the build directory -->
             <mkdir dir="wrapped-installer"/>
@@ -73 +73 @@
             <!-- copy the source into place --> 
             <copy todir="wrapped-installer" overwrite="true">
-                <fileset file="${rk.home}/shared/linux/wrapper.cpp"/>
+                <fileset file="${rk.home}/shared/${rk.os}/wrapper.cpp"/>
                 <fileset dir="${rk.home}/shared/core/search4j" includes="libsearch4j.cpp,libsearch4j.h"/>
             </copy>
 
             <!-- copy bundled files into place -->
-            <copy todir="wrapped-installer" file="${rk.home}/shared/linux/${java.installer}"/>
+            <copy todir="wrapped-installer" file="${rk.home}/shared/${rk.os}/${java.installer}"/>
             <copy tofile="wrapped-installer/${projectname}.jar" file="installer/${projectname}-${version}${version-extra}-${os.suffix}.jar"/>
 
@@ -136 +136 @@
             <!-- link the compiled code and bundled files -->
             <exec executable="g++" dir="wrapped-installer">
-                <arg line="-static -static-libgcc -o ../products/${projectname}-${version}${version-extra}-linux${extension-x64} wrapper.o libsearch4j.o ${projectname}.jar.o java.o"/>
+                <arg line="-static -static-libgcc -o ../products/${projectname}-${version}${version-extra}-${rk.os}${extension-x64} wrapper.o libsearch4j.o ${projectname}.jar.o java.o"/>
             </exec>
 
+        </if></else></if>
         <!-- (mac) -->
-        <else><if><bool><equals arg1="${rk.os}" arg2="mac"/></bool>
-
-            <!-- create and setup the build directory -->
-            <delete dir="wrapped-installer"/>
-            <mkdir dir="wrapped-installer"/>
+        <if><bool><equals arg1="${rk.os}" arg2="mac"/></bool>
 
             <!-- create app for main installer -->
-            <copy todir="wrapped-installer/${projectname}${version}${version-extra}.app"><fileset dir="${rk.home}/shared/mac/Wrapper.app"/></copy>
+            <copy todir="wrapped-installer/${projectname}${version}${version-extra}.app">
+                <fileset dir="${rk.home}/shared/mac/Wrapper.app"/>
+            </copy>
             <copy todir="wrapped-installer/${projectname}${version}${version-extra}.app/Contents/Resources" file="${rk.home}/shared/core/icon/icon.icns"/>
             <chmod file="wrapped-installer/${projectname}${version}${version-extra}.app/Contents/MacOS/JavaApplicationStub" perm="ug+x"/>
 
             <!-- copy bundled files -->
-            <copy todir="wrapped-installer/${projectname}${version}${version-extra}.app/Contents/Resources/Java" file="installer/${projectname}-${version}${version-extra}-${os.suffix}.jar"/>
+            <!-- 
+            <copy todir="wrapped-installer/${projectname}${version}${version-extra}.app/Contents/Resources/Java" file="../products/${projectname}-${version}${version-extra}-${rk.os}${extension-x64}"/>
             <copy todir="wrapped-installer/${projectname}${version}${version-extra}.app/Contents/Resources/Java" file="${rk.home}/shared/mac/${java.installer}"/>
+            -->
+            <move todir="wrapped-installer/${projectname}${version}${version-extra}.app/Contents/Resources/Java" file="../products/${projectname}-${version}${version-extra}-${rk.os}${extension-x64}"/>
 
             <!-- substitute in real values -->
@@ -178 +180 @@
             <!-- unmount it-->
             <exec executable="hdiutil" failonerror="true"><arg line="detach /Volumes/${dmg.name}"/></exec>
-        </if></else></if></else></if>
-
+        </if>
 
     </target>