Changeset 28728 for other-projects

Timestamp:

2013-12-02T16:57:33+13:00 (10 years ago)

Author:

ak19

Message:

Expeditee team (jts21). Modify release kits to generate a working Mac app (hopefully - to be tested)

Location:

other-projects/expeditee-release-kits

Files:

• kits/rke/ant-scripts/compile.xml (modified) (2 diffs)
• kits/rke/ant-scripts/create-cdrom-components.xml (deleted)
• kits/rke/ant-scripts/wrap.xml (modified) (4 diffs)
• shared/mac/Wrapper.app/Contents/Info.plist (modified) (1 diff)

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

@@ -22 +22 @@
 
         <!-- copy search4j -->
-        <if><bool><or><equals arg1="${rk.os}" arg2="mac"/><equals arg1="${rk.os}" arg2="linux"/></or></bool>
+        <if><bool><equals arg1="${rk.os}" arg2="linux"/></bool>
             <exec dir="${rk.home}/shared/core/search4j" executable="./configure" failonerror="true"/>
             <exec dir="${rk.home}/shared/core/search4j" executable="make" failonerror="true"/>
@@ -31 +31 @@
             <copy file="${rk.home}/shared/core/search4j/search4j.exe" todir="${basedir}/compiled/bin" />
         </if>
-
         <!-- copy run scripts -->
-        <copy todir="${basedir}/compiled">
-            <fileset dir="${rk.home}/scripts">
-                <include name="**" />
-            </fileset>
-        </copy>
+        <if><bool><or><equals arg1="${rk.os}" arg2="linux"/><equals arg1="${rk.os}" arg2="windows"/></or></bool>
+            <copy todir="${basedir}/compiled">
+                <fileset dir="${rk.home}/scripts">
+                    <include name="**" />
+                </fileset>
+            </copy>
+        </if>
     </target>
 

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

@@ -66 +66 @@
             </exec>
 
-        <!-- (linux and mac) -->
-        <else><if><bool><or><equals arg1="${rk.os}" arg2="linux"/><equals arg1="${rk.os}" arg2="mac"/></or></bool>
+        <!-- (linux) -->
+        <else><if><bool><equals arg1="${rk.os}" arg2="linux"/></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/${rk.os}/wrapper.cpp"/>
+                <fileset file="${rk.home}/shared/linux/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/${rk.os}/${java.installer}"/>
+            <copy todir="wrapped-installer" file="${rk.home}/shared/linux/${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}-${rk.os}${extension-x64} wrapper.o libsearch4j.o ${projectname}.jar.o java.o"/>
+                <arg line="-static -static-libgcc -o ../products/${projectname}-${version}${version-extra}-linux${extension-x64} wrapper.o libsearch4j.o ${projectname}.jar.o java.o"/>
             </exec>
 
-        </if></else></if>
         <!-- (mac) -->
-        <if><bool><equals arg1="${rk.os}" arg2="mac"/></bool>
+        <else><if><bool><equals arg1="${rk.os}" arg2="mac"/></bool>
+
+            <!-- create and setup the build directory -->
+            <mkdir dir="wrapped-installer"/>
 
             <!-- 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"/>
+            <chmod file="wrapped-installer/${projectname}${version}${version-extra}.app/Contents/MacOS/Expeditee" perm="ug+x"/>
 
             <!-- copy bundled files -->
-            <!-- 
-            <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}"/>
+            <copy todir="wrapped-installer/${projectname}${version}${version-extra}.app/Contents/Resources"><fileset dir="compiled"/></copy>
+            <copy tofile="wrapped-installer/${projectname}${version}${version-extra}.app/Contents/Resources/jre_bin" file="${rk.home}/shared/mac/${java.installer}"/>
 
             <!-- substitute in real values -->
             <rsr file="wrapped-installer/${projectname}${version}${version-extra}.app/Contents/Info.plist">
-                <job pattern="@jar@" replacement="${projectname}-${version}${version-extra}-${os.suffix}.jar"/>
                 <job pattern="@projectname@" replacement="${projectname}"/>
                 <job pattern="@version@" replacement="${version}${version-extra}"/>
@@ -180 +176 @@
             <!-- unmount it-->
             <exec executable="hdiutil" failonerror="true"><arg line="detach /Volumes/${dmg.name}"/></exec>
-        </if>
+        </if></else></if></else></if>
+
 
     </target>

other-projects/expeditee-release-kits/shared/mac/Wrapper.app/Contents/Info.plist

@@ -4 +4 @@
 <dict>
     <key>CFBundleName</key>
-    <string>Expeditee</string>
+    <string>@projectname@</string>
     <key>CFBundleVersion</key>
-    <string></string>
+    <string>@version@</string>
     <key>CFBundleAllowMixedLocalizations</key>
     <string>true</string>