Changeset 16654

Timestamp:

2008-08-06 15:07:24 (5 months ago)

Author:

oranfry

Message:

got mark2 working

Files:

• release-kits/mark2/ant-scripts/build.xml (modified) (1 diff)
• release-kits/mark2/ant-scripts/create-installer.xml (modified) (2 diffs)
• release-kits/mark2/ant-scripts/wrap.xml (modified) (1 diff)

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

@@ -38 +38 @@
-
-                        <else>
-No processor set
+Processor type not set or set wrongly
-                                <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"/>
-       
+
-                        </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 -->
-x86
+${processor}
-                                        compress="true"
-                                        extractType="NonExtractor"

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

@@ -12 +12 @@
-
-                        <!-- copy bundled files -->
-
-
+
-
-                        <!-- substitute in real values -->
-x86
+${processor}
-                        <rsr file="${basedir}/wrapped-installer/Greenstone${version}.app/Contents/Info.plist" pattern="@version@" replacement="${version}"/>
-