Changeset 19537

Timestamp:

2009-05-20T10:17:35+12:00 (15 years ago)

Author:

oranfry

Message:

work on creating the cdrom installers and putting them with the cdrom components

Location:

release-kits

Files:

• lirk2/ant-scripts/create-components.xml (modified) (1 diff)
• lirk2/ant-scripts/wrap.xml (modified) (5 diffs)
• mark2/ant-scripts/create-components.xml (modified) (1 diff)
• mark2/ant-scripts/wrap.xml (modified) (3 diffs)
• wirk2/ant-scripts/create-components.xml (modified) (1 diff)
• wirk2/ant-scripts/wrap.xml (modified) (1 diff)

release-kits/lirk2/ant-scripts/create-components.xml

@@ -100 +100 @@
             <fileset dir="components/tmp/imagemagick"/>
         </copy>
-
-        <!-- archive the cd components -->
-        <mkdir dir="products"/>
-        <tar destfile="products/cdrom-components-${version}-linux.tar.gz" basedir="components/tmp/cdrom" compression="gzip"/>
         
     </target>

release-kits/lirk2/ant-scripts/wrap.xml

@@ -7 +7 @@
         <antcall target="compile-wrapper-web"/>
         <antcall target="compile-wrapper-cdrom"/>
+        <antcall target="archive-cdrom-components-and-installer"/>
     </target>
 
@@ -71 +72 @@
 
     <target name="compile-wrapper-web" depends="calculate-object-sizes">
-
+        <mkdir dir="products"/>
         <echo level="info">creating wrapper header file</echo>
         <delete file="wrapper.h"/>
@@ -85 +86 @@
         <echo level="info">link the compiled code and bundled files</echo>
         <exec executable="g++" dir="${basedir}/wrapped-installer">
-            <arg line="-static -static-libgcc -o ../products/Greenstone-${version}-linux.bin wrapper.o libsearch4j.o greenstone2.jar.o java.o"/>
+            <arg line="-static -static-libgcc -o ../products/Greenstone-${version}-linux wrapper.o libsearch4j.o greenstone2.jar.o java.o"/>
         </exec>
 
@@ -91 +92 @@
 
     <target name="compile-wrapper-cdrom" depends="calculate-object-sizes">
-
         <echo level="info">creating wrapper header file</echo>
         <delete file="wrapper.h"/>
@@ -105 +105 @@
         <echo level="info">link the compiled code and bundled files</echo>
         <exec executable="g++" dir="${basedir}/wrapped-installer">
-            <arg line="-static -static-libgcc -o ../products/cdrom-linux.bin wrapper.o libsearch4j.o cdrom.jar.o java.o"/>
+            <arg line="-static -static-libgcc -o ../wrapped-installer/cdrom-linux wrapper.o libsearch4j.o cdrom.jar.o java.o"/>
         </exec>
 
     </target>
 
+    <target name="archive-cdrom-components-and-installer">
+        <mkdir dir="products"/>
+        <tar destfile="products/cdrom-components-${version}-linux.tar.gz" compression="gzip">
+            <tarfileset dir="components/tmp"><include name="cdrom/**/*"/></tarfileset>
+            <tarfileset dir="wrapped-installer"><include name="cdrom-linux"/></tarfileset>
+        </tar>
+    </target>
+
 </project>

release-kits/mark2/ant-scripts/create-components.xml

@@ -138 +138 @@
             <fileset dir="components/tmp/ghostscript"/>
         </copy>
-
-        <!-- archive the cd components -->
-        <mkdir dir="products"/>
-        <tar destfile="products/cdrom-components-${version}-mac.tar.gz" basedir="components/tmp/cdrom" compression="gzip"/>
         
     </target>

release-kits/mark2/ant-scripts/wrap.xml

@@ -3 +3 @@
 
     <target name="wrap">
+        <antcall target="wrap-main-installer"/>
+        <antcall target="wrap-cdrom-installer"/>
+        <antcall target="archive-cdrom-components-and-installer"/>
+    </target>
 
-        <!-- create products directory -->
+    <target name="wrap-main-installer">
         <mkdir dir="products"/>
 
@@ -12 +16 @@
 
         <!-- create app for main installer -->
-            <copy todir="${basedir}/wrapped-installer/Greenstone${version}.app"><fileset dir="${mark2.home}/mac/Wrapper.app"/></copy>
-            <copy todir="${basedir}/wrapped-installer/Greenstone${version}.app/Contents/Resources" file="${mark2.home}/greenstone2/icon/icon.icns"/>
-            <chmod file="${basedir}/wrapped-installer/Greenstone${version}.app/Contents/MacOS/JavaApplicationStub" perm="ug+x"/>
+        <copy todir="${basedir}/wrapped-installer/Greenstone${version}.app"><fileset dir="${mark2.home}/mac/Wrapper.app"/></copy>
+        <copy todir="${basedir}/wrapped-installer/Greenstone${version}.app/Contents/Resources" file="${mark2.home}/greenstone2/icon/icon.icns"/>
+        <chmod file="${basedir}/wrapped-installer/Greenstone${version}.app/Contents/MacOS/JavaApplicationStub" perm="ug+x"/>
 
