Changeset 16194 for release-kits/wirk2


Ignore:
Timestamp:
2008-06-26T09:46:52+12:00 (16 years ago)
Author:
oranfry
Message:

fixes to make wirk2 work after moving things around

Location:
release-kits/wirk2/ant-scripts
Files:
2 deleted
5 edited

Legend:

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

    r16087 r16194  
    1111<project name="wirk2-build" default="wirk2">
    1212
    13     <import file="init.xml"/>
     13    <!-- CONSTANTS -->
     14
     15    <!-- create a localised basedir property -->
     16    <path id="basedir.path"><pathelement location="${basedir}"/></path>
     17    <property name="basedir.local" refid="basedir.path"/>
     18
     19    <!-- for the benefit of the shared scripts, set release-kit home -->
     20    <property name="rk.home" value="${lirk2.home}" />
     21
     22
     23    <!-- IMPORT OTHER ANT SCRIPTS -->
     24    <import file="shared-ant-scripts/init.xml"/>
    1425    <import file="compile.xml"/>
    1526    <import file="create-distribution.xml"/>
    1627    <import file="create-installer.xml"/>
    17     <!--<import file="wrap.xml"/>-->
     28    <import file="wrap.xml"/>
    1829
     30    <!-- THE MAIN TARGET -->
    1931    <target name="wirk2" depends="init">
    2032        <addressedcall target="compile"/>
    2133        <addressedcall target="create-distribution"/>
    2234        <addressedcall target="create-installer"/>
    23         <!--<addressedcall target="wrap"/>-->
     35        <addressedcall target="wrap"/>
    2436    </target>
    2537
  • release-kits/wirk2/ant-scripts/compile.xml

    r16087 r16194  
    11<?xml version="1.0" encoding="utf-8" ?>
    22<project name="wirk2-compile" default="compile">
    3 
    43
    54    <target name="compile">
     
    6362    <target name="compile-c-code">
    6463        <if><bool><istrue value="${execute}"/></bool>
    65             <copy file="${wirk2.home}/compile/compile.bat" todir="${basedir}/gsdl" overwrite="true"/>
     64            <copy file="${wirk2.home}/resources/compile.bat" todir="${basedir}/gsdl" overwrite="true"/>
    6665            <exec dir="${basedir}/gsdl" executable="${basedir}/gsdl/compile.bat"/>
    6766           
  • release-kits/wirk2/ant-scripts/create-distribution.xml

    r16087 r16194  
    11<?xml version="1.0" encoding="utf-8" ?>
    2 <project name="wirk3-create-distribution" default="create-distribution">
     2<project name="wirk2-create-distribution" default="create-distribution">
    33
    44    <target name="create-distribution">
  • release-kits/wirk2/ant-scripts/create-installer.xml

    r16087 r16194  
    1010        <if><bool><istrue value="${execute}"/></bool>
    1111           
    12             <mkdir dir="${basedir}/installer"/>
     12            <mkdir dir="${basedir}/installer/classes"/>
    1313            <copy todir="${basedir}/installer" file="${wirk2.home}/installer/antinstall-config.xml"/>
    1414            <copy todir="${basedir}/installer" file="${wirk2.home}/installer/build.xml"/>
    15             <copy todir="${basedir}/installer/resources">
    16                 <fileset dir="${wirk2.home}/installer/resources-windows"/>
    17                 <fileset dir="${wirk2.home}/installer/resources-greenstone2"/>
     15            <copy todir="${basedir}/installer/classes">
     16                <fileset dir="${wirk2.home}/greenstone2/installer-classes"/>
     17                <fileset dir="${wirk2.home}/windows/installer-classes"/>
    1818            </copy>
    1919           
     
    2424            <!-- put the concrete values of things in the text -->
    2525            <!-- default -->
    26             <rsr file="${basedir}/installer/resources/LanguagePack.properties" pattern="@version@" replacement="${version}"/>
    27             <rsr file="${basedir}/installer/resources/LanguagePack.properties" pattern="@java.min.version@" replacement="${java.min.version}"/>
    28             <rsr file="${basedir}/installer/resources/LanguagePack.properties" pattern="@bundled.version.java@" replacement="${bundled.version.java}"/>
    29             <rsr file="${basedir}/installer/resources/LanguagePack.properties" pattern="@bundled.version.tomcat@" replacement="${bundled.version.tomcat}"/>
    30             <rsr file="${basedir}/installer/resources/LanguagePack.properties" pattern="@bundled.version.ant@" replacement="${bundled.version.ant}"/>
     26            <rsr file="${basedir}/installer/classes/resources/LanguagePack.properties" pattern="@version@" replacement="${version}"/>
     27            <rsr file="${basedir}/installer/classes/resources/LanguagePack.properties" pattern="@java.min.version@" replacement="${java.min.version}"/>
     28            <rsr file="${basedir}/installer/classes/resources/LanguagePack.properties" pattern="@bundled.version.java@" replacement="${bundled.version.windows-java}"/>
     29            <rsr file="${basedir}/installer/classes/resources/LanguagePack.properties" pattern="@bundled.version.tomcat@" replacement="${bundled.version.tomcat}"/>
     30            <rsr file="${basedir}/installer/classes/resources/LanguagePack.properties" pattern="@bundled.version.ant@" replacement="${bundled.version.ant}"/>
    3131           
    3232            <!-- chinese -->
    33             <rsr file="${basedir}/installer/resources/LanguagePack_zh_CN.properties" pattern="@version@" replacement="${version}"/>
    34             <rsr file="${basedir}/installer/resources/LanguagePack_zh_CN.properties" pattern="@java.min.version@" replacement="${java.min.version}"/>
    35             <rsr file="${basedir}/installer/resources/LanguagePack_zh_CN.properties" pattern="@bundled.version.java@" replacement="${bundled.version.java}"/>
    36             <rsr file="${basedir}/installer/resources/LanguagePack_zh_CN.properties" pattern="@bundled.version.tomcat@" replacement="${bundled.version.tomcat}"/>
    37             <rsr file="${basedir}/installer/resources/LanguagePack_zh_CN.properties" pattern="@bundled.version.ant@" replacement="${bundled.version.ant}"/>
    38            
     33            <rsr file="${basedir}/installer/classes/resources/LanguagePack_zh_CN.properties" pattern="@version@" replacement="${version}"/>
     34            <rsr file="${basedir}/installer/classes/resources/LanguagePack_zh_CN.properties" pattern="@java.min.version@" replacement="${java.min.version}"/>
     35            <rsr file="${basedir}/installer/classes/resources/LanguagePack_zh_CN.properties" pattern="@bundled.version.java@" replacement="${bundled.version.windows-java}"/>
     36            <rsr file="${basedir}/installer/classes/resources/LanguagePack_zh_CN.properties" pattern="@bundled.version.tomcat@" replacement="${bundled.version.tomcat}"/>
     37            <rsr file="${basedir}/installer/classes/resources/LanguagePack_zh_CN.properties" pattern="@bundled.version.ant@" replacement="${bundled.version.ant}"/>
    3938           
    4039        </if>
     
    4948                installConfig="${basedir}/installer/antinstall-config.xml"
    5049                buildFile="${basedir}/installer/build.xml"
    51                 antInstallLib="${wirk2.home}/bin/ant-installer/lib"
    52                 antLib="${wirk2.home}/bin/apache-ant-1.6.5/lib"
     50                antInstallLib="${wirk2.home}/packages/ant-installer/lib"
     51                antLib="${wirk2.home}/packages/ant/lib"
    5352                validateConfig="true"
    5453                icons="bluecurve">
    5554               
    56                 <zipfileset dir="${basedir}/installer/resources" prefix="resources"><include name="**/*"/></zipfileset>
     55                <zipfileset dir="${basedir}/installer/classes"><include name="**/*"/></zipfileset>
    5756                <zipfileset dir="${wirk2.home}/ant-scripts/tasks/orans"><include name="RegexSearchReplace.class"/></zipfileset>
    5857                <zipfileset dir="${basedir}/distributions/web" includes="**/*"/>
  • release-kits/wirk2/ant-scripts/wrap.xml

    r16087 r16194  
    11<?xml version="1.0" encoding="utf-8" ?>
    2 <project name="wirk3-wrap" default="wrap">
     2<project name="wirk2-wrap" default="wrap">
    33
    44    <target name="wrap">
     
    1919            <!-- copy source files -->
    2020            <copy todir="${basedir}/wrapped-installer/build" file="${wirk2.home}/wrapper/wrapper.cpp"/>
    21             <copy todir="${basedir}/wrapped-installer/build" file="${wirk2.home}/search4j/libsearch4j.cpp"/>
    22             <copy todir="${basedir}/wrapped-installer/build" file="${wirk2.home}/search4j/libsearch4j.h"/>
     21            <copy todir="${basedir}/wrapped-installer/build" file="${wirk2.home}/packages/search4j/libsearch4j.cpp"/>
     22            <copy todir="${basedir}/wrapped-installer/build" file="${wirk2.home}/packages/search4j/libsearch4j.h"/>
    2323       
    2424        </if>
     
    3030            <!-- substitute the real java installer filename and min version into various files -->
    3131            <echo>Substitute concrete values of things into source files</echo>
    32             <rsr file="${basedir}/wrapped-installer/build/wrapper.cpp" pattern="@java.installer@" replacement="${java.installer}"/>
     32            <rsr file="${basedir}/wrapped-installer/build/wrapper.cpp" pattern="@java.installer@" replacement="${windows-java.installer}"/>
    3333            <rsr file="${basedir}/wrapped-installer/build/wrapper.cpp" pattern="@java.min.version@" replacement="${java.min.version}"/>
    34             <rsr file="${basedir}/wrapped-installer/build/wrapper.cpp" pattern="@bundled.version.java@" replacement="${bundled.version.java}"/>
     34            <rsr file="${basedir}/wrapped-installer/build/wrapper.cpp" pattern="@bundled.version.java@" replacement="${bundled.version.windows-java}"/>
    3535           
    3636        </if>
     
    4545                        <uptodate targetfile="${basedir}/wrapped-installer/build/wrapper.RES">
    4646                            <srcfiles dir="${wirk3.home}/icon" includes="gs3.ico"/>
    47                             <srcfiles dir="${wirk3.home}/wrapper" includes="${java.installer}"/>
     47                            <srcfiles dir="${wirk3.home}/wrapper" includes="${windows-java.installer}"/>
    4848                            <srcfiles dir="${wirk3.home}/wrapper" includes="*.bmp"/>
    4949                            <srcfiles dir="${wirk3.home}/wrapper" includes="*.rc"/>
     
    8282                <copy file="${basedir}/wrapped-installer/build/wrapper.rc" tofile="${basedir}/wrapped-installer/build/wrapper-with-jre.rc"/>
    8383               
    84                 <echo>adding ${java.installer} to the copy as chunks</echo>
     84                <echo>adding ${windows-java.installer} to the copy as chunks</echo>
    8585                <rsplit
    86                     resource="${wirk3.home}/wrapper/${java.installer}"
     86                    resource="${wirk3.home}/wrapper/${windows-java.installer}"
    8787                    outputDir="${basedir}/wrapped-installer/build"                 
    8888                    resourceScript="${basedir}/wrapped-installer/build/wrapper-with-jre.rc"
Note: See TracChangeset for help on using the changeset viewer.