Changeset 16654 for release-kits/mark2

Timestamp:

2008-08-06T15:07:24+12:00 (16 years ago)

Author:

oranfry

Message:

got mark2 working

Location:

release-kits/mark2/ant-scripts

Files:

• build.xml (modified) (1 diff)
• create-installer.xml (modified) (2 diffs)
• wrap.xml (modified) (1 diff)

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

@@ -38 +38 @@
 
             <else>
-                <echo>No processor set. Please set the property 'processor' to either 'intel' or 'ppc' in build.properties</echo>
+                <echo>Processor type not set or set wrongly. Please set the property 'processor' to either 'intel' or 'ppc' in build.properties</echo>
                 <fail>Processor not set</fail>
             </else>

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

@@ -16 +16 @@
             <copy todir="${basedir}/installer/classes" overwrite="true">
                 <fileset dir="${mark2.home}/greenstone2/installer-classes"/>
-                <fileset dir="${mark2.home}/ant-scripts/tasks/orans" includes="RegexSearchReplace.class" />
+            <fileset dir="${mark2.home}/ant-scripts/tasks/orans" includes="RegexSearchReplace.class" />
             </copy>
 
@@ -37 +37 @@
         <if><bool><istrue value="${execute}"/></bool>
 
-            <!-- create the installer with java -->
-            <installer file="${basedir}/installer/Greenstone-${version}-MacOS-x86-with-java.jar"
-                    compress="true"
-                    extractType="NonExtractor"
-                    installConfig="${basedir}/installer/antinstall-config.xml"
-                    buildFile="${basedir}/installer/build.xml"
-                    antInstallLib="${mark2.home}/packages/ant-installer/lib"
-                    antLib="${mark2.home}/packages/ant/lib"
-                    validateConfig="true"
-                    failOnError="false"
-                    icons="bluecurve">
-
-                <zipfileset dir="${basedir}/installer/classes" includes="**/*" />
-                <zipfileset dir="${basedir}/distributions/web" includes="**/*"/>
-
-            </installer>
-
-            <!-- delete the 'bundled java only' lines from the installer config -->
-            <rsr file="${basedir}/installer/antinstall-config.xml" pattern=".*&lt;!-- bundled java only --&gt;" replacement=""/>
-
             <!-- create the installer without java -->
-            <installer file="${basedir}/installer/Greenstone-${version}-MacOS-x86.jar"
+            <installer file="${basedir}/installer/Greenstone-${version}-MacOS-${processor}.jar"
                     compress="true"
                     extractType="NonExtractor"

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

@@ -12 +12 @@
 
             <!-- copy bundled files -->
-            <!--<copy todir="${basedir}/wrapped-installer/Greenstone${version}.app/Contents/Resources/Java" file="${mark2.home}/linux/${linux-java.installer}"/>-->
-            <copy todir="${basedir}/wrapped-installer/Greenstone${version}.app/Contents/Resources/Java" file="${basedir}/installer/Greenstone-${version}-MacOS-x86.jar"/>
+            <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-x86.jar"/>
+            <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}"/>