Changeset 16654

Show
Ignore:
Timestamp:
06.08.2008 15:07:24 (11 years ago)
Author:
oranfry
Message:

got mark2 working

Location:
release-kits/mark2/ant-scripts
Files:
3 modified

Legend:

Unmodified
Added
Removed
  • release-kits/mark2/ant-scripts/build.xml

    r16519 r16654  
    3838 
    3939            <else> 
    40                 <echo>No processor set. Please set the property 'processor' to either 'intel' or 'ppc' in build.properties</echo> 
     40                <echo>Processor type not set or set wrongly. Please set the property 'processor' to either 'intel' or 'ppc' in build.properties</echo> 
    4141                <fail>Processor not set</fail> 
    4242            </else> 
  • release-kits/mark2/ant-scripts/create-installer.xml

    r16453 r16654  
    1616            <copy todir="${basedir}/installer/classes" overwrite="true"> 
    1717                <fileset dir="${mark2.home}/greenstone2/installer-classes"/> 
    18                 <fileset dir="${mark2.home}/ant-scripts/tasks/orans" includes="RegexSearchReplace.class" /> 
     18            <fileset dir="${mark2.home}/ant-scripts/tasks/orans" includes="RegexSearchReplace.class" /> 
    1919            </copy> 
    2020 
     
    3737        <if><bool><istrue value="${execute}"/></bool> 
    3838 
    39             <!-- create the installer with java --> 
    40             <installer file="${basedir}/installer/Greenstone-${version}-MacOS-x86-with-java.jar" 
    41                     compress="true" 
    42                     extractType="NonExtractor" 
    43                     installConfig="${basedir}/installer/antinstall-config.xml" 
    44                     buildFile="${basedir}/installer/build.xml" 
    45                     antInstallLib="${mark2.home}/packages/ant-installer/lib" 
    46                     antLib="${mark2.home}/packages/ant/lib" 
    47                     validateConfig="true" 
    48                     failOnError="false" 
    49                     icons="bluecurve"> 
    50  
    51                 <zipfileset dir="${basedir}/installer/classes" includes="**/*" /> 
    52                 <zipfileset dir="${basedir}/distributions/web" includes="**/*"/> 
    53  
    54             </installer> 
    55  
    56             <!-- delete the 'bundled java only' lines from the installer config --> 
    57             <rsr file="${basedir}/installer/antinstall-config.xml" pattern=".*&lt;!-- bundled java only --&gt;" replacement=""/> 
    58  
    5939            <!-- create the installer without java --> 
    60             <installer file="${basedir}/installer/Greenstone-${version}-MacOS-x86.jar" 
     40            <installer file="${basedir}/installer/Greenstone-${version}-MacOS-${processor}.jar" 
    6141                    compress="true" 
    6242                    extractType="NonExtractor" 
  • release-kits/mark2/ant-scripts/wrap.xml

    r16453 r16654  
    1212 
    1313            <!-- copy bundled files --> 
    14             <!--<copy todir="${basedir}/wrapped-installer/Greenstone${version}.app/Contents/Resources/Java" file="${mark2.home}/linux/${linux-java.installer}"/>--> 
    15             <copy todir="${basedir}/wrapped-installer/Greenstone${version}.app/Contents/Resources/Java" file="${basedir}/installer/Greenstone-${version}-MacOS-x86.jar"/> 
     14            <copy todir="${basedir}/wrapped-installer/Greenstone${version}.app/Contents/Resources/Java" file="${basedir}/installer/Greenstone-${version}-MacOS-${processor}.jar"/> 
    1615 
    1716            <!-- substitute in real values --> 
    18             <rsr file="${basedir}/wrapped-installer/Greenstone${version}.app/Contents/Info.plist" pattern="@jar@" replacement="Greenstone-${version}-MacOS-x86.jar"/> 
     17            <rsr file="${basedir}/wrapped-installer/Greenstone${version}.app/Contents/Info.plist" pattern="@jar@" replacement="Greenstone-${version}-MacOS-${processor}.jar"/> 
    1918            <rsr file="${basedir}/wrapped-installer/Greenstone${version}.app/Contents/Info.plist" pattern="@version@" replacement="${version}"/> 
    2019