Changeset 17703

Show
Ignore:
Timestamp:
05.11.2008 15:51:34 (11 years ago)
Author:
oranfry
Message:

make-installer-files concrete is now in init.xml so deleted from here, and updated compile uninstaller to use the new language strings

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • release-kits/shared/greenstone2/ant-scripts/rk2-targets.xml

    r17647 r17703  
    1010<project name="rk2-targets"> 
    1111 
    12     <target name="make-installer-files-concrete"> 
    13  
    14         <!-- calculate the size of some components --> 
    15         <echo>Calculating the size of some components</echo> 
    16  
    17         <!-- core greenstone2 system --> 
    18         <length property="component.bytesize.core-without-jre" mode="all"><fileset file="${basedir}/components/core.comp"/></length> 
    19         <if><bool><equals arg1="${java.os}" arg2="windows"/></bool> 
    20             <math result="component.bytesize.core" operand1="${component.bytesize.core-without-jre}" operation="+" operand2="${component.bytesize.windows-java}" datatype="int"/> 
    21         <else><if><bool><equals arg1="${java.os}" arg2="linux"/></bool> 
    22             <math result="component.bytesize.core" operand1="${component.bytesize.core-without-jre}" operation="+" operand2="${component.bytesize.linux-java}" datatype="int"/> 
    23         <else> 
    24             <property name="component.bytesize.core" value="${component.bytesize.core-without-jre}"/> 
    25         </else></if></else></if> 
    26         <math result="component.megabytesize.core" operand1="${component.bytesize.core}" operation="/" operand2="1048576" datatype="int"/> 
    27         <property name="component.size.core" value="${component.megabytesize.core} MB"/> 
    28  
    29         <!-- source code core --> 
    30         <length property="component.bytesize.sourcecode-core" mode="all"><fileset file="${basedir}/components/sourcecode-core.comp"/></length> 
    31         <math result="component.megabytesize.sourcecode-core" operand1="${component.bytesize.sourcecode-core}" operation="/" operand2="1048576" datatype="int"/> 
    32         <property name="component.size.sourcecode-core" value="${component.megabytesize.sourcecode-core} MB"/> 
    33  
    34         <!-- source code --> 
    35         <length property="component.bytesize.sourcecode" mode="all"><fileset file="${basedir}/components/sourcecode.comp"/></length> 
    36         <math result="component.megabytesize.sourcecode" operand1="${component.bytesize.sourcecode}" operation="/" operand2="1048576" datatype="int"/> 
    37         <property name="component.size.sourcecode" value="${component.megabytesize.sourcecode} MB"/> 
    38          
    39         <!-- imagemagick --> 
    40         <length property="component.bytesize.imagemagick" mode="all"><fileset file="${basedir}/components/imagemagick.comp"/></length> 
    41         <math result="component.megabytesize.imagemagick" operand1="${component.bytesize.imagemagick}" operation="/" operand2="1048576" datatype="int"/> 
    42         <property name="component.size.imagemagick" value="${component.megabytesize.imagemagick} MB"/> 
    43          
    44         <!-- ghostscript --> 
    45         <length property="component.bytesize.ghostscript" mode="all"><fileset file="${basedir}/components/ghostscript.comp"/></length> 
    46         <math result="component.megabytesize.ghostscript" operand1="${component.bytesize.ghostscript}" operation="/" operand2="1048576" datatype="int"/> 
    47         <property name="component.size.ghostscript" value="${component.megabytesize.ghostscript} MB"/> 
    48          
    49         <!-- put the concrete values of things in the config --> 
    50         <rsr file="${basedir}/installer/antinstall-config.xml"> 
    51             <job pattern="@version@" replacement="${version}"/> 
    52             <job pattern="@component.size.core@" replacement="${component.size.core}"/> 
    53             <job pattern="@component.size.sourcecode-core@" replacement="${component.size.sourcecode-core}"/> 
    54             <job pattern="@component.size.sourcecode@" replacement="${component.size.sourcecode}"/> 
    55             <job pattern="@component.size.imagemagick@" replacement="${component.size.imagemagick}"/> 
    56             <job pattern="@component.size.ghostscript@" replacement="${component.size.ghostscript}"/> 
    57         </rsr> 
    58  
    59         <rsr file="${basedir}/installer/build.xml"> 
    60             <job pattern="@version@" replacement="${version}"/> 
    61             <job pattern="@java.min.version@" replacement="${java.min.version}"/> 
    62             <job pattern="@windows-java.extracted@" replacement="${windows-java.extracted}"/> 
    63             <job pattern="@linux-java.extracted@" replacement="${linux-java.extracted}"/> 
    64         </rsr> 
    65  
    66         <!-- put the concrete values of things in the text --> 
    67         <!-- default --> 
    68         <rsr file="${basedir}/installer/classes/resources/LanguagePack.properties"> 
    69             <job pattern="@version@" replacement="${version}"/> 
    70             <job pattern="@java.min.version@" replacement="${java.min.version}"/> 
    71             <job pattern="@bundled.version.windows-java@" replacement="${bundled.version.windows-java}"/> 
    72             <job pattern="@bundled.version.linux-java@" replacement="${bundled.version.linux-java}"/> 
    73             <job pattern="@bundled.version.ghostscript@" replacement="${bundled.version.ghostscript}"/> 
    74             <job pattern="@bundled.version.imagemagick@" replacement="${bundled.version.imagemagick}"/> 
    75         </rsr> 
    76  
    77         <!-- chinese --> 
    78         <rsr file="${basedir}/installer/classes/resources/LanguagePack_zh.properties"> 
    79             <job pattern="@version@" replacement="${version}"/> 
    80             <job pattern="@java.min.version@" replacement="${java.min.version}"/> 
    81             <job pattern="@bundled.version.windows-java@" replacement="${bundled.version.windows-java}"/> 
    82             <job pattern="@bundled.version.linux-java@" replacement="${bundled.version.linux-java}"/> 
    83             <job pattern="@bundled.version.ghostscript@" replacement="${bundled.version.ghostscript}"/> 
    84             <job pattern="@bundled.version.imagemagick@" replacement="${bundled.version.imagemagick}"/> 
    85         </rsr> 
    86  
    87     </target> 
    88  
    89 <!-- 
    90     <target name="compile-search4j-unix"> 
    91         <copy todir="${basedir}/gsdl"><fileset dir="${rk.home}/packages" includes="search4j/**/*"/></copy> 
    92         <chmod perm="ug+x" file="${basedir}/gsdl/search4j/compile.sh"/> 
    93         <exec dir="${basedir}/gsdl/search4j" executable="${basedir}/gsdl/search4j/compile.sh"/> 
    94         <move file="${basedir}/gsdl/search4j/search4j" todir="${basedir}/gsdl/bin"/> 
    95         <chmod perm="ug+x" file="${basedir}/gsdl/bin/search4j"/> 
    96     </target> 
    97  
    98     <target name="compile-search4j-windows"> 
    99         <copy todir="${basedir}/gsdl"><fileset dir="${rk.home}/packages" includes="search4j/**/*"/></copy> 
    100         <exec dir="${basedir}/gsdl/search4j" executable="${basedir}/gsdl/search4j/compile.bat"/> 
    101         <move file="${basedir}/gsdl/search4j/search4j.exe" todir="${basedir}/gsdl/bin"/> 
    102     </target> 
    103 --> 
     12    <property name="version.major" value="2"/> 
    10413 
    10514    <target name="compile-uninstaller"> 
    10615        <echo>Compiling Uninstaller</echo> 
    10716 
    108         <mkdir dir="${basedir}/gsdl/uninstaller/build" /> 
     17        <!-- create working build directory --> 
     18        <mkdir dir="${basedir}/gsdl/uninstaller/build/resources" /> 
    10919 
     20        <!-- copile to build --> 
    11021        <javac 
    11122            srcdir="${rk.home}/uninstaller" 
    11223            destdir="${basedir}/gsdl/uninstaller/build" /> 
    11324 
    114         <copy todir="${basedir}/gsdl/uninstaller/build"> 
    115             <fileset dir="${rk.home}/uninstaller" includes="*.properties"/> 
     25        <!-- copy language bundle into place --> 
     26        <copy todir="${basedir}/gsdl/uninstaller/build/resources" overwrite="true"> 
     27            <fileset dir="${rk.home}/language-strings"/> 
    11628        </copy> 
    11729 
     30        <!-- jar it all up --> 
    11831        <jar 
    11932            destfile="${basedir}/gsdl/uninstaller/uninst.jar"