-            <!-- copy bundled files -->
-            <copy todir="${basedir}/wrapped-installer/Greenstone${version}.app/Contents/Resources/Java" file="${basedir}/installer/Greenstone-${version}-MacOS-${processor}.jar"/>
+        <!-- copy bundled files -->
+        <copy todir="${basedir}/wrapped-installer/Greenstone${version}.app/Contents/Resources/Java" file="${basedir}/installer/Greenstone-${version}-MacOS-${processor}.jar"/>
 
-            <!-- substitute in real values -->
-            <rsr file="${basedir}/wrapped-installer/Greenstone${version}.app/Contents/Info.plist" pattern="@jar@" replacement="Greenstone-${version}-MacOS-${processor}.jar"/>
-            <rsr file="${basedir}/wrapped-installer/Greenstone${version}.app/Contents/Info.plist" pattern="@version@" replacement="${version}"/>
+        <!-- substitute in real values -->
+        <rsr file="${basedir}/wrapped-installer/Greenstone${version}.app/Contents/Info.plist" pattern="@jar@" replacement="Greenstone-${version}-MacOS-${processor}.jar"/>
+        <rsr file="${basedir}/wrapped-installer/Greenstone${version}.app/Contents/Info.plist" pattern="@version@" replacement="${version}"/>
 
 
-        <!-- create app for cdrom installer -->
-            <copy todir="${basedir}/products/cdrom.app"><fileset dir="${mark2.home}/mac/Wrapper.app"/></copy>
-            <copy todir="${basedir}/products/cdrom.app/Contents/Resources" file="${mark2.home}/greenstone2/icon/icon.icns"/>
-            <chmod file="${basedir}/products/cdrom.app/Contents/MacOS/JavaApplicationStub" perm="ug+x"/>
-
-            <!-- copy bundled files -->
-            <copy todir="${basedir}/products/cdrom.app/Contents/Resources/Java" file="${basedir}/installer/cdrom.jar"/>
-
-            <!-- substitute in real values -->
-            <rsr file="${basedir}/products/cdrom.app/Contents/Info.plist" pattern="@jar@" replacement="cdrom.jar"/>
-            <rsr file="${basedir}/products/cdrom.app/Contents/Info.plist" pattern="@version@" replacement="${version}"/>
-
-        <!-- wrap main app in a dmg -->
+        <!-- turn app into a dmg -->
 
         <!-- get size of app -->
@@ -56 +48 @@
         <!-- unmount it-->
         <exec executable="hdiutil"><arg line="detach /Volumes/${dmg.name}"/></exec>
+
+    </target>
+
+    <target name="wrap-cdrom-installer">
+        <mkdir dir="products"/>
+        <!-- create app for cdrom installer -->
+        <copy todir="${basedir}/wrapped-installer/cdrom.app"><fileset dir="${mark2.home}/mac/Wrapper.app"/></copy>
+        <copy todir="${basedir}/wrapped-installer/cdrom.app/Contents/Resources" file="${mark2.home}/greenstone2/icon/icon.icns"/>
+        <chmod file="${basedir}/wrapped-installer/cdrom.app/Contents/MacOS/JavaApplicationStub" perm="ug+x"/>
+
+        <!-- copy bundled files -->
+        <copy todir="${basedir}/wrapped-installer/cdrom.app/Contents/Resources/Java" file="${basedir}/installer/cdrom.jar"/>
+
+        <!-- substitute in real values -->
+        <rsr file="${basedir}/wrapped-installer/cdrom.app/Contents/Info.plist" pattern="@jar@" replacement="cdrom.jar"/>
+        <rsr file="${basedir}/wrapped-installer/cdrom.app/Contents/Info.plist" pattern="@version@" replacement="${version}"/>
+    </target>
+
+    <target name="archive-cdrom-components-and-installer">
+        <tar destfile="products/cdrom-components-${version}-mac.tar.gz" compression="gzip">
+            <tarfileset dir="components/tmp"><include name="cdrom/**/*"/></tarfileset>
+            <tarfileset dir="wrapped-installer"><include name="cdrom.app/**/*"/></tarfileset>
+        </tar>
     </target>
 

release-kits/wirk2/ant-scripts/create-components.xml

@@ -118 +118 @@
         </copy>
 
-        <!-- archive the cd components -->
-        <mkdir dir="products"/>
-        <tar destfile="products/cdrom-components-${version}-windows.tar.gz" basedir="components/tmp/cdrom" compression="gzip"/>
-
     </target>
         

release-kits/wirk2/ant-scripts/wrap.xml

@@ -109 +109 @@
     </target>
 
+    <target name="archive-cdrom-components-and-installer">
+        <mkdir dir="products"/>
+        <tar destfile="products/cdrom-components-${version}-linux.tar.gz" compression="gzip">
+            <tarfileset dir="components/tmp"><include name="cdrom/**/*"/></tarfileset>
+            <tarfileset dir="wrapped-installer"><include name="cdrom-windows.exe"/></tarfileset>
+        </tar>
+    </target>
+
 </project>