Ignore:
Timestamp:
2008-08-08T13:07:16+12:00 (16 years ago)
Author:
oranfry
Message:

getting rid of unneeded if wrappers to each target as hacked ant now takes care of that, and replacing calls to custom task addressed calls to builtin antcall, which has been hacked in ant

File:
1 edited

Legend:

Unmodified
Added
Removed
  • release-kits/lirk3/ant-scripts/create-installer.xml

    r16277 r16684  
    33
    44    <target name="create-installer">
    5         <addressedcall target="setup-for-installer-creation"/>
    6         <addressedcall target="compile-installer"/>
     5        <antcall target="calculate-component-sizes"/> <!-- from rk3-targets -->
     6        <antcall target="copy-installer-files"/>
     7        <antcall target="make-installer-files-concrete"/> <!-- from rk3-targets -->
     8        <antcall target="compile-installer"/>
    79    </target>
    810
    9     <target name="setup-for-installer-creation">
    10         <if><bool><istrue value="${execute}"/></bool>
     11    <target name="copy-installer-files">
    1112
    12             <!-- get the size of packages -->
    13             <exec executable="du" dir="${basedir}/distribution/greenstone3/packages" outputproperty="du.tomcat"><arg line="-hs tomcat"/></exec>
    14             <exec executable="sed" inputstring="${du.tomcat}" outputproperty="component.size.tomcat"><arg line="-e 's/^\(.*\)\s.*$/\1b/g'"/></exec>
     13        <echo>Project Path: ${basedir}/distribution/greenstone3</echo>
    1514
    16             <exec executable="du" dir="${basedir}/distribution/greenstone3/packages" outputproperty="du.ant"><arg line="-hs ant"/></exec>
    17             <exec executable="sed" inputstring="${du.ant}" outputproperty="component.size.ant"><arg line="-e 's/^\(.*\)\s.*$/\1b/g'"/></exec>
     15        <echo>Getting things ready to compile the installer</echo>
     16        <mkdir dir="${basedir}/installer/resources"/>
     17        <copy todir="${basedir}/installer" file="${lirk3.home}/installer/antinstall-config.xml" overwrite="true" />
     18        <copy todir="${basedir}/installer" file="${lirk3.home}/installer/build.xml" overwrite="true" />
     19        <copy todir="${basedir}/installer/classes" overwrite="true">
     20            <fileset dir="${lirk3.home}/greenstone3/installer-classes"/>
     21            <fileset dir="${lirk3.home}/ant-scripts/tasks/orans" includes="RegexSearchReplace.class" />
     22        </copy>
    1823
    19             <echo>Project Path: ${basedir}/distribution/greenstone3</echo>
     24        <echo>component.size.core: ${component.size.core}</echo>
     25        <echo>component.size.sourcecode: ${component.size.sourcecode}</echo>
     26        <echo>component.size.tomcat: ${component.size.tomcat}</echo>
     27        <echo>component.size.ant: ${component.size.ant}</echo>
    2028
    21             <echo>Getting things ready to compile the installer</echo>
    22             <mkdir dir="${basedir}/installer/resources"/>
    23             <copy todir="${basedir}/installer" file="${lirk3.home}/installer/antinstall-config.xml" overwrite="true" />
    24             <copy todir="${basedir}/installer" file="${lirk3.home}/installer/build.xml" overwrite="true" />
    25             <copy todir="${basedir}/installer/classes" overwrite="true">
    26                 <fileset dir="${lirk3.home}/greenstone3/installer-classes"/>
    27                 <fileset dir="${lirk3.home}/ant-scripts/tasks/orans" includes="RegexSearchReplace.class" />
    28             </copy>
     29        <if>
     30            <bool><equals arg1="windows" arg2="${rk.os}"/></bool>
     31            <echo>component.size.windows-java: ${component.size.windows-java}</echo>
    2932
    30             <!-- put the concrete values of things in the config -->
    31             <rsr file="${basedir}/installer/antinstall-config.xml" pattern="@version@" replacement="${version}"/>
    32             <rsr file="${basedir}/installer/antinstall-config.xml" pattern="@component.size.linux-java@" replacement="${component.size.linux-java}"/>
    33             <rsr file="${basedir}/installer/antinstall-config.xml" pattern="@component.size.tomcat@" replacement="${component.size.tomcat}"/>
    34             <rsr file="${basedir}/installer/antinstall-config.xml" pattern="@component.size.ant@" replacement="${component.size.ant}"/>
     33        <else><if>
     34            <bool><equals arg1="linux" arg2="${rk.os}"/></bool>
     35            <echo>component.size.linux-java: ${component.size.linux-java}</echo>
     36            </if>
    3537
    36             <rsr file="${basedir}/installer/build.xml" pattern="@java.min.version@" replacement="${java.min.version}"/>
    37             <rsr file="${basedir}/installer/build.xml" pattern="@java.extracted@" replacement="${linux-java.extracted}"/>
    38 
    39 
    40             <!-- put the concrete values of things in the text -->
    41 
    42             <!-- default -->
    43             <rsr file="${basedir}/installer/classes/resources/LanguagePack.properties" pattern="@version@" replacement="${version}"/>
    44             <rsr file="${basedir}/installer/classes/resources/LanguagePack.properties" pattern="@java.min.version@" replacement="${java.min.version}"/>
    45             <rsr file="${basedir}/installer/classes/resources/LanguagePack.properties" pattern="@bundled.version.java@" replacement="${bundled.version.linux-java}"/>
    46             <rsr file="${basedir}/installer/classes/resources/LanguagePack.properties" pattern="@bundled.version.tomcat@" replacement="${bundled.version.tomcat}"/>
    47             <rsr file="${basedir}/installer/classes/resources/LanguagePack.properties" pattern="@bundled.version.ant@" replacement="${bundled.version.ant}"/>
    48 
    49             <!-- chinese -->
    50             <rsr file="${basedir}/installer/classes/resources/LanguagePack_zh_CN.properties" pattern="@version@" replacement="${version}"/>
    51             <rsr file="${basedir}/installer/classes/resources/LanguagePack_zh_CN.properties" pattern="@java.min.version@" replacement="${java.min.version}"/>
    52             <rsr file="${basedir}/installer/classes/resources/LanguagePack_zh_CN.properties" pattern="@bundled.version.java@" replacement="${bundled.version.linux-java}"/>
    53             <rsr file="${basedir}/installer/classes/resources/LanguagePack_zh_CN.properties" pattern="@bundled.version.tomcat@" replacement="${bundled.version.tomcat}"/>
    54             <rsr file="${basedir}/installer/classes/resources/LanguagePack_zh_CN.properties" pattern="@bundled.version.ant@" replacement="${bundled.version.ant}"/>
     38            </else>
    5539
    5640        </if>
     41
    5742    </target>
    5843
    5944    <target name="compile-installer">
    60         <if><bool><istrue value="${execute}"/></bool>
     45        <installer file="${basedir}/installer/greenstone3-with-java.jar"
     46                compress="true"
     47                extractType="NonExtractor"
     48                installConfig="${basedir}/installer/antinstall-config.xml"
     49                buildFile="${basedir}/installer/build.xml"
     50                antInstallLib="${lirk3.home}/packages/ant-installer/lib"
     51                antLib="${lirk3.home}/packages/ant/lib"
     52                validateConfig="true"
     53                failOnError="false"
     54                icons="bluecurve">
    6155
    62             <installer file="${basedir}/installer/greenstone3-with-java.jar"
    63                     compress="true"
    64                     extractType="NonExtractor"
    65                     installConfig="${basedir}/installer/antinstall-config.xml"
    66                     buildFile="${basedir}/installer/build.xml"
    67                     antInstallLib="${lirk3.home}/packages/ant-installer/lib"
    68                     antLib="${lirk3.home}/packages/ant/lib"
    69                     validateConfig="true"
    70                     failOnError="false"
    71                     icons="bluecurve">
     56            <!-- copy all the important files into the archive to be extracted for install -->
     57            <zipfileset dir="${basedir}/installer/classes" includes="**/*" /> <!-- installer classes -->
     58            <zipfileset dir="${basedir}/distribution/greenstone3" includes="**/*"/>
    7259
    73                 <!-- copy all the important files into the archive to be extracted for install -->
    74                 <zipfileset dir="${basedir}/installer/classes" includes="**/*" /> <!-- installer classes -->
    75                 <zipfileset dir="${basedir}/distribution/greenstone3" includes="**/*"/>
     60        </installer>
    7661
    77             </installer>
     62        <!-- delete the 'bundled java only' lines from the installer config -->
     63        <rsr file="${basedir}/installer/antinstall-config.xml" pattern=".*&lt;!-- bundled java only --&gt;" replacement=""/>
    7864
    79             <!-- delete the 'bundled java only' lines from the installer config -->
    80             <rsr file="${basedir}/installer/antinstall-config.xml" pattern=".*&lt;!-- bundled java only --&gt;" replacement=""/>
     65        <installer file="${basedir}/installer/greenstone3.jar"
     66                compress="true"
     67                extractType="NonExtractor"
     68                installConfig="${basedir}/installer/antinstall-config.xml"
     69                buildFile="${basedir}/installer/build.xml"
     70                antInstallLib="${lirk3.home}/packages/ant-installer/lib"
     71                antLib="${lirk3.home}/packages/ant/lib"
     72                validateConfig="true"
     73                icons="bluecurve">
    8174
    82             <installer file="${basedir}/installer/greenstone3.jar"
    83                     compress="true"
    84                     extractType="NonExtractor"
    85                     installConfig="${basedir}/installer/antinstall-config.xml"
    86                     buildFile="${basedir}/installer/build.xml"
    87                     antInstallLib="${lirk3.home}/packages/ant-installer/lib"
    88                     antLib="${lirk3.home}/packages/ant/lib"
    89                     validateConfig="true"
    90                     icons="bluecurve">
    91 
    92                 <zipfileset dir="${basedir}/installer/classes" includes="**/*"/>
    93                 <zipfileset dir="${basedir}/distribution/greenstone3" includes="**/*"/>
    94             </installer>
    95         </if>
     75            <zipfileset dir="${basedir}/installer/classes" includes="**/*"/>
     76            <zipfileset dir="${basedir}/distribution/greenstone3" includes="**/*"/>
     77        </installer>
    9678    </target>
    9779
Note: See TracChangeset for help on using the changeset viewer.