Ignore:
Timestamp:
2008-03-28T12:43:46+13:00 (14 years ago)
Author:
oranfry
Message:

changes to the wrapper and installer logic, and a few changes to init and compile stuff

File:
1 edited

Legend:

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

    r14982 r15142  
    1212
    1313    <target name="create-installer">
     14        <addressedcall target="setup-for-installer-creation"/>
     15        <addressedcall target="compile-installer"/>
     16        <addressedcall target="clean-up-after-installer-creation"/>
     17    </target>
     18
     19    <target name="setup-for-installer-creation">
    1420        <if><bool><istrue value="${execute}"/></bool>
    1521
    16             <echo>Project Path: ${project.path}</echo>
     22            <echo>Project Path: ${basedir}/distribution/greenstone3</echo>
    1723            <mkdir dir="${basedir}/installer"/>
     24            <copy todir="${basedir}/installer" file="${lirk3.home}/installer/antinstall-config.xml"/>
     25            <copy todir="${basedir}/installer" file="${lirk3.home}/installer/build.xml"/>
     26            <rsr file="${basedir}/installer/antinstall-config.xml" pattern="@version@" replacement="${version}"/>
     27            <rsr file="${basedir}/installer/build.xml" pattern="@java.extracted@" replacement="${java.extracted}"/>
     28           
     29        </if>
     30    </target>
     31
     32    <target name="compile-installer">
     33        <if><bool><istrue value="${execute}"/></bool>
     34
    1835            <installer file="${basedir}/installer/greenstone3.jar"
    1936                    compress="true"
    2037                    extractType="NonExtractor"
    21                     installConfig="${project.installer.path}/antinstall-config.xml"
    22                     buildFile="${project.installer.path}/build.xml"
    23                     antInstallLib="${ant.installer.home}/lib"
    24                     antLib="${ant.installer.home}/antlib"
     38                    installConfig="${basedir}/installer/antinstall-config.xml"
     39                    buildFile="${basedir}/installer/build.xml"
     40                    antInstallLib="${lirk3.home}/bin/ant-installer/lib"
     41                    antLib="${lirk3.home}/bin/ant-installer/antlib"
    2542                    validateConfig="true"
    2643                    icons="bluecurve">
    2744
    2845                <!-- copy all the important files into the archive to be extracted for install -->
    29                 <zipfileset dir="${project.installer.path}/cp" includes="resources/*"/>
     46                <zipfileset dir="${lirk3.home}/installer/cp" includes="resources/*"/>
    3047                <zipfileset dir="${lirk3.home}/ant-scripts/tasks/orans"><include name="RegexSearchReplace.class"/></zipfileset>
    3148
    32                 <zipfileset dir="${project.path}" includes="*"/>
    33                 <zipfileset dir="${project.path}/bin" prefix="bin"><include name="**/*"/></zipfileset>
    34                 <zipfileset dir="${project.path}/docs" prefix="docs"><include name="**/*"/></zipfileset>
    35                 <zipfileset dir="${project.path}/gli" prefix="gli"><include name="**/*"/></zipfileset>
    36                 <zipfileset dir="${project.path}/gs2build" prefix="gs2build"><include name="**/*"/></zipfileset>
    37                 <zipfileset dir="${project.path}/lib" prefix="lib"><include name="**/*"/></zipfileset>
    38                 <zipfileset dir="${project.path}/web" prefix="web"><include name="**/*"/></zipfileset>
    39                 <zipfileset dir="${project.path}/packages" prefix="packages"><include name="**/*"/></zipfileset>
    40                 <zipfileset dir="${project.path}/resources" prefix="resources"><include name="**/*"/></zipfileset>
    41                 <zipfileset dir="${project.path}/src" prefix="src"><include name="**/*"/></zipfileset>
     49                <zipfileset dir="${basedir}/distribution/greenstone3" includes="*"/>
     50                <zipfileset dir="${basedir}/distribution/greenstone3/bin" prefix="bin"><include name="**/*"/></zipfileset>
     51                <zipfileset dir="${basedir}/distribution/greenstone3/docs" prefix="docs"><include name="**/*"/></zipfileset>
     52                <zipfileset dir="${basedir}/distribution/greenstone3/gli" prefix="gli"><include name="**/*"/></zipfileset>
     53                <zipfileset dir="${basedir}/distribution/greenstone3/gs2build" prefix="gs2build"><include name="**/*"/></zipfileset>
     54                <zipfileset dir="${basedir}/distribution/greenstone3/lib" prefix="lib"><include name="**/*"/></zipfileset>
     55                <zipfileset dir="${basedir}/distribution/greenstone3/web" prefix="web"><include name="**/*"/></zipfileset>
     56                <zipfileset dir="${basedir}/distribution/greenstone3/packages" prefix="packages"><include name="**/*"/></zipfileset>
     57                <zipfileset dir="${basedir}/distribution/greenstone3/resources" prefix="resources"><include name="**/*"/></zipfileset>
     58                <zipfileset dir="${basedir}/distribution/greenstone3/src" prefix="src"><include name="**/*"/></zipfileset>
    4259            </installer>
    4360
     
    4562    </target>
    4663
     64    <target name="clean-up-after-installer-creation">
     65        <if><bool><istrue value="${execute}"/></bool>
     66            <delete file="${basedir}/installer/antinstall-config.xml"/>
     67            <delete file="${basedir}/installer/build.xml"/>
     68        </if>
     69    </target>
     70
     71
    4772</project>
Note: See TracChangeset for help on using the changeset viewer.