Ignore:
Timestamp:
2008-04-23T17:26:48+12:00 (14 years ago)
Author:
oranfry
Message:

some updates to make the release kit produce nicer installers

File:
1 edited

Legend:

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

    r15142 r15205  
    2424            <copy todir="${basedir}/installer" file="${lirk3.home}/installer/antinstall-config.xml"/>
    2525            <copy todir="${basedir}/installer" file="${lirk3.home}/installer/build.xml"/>
     26            <copy todir="${basedir}/installer/cp"><fileset dir="${lirk3.home}/installer/cp"/></copy>
     27
     28            <!-- put the concrete values of things in the config -->
    2629            <rsr file="${basedir}/installer/antinstall-config.xml" pattern="@version@" replacement="${version}"/>
     30            <rsr file="${basedir}/installer/build.xml" pattern="@java.min.version@" replacement="${java.min.version}"/>
    2731            <rsr file="${basedir}/installer/build.xml" pattern="@java.extracted@" replacement="${java.extracted}"/>
    28            
     32
     33
     34            <!-- put the concrete values of things in the text -->
     35            <!-- default -->
     36            <rsr file="${basedir}/installer/cp/resources/LanguagePack.properties" pattern="@version@" replacement="${version}"/>
     37            <rsr file="${basedir}/installer/cp/resources/LanguagePack.properties" pattern="@java.min.version@" replacement="${java.min.version}"/>
     38            <rsr file="${basedir}/installer/cp/resources/LanguagePack.properties" pattern="@bundled.version.java@" replacement="${bundled.version.java}"/>
     39            <rsr file="${basedir}/installer/cp/resources/LanguagePack.properties" pattern="@bundled.version.tomcat@" replacement="${bundled.version.tomcat}"/>
     40            <rsr file="${basedir}/installer/cp/resources/LanguagePack.properties" pattern="@bundled.version.ant@" replacement="${bundled.version.ant}"/>
     41
     42            <!-- chinese -->
     43            <rsr file="${basedir}/installer/cp/resources/LanguagePack_zh_CN.properties" pattern="@version@" replacement="${version}"/>
     44            <rsr file="${basedir}/installer/cp/resources/LanguagePack_zh_CN.properties" pattern="@java.min.version@" replacement="${java.min.version}"/>
     45            <rsr file="${basedir}/installer/cp/resources/LanguagePack_zh_CN.properties" pattern="@bundled.version.java@" replacement="${bundled.version.java}"/>
     46            <rsr file="${basedir}/installer/cp/resources/LanguagePack_zh_CN.properties" pattern="@bundled.version.tomcat@" replacement="${bundled.version.tomcat}"/>
     47            <rsr file="${basedir}/installer/cp/resources/LanguagePack_zh_CN.properties" pattern="@bundled.version.ant@" replacement="${bundled.version.ant}"/>
     48
    2949        </if>
    3050    </target>
     
    3252    <target name="compile-installer">
    3353        <if><bool><istrue value="${execute}"/></bool>
     54
     55            <installer file="${basedir}/installer/greenstone3-with-java.jar"
     56                    compress="true"
     57                    extractType="NonExtractor"
     58                    installConfig="${basedir}/installer/antinstall-config.xml"
     59                    buildFile="${basedir}/installer/build.xml"
     60                    antInstallLib="${lirk3.home}/bin/ant-installer/lib"
     61                    antLib="${lirk3.home}/bin/ant-installer/antlib"
     62                    validateConfig="true"
     63                    icons="bluecurve">
     64
     65                <!-- copy all the important files into the archive to be extracted for install -->
     66                <zipfileset dir="${basedir}/installer/cp" includes="resources/*"/>
     67                <zipfileset dir="${lirk3.home}/ant-scripts/tasks/orans"><include name="RegexSearchReplace.class"/></zipfileset>
     68
     69<!--
     70                <zipfileset dir="${basedir}/distribution/greenstone3" includes="*"/>
     71                <zipfileset dir="${basedir}/distribution/greenstone3/bin" prefix="bin"><include name="**/*"/></zipfileset>
     72                <zipfileset dir="${basedir}/distribution/greenstone3/docs" prefix="docs"><include name="**/*"/></zipfileset>
     73                <zipfileset dir="${basedir}/distribution/greenstone3/gli" prefix="gli"><include name="**/*"/></zipfileset>
     74                <zipfileset dir="${basedir}/distribution/greenstone3/gs2build" prefix="gs2build"><include name="**/*"/></zipfileset>
     75                <zipfileset dir="${basedir}/distribution/greenstone3/lib" prefix="lib"><include name="**/*"/></zipfileset>
     76                <zipfileset dir="${basedir}/distribution/greenstone3/web" prefix="web"><include name="**/*"/></zipfileset>
     77                <zipfileset dir="${basedir}/distribution/greenstone3/packages" prefix="packages"><include name="**/*"/></zipfileset>
     78                <zipfileset dir="${basedir}/distribution/greenstone3/resources" prefix="resources"><include name="**/*"/></zipfileset>
     79                <zipfileset dir="${basedir}/distribution/greenstone3/src" prefix="src"><include name="**/*"/></zipfileset>
     80-->
     81
     82            </installer>
     83
     84            <!-- delete the 'bundled java only' lines from the installer config -->
     85            <rsr file="${basedir}/installer/antinstall-config.xml" pattern=".*&lt;!-- bundled java only --&gt;" replacement=""/>
    3486
    3587            <installer file="${basedir}/installer/greenstone3.jar"
     
    4799                <zipfileset dir="${lirk3.home}/ant-scripts/tasks/orans"><include name="RegexSearchReplace.class"/></zipfileset>
    48100
     101<!--
    49102                <zipfileset dir="${basedir}/distribution/greenstone3" includes="*"/>
    50103                <zipfileset dir="${basedir}/distribution/greenstone3/bin" prefix="bin"><include name="**/*"/></zipfileset>
     
    57110                <zipfileset dir="${basedir}/distribution/greenstone3/resources" prefix="resources"><include name="**/*"/></zipfileset>
    58111                <zipfileset dir="${basedir}/distribution/greenstone3/src" prefix="src"><include name="**/*"/></zipfileset>
     112-->
    59113            </installer>
    60114
Note: See TracChangeset for help on using the changeset viewer.