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-distribution.xml

    r16269 r16684  
    22<project name="lirk3-create-distribution" default="create-distribution">
    33
    4 
    54    <target name="create-distribution">
    6 
    75        <!-- create distribution -->
    8         <addressedcall target="export-greenstone3" />
    9         <addressedcall target="dist-set-version-number-property" />
    10         <addressedcall target="dist-set-gli-version" />
    11         <addressedcall target="create-distributions-1" />
    12         <addressedcall target="create-distributions-2" />
    13         <addressedcall target="create-distributions-3" />
    14         <addressedcall target="copy-over-build-xml" />
    15         <addressedcall target="insert-user-manual"/>
    16         <addressedcall target="insert-compiled-binaries"/>
    17 
     6        <antcall target="export-greenstone3" />
     7        <antcall target="dist-set-version-number-property" />
     8        <antcall target="dist-set-gli-version" />
     9        <antcall target="create-distributions-1" />
     10        <antcall target="create-distributions-2" />
     11        <antcall target="create-distributions-3" />
     12        <antcall target="copy-over-build-xml" />
     13        <antcall target="insert-user-manual"/>
     14        <antcall target="insert-compiled-binaries"/>
     15        <antcall target="rename-build-xml-for-transit"/>
    1816    </target>
    1917
    2018    <target name="export-greenstone3">
    21         <if><bool><istrue value="${execute}"/></bool>
    22             <mkdir dir="distribution"/>
    23             <delete dir="distribution/greenstone3"/>
    24             <svn>
    25                 <export srcurl="${svn.root}/greenstone3/${branch.path}" destPath="distribution/greenstone3"/>
    26                 <export srcurl="${svn.root}/gli/${branch.path}" destPath="distribution/greenstone3/gli"/>
    27             </svn>
    28         </if>
     19        <mkdir dir="distribution"/>
     20        <delete dir="distribution/greenstone3"/>
     21        <svn>
     22            <export srcurl="${svn.root}/greenstone3/${branch.path}" destPath="distribution/greenstone3"/>
     23            <export srcurl="${svn.root}/gli/${branch.path}" destPath="distribution/greenstone3/gli"/>
     24        </svn>
    2925    </target>
    3026
    3127    <target name="dist-set-version-number-property">
    32         <if><bool><istrue value="${execute}"/></bool>
    33             <rsr file="distribution/greenstone3/resources/java/global.properties.in" pattern="(.*)@gsdl3version@(.*)" replacement="$1${version}$2" />
    34         </if>
     28        <rsr file="distribution/greenstone3/resources/java/global.properties.in" pattern="(.*)@gsdl3version@(.*)" replacement="$1${version}$2" />
    3529    </target>
    3630
    3731    <target name="dist-set-gli-version">
    38         <if><bool><istrue value="${execute}"/></bool>
    39             <ant antfile="${lirk3.home}/ant-scripts/shared-ant-scripts/operations-on-gli.xml" dir="${basedir}/distribution/greenstone3/gli" target="set-version-numbers"/>
    40         </if>
     32        <ant antfile="${lirk3.home}/ant-scripts/shared-ant-scripts/operations-on-gli.xml" dir="${basedir}/distribution/greenstone3/gli" target="set-version-numbers"/>
    4133    </target>
    4234
    4335
    4436    <target name="create-distributions-1">
    45         <if><bool><istrue value="${execute}"/></bool>
    46             <ant antfile="${lirk3.home}/ant-scripts/operations-on-gs3home.xml" dir="distribution/greenstone3" target="create-distribution-1" inheritAll="false">
    47                 <property name="app.version" value="${version}"/>
    48                 <property name="branch.path" value="${branch.path}"/>
    49             </ant>
    50         </if>
     37        <ant antfile="${lirk3.home}/ant-scripts/operations-on-gs3home.xml" dir="distribution/greenstone3" target="create-distribution-1" inheritAll="false">
     38            <property name="app.version" value="${version}"/>
     39            <property name="branch.path" value="${branch.path}"/>
     40        </ant>
    5141    </target>
    5242
    5343    <target name="create-distributions-2">
    54         <if><bool><istrue value="${execute}"/></bool>
    55             <ant antfile="${lirk3.home}/ant-scripts/operations-on-gs3home.xml" dir="distribution/greenstone3" target="create-distribution-2"  inheritAll="false">
    56                 <property name="app.version" value="${version}"/>
    57                 <property name="branch.path" value="${branch.path}"/>
    58             </ant>
    59         </if>
     44        <ant antfile="${lirk3.home}/ant-scripts/operations-on-gs3home.xml" dir="distribution/greenstone3" target="create-distribution-2"  inheritAll="false">
     45            <property name="app.version" value="${version}"/>
     46            <property name="branch.path" value="${branch.path}"/>
     47        </ant>
    6048    </target>
    6149
    6250    <target name="create-distributions-3">
    63         <if><bool><istrue value="${execute}"/></bool>
    64             <ant antfile="${lirk3.home}/ant-scripts/operations-on-gs3home.xml" dir="distribution/greenstone3" target="create-distribution-3"  inheritall="false">
    65                 <property name="app.version" value="${version}"/>
    66                 <property name="branch.path" value="${branch.path}"/>
    67             </ant>
    68         </if>
     51        <ant antfile="${lirk3.home}/ant-scripts/operations-on-gs3home.xml" dir="distribution/greenstone3" target="create-distribution-3"  inheritall="false">
     52            <property name="app.version" value="${version}"/>
     53            <property name="branch.path" value="${branch.path}"/>
     54        </ant>
    6955    </target>
    7056
    7157    <target name="copy-over-build-xml">
    72         <if><bool><istrue value="${execute}"/></bool>
    73             <move file="distribution/greenstone3/modified-build.xml" tofile="distribution/greenstone3/build.xml"/>
    74         </if>
     58        <move file="distribution/greenstone3/modified-build.xml" tofile="distribution/greenstone3/build.xml"/>
    7559    </target>
    7660
    7761    <target name="insert-user-manual">
    78         <if><bool><istrue value="${execute}"/></bool>
    79             <copy file="greenstone3/gsdl-manuals/manuals/build/en/pdf/User_en.pdf" tofile="distribution/greenstone3/docs/manual/gs2_user_en.pdf"/>
    80         </if>
     62        <copy file="greenstone3/gsdl-manuals/manuals/build/en/pdf/User_en.pdf" tofile="distribution/greenstone3/docs/manual/gs2_user_en.pdf"/>
    8163    </target>
    8264
    8365    <target name="insert-compiled-binaries">
    84         <if><bool><istrue value="${execute}"/></bool>
     66        <delete dir="distribution/greenstone3/lib/jni"/>
     67        <exec executable="cp"><arg line="-r greenstone3/lib/jni distribution/greenstone3/lib"/></exec>
    8568
    86             <delete dir="distribution/greenstone3/lib/jni"/>
    87             <exec executable="cp"><arg line="-r greenstone3/lib/jni distribution/greenstone3/lib"/></exec>
     69        <delete dir="distribution/greenstone3/gs2build/bin/linux"/>
     70        <exec executable="cp"><arg line="-r greenstone3/gs2build/bin/linux distribution/greenstone3/gs2build/bin"/></exec>
    8871
    89             <delete dir="distribution/greenstone3/gs2build/bin/linux"/>
    90             <exec executable="cp"><arg line="-r greenstone3/gs2build/bin/linux distribution/greenstone3/gs2build/bin"/></exec>
    91 
    92             <delete dir="distribution/greenstone3/gs2build/bin/java"/>
    93             <exec executable="cp"><arg line="-r greenstone3/gs2build/bin/java distribution/greenstone3/gs2build/bin"/></exec>
    94 
    95         </if>
     72        <delete dir="distribution/greenstone3/gs2build/bin/java"/>
     73        <exec executable="cp"><arg line="-r greenstone3/gs2build/bin/java distribution/greenstone3/gs2build/bin"/></exec>
    9674    </target>
    9775
    98 
    99 
     76    <target name="rename-build-xml-for-transit">
     77        <move file="distribution/greenstone3/build.xml" tofile="distribution/greenstone3/greenstone3-build.xml"/>
     78    </target>
    10079
    10180</project>
Note: See TracChangeset for help on using the changeset viewer.