Ignore:
Timestamp:
2008-08-13T11:48:29+12:00 (16 years ago)
Author:
oranfry
Message:

changes to wirk3 after ant cleaned up

File:
1 edited

Legend:

Unmodified
Added
Removed
  • release-kits/wirk3/ant-scripts/create-distribution.xml

    r16198 r16748  
    22<project name="wirk3-create-distribution" default="create-distribution">
    33
    4 
    54    <target name="create-distribution">
    65        <!-- create distribution -->
    7         <addressedcall target="export-greenstone3" />
    8         <addressedcall target="dist-set-version-number-property" />
    9         <addressedcall target="create-distributions-1" />
    10         <addressedcall target="create-distributions-2" />
    11         <addressedcall target="create-distributions-3" />
    12         <addressedcall target="copy-over-build-xml" />
    13         <addressedcall target="insert-user-manual"/>
    14         <addressedcall target="insert-compiled-binaries"/>
    15         <addressedcall target="rename-build-xml-for-transit"/>
     6        <antcall target="export-greenstone3" />
     7        <antcall target="gli-set-version-numbers"><param name="glibasedir" value="${basedir}/distribution/greenstone3/gli" />
     8
     9        <ant target="create-distribution-1" antfile="${wirk3.home}/ant-scripts/operations-on-gs3home.xml" dir="distribution/greenstone3" inheritAll="false">
     10            <property name="app.version" value="${version}"/>
     11            <property name="branch.path" value="${branch.path}"/>
     12            <property name="branch.revision" value="${branch.revision}"/>
     13        </ant>
     14        <ant target="create-distribution-2" antfile="${wirk3.home}/ant-scripts/operations-on-gs3home.xml" dir="distribution/greenstone3" inheritAll="false">
     15            <property name="app.version" value="${version}"/>
     16            <property name="branch.path" value="${branch.path}"/>
     17            <property name="branch.revision" value="${branch.revision}"/>
     18        </ant>
     19        <ant target="create-distribution-3" antfile="${wirk3.home}/ant-scripts/operations-on-gs3home.xml" dir="distribution/greenstone3" inheritAll="false">
     20            <property name="app.version" value="${version}"/>
     21            <property name="branch.path" value="${branch.path}"/>
     22            <property name="branch.revision" value="${branch.revision}"/>
     23        </ant>
     24
     25        <antcall target="copy-over-build-xml" />
     26        <antcall target="insert-user-manual"/>
     27        <antcall target="insert-compiled-binaries"/>
     28        <antcall target="rename-build-xml-for-transit"/>
    1629    </target>
    1730
    1831    <target name="export-greenstone3">
    19         <if><bool><istrue value="${execute}"/></bool>
    20             <mkdir dir="distribution"/>
    21             <delete dir="distribution/greenstone3"/>
    22             <svn>
    23                 <export srcurl="${svn.root}/greenstone3/${branch.path}" destPath="distribution/greenstone3" revision="${branch.revision}"/>
    24             </svn>
    25         </if>
     32        <mkdir dir="distribution"/>
     33        <delete dir="distribution/greenstone3"/>
     34        <svn>
     35            <export srcurl="${svn.root}/greenstone3/${branch.path}" destPath="distribution/greenstone3" revision="${branch.revision}"/>
     36        </svn>
    2637    </target>
    2738
    2839    <target name="dist-set-version-number-property">
    29         <if><bool><istrue value="${execute}"/></bool>
    30             <rsr file="distribution/greenstone3/resources/java/global.properties.in" pattern="(.*)@gsdl3version@(.*)" replacement="$1${version}$2" />
    31         </if>
    32     </target>
    33 
    34     <target name="create-distributions-1">
    35         <if><bool><istrue value="${execute}"/></bool>
    36             <ant antfile="${wirk3.home}/ant-scripts/operations-on-gs3home.xml" dir="distribution/greenstone3" target="create-distribution-1" inheritAll="false">
    37                 <property name="app.version" value="${version}"/>
    38                 <property name="branch.path" value="${branch.path}"/>
    39             </ant>
    40         </if>
    41     </target>
    42 
    43     <target name="create-distributions-2">
    44         <if><bool><istrue value="${execute}"/></bool>
    45             <ant antfile="${wirk3.home}/ant-scripts/operations-on-gs3home.xml" dir="distribution/greenstone3" target="create-distribution-2" inheritAll="false">
    46                 <property name="app.version" value="${version}"/>
    47                 <property name="branch.path" value="${branch.path}"/>
    48                 <property name="branch.revision" value="${branch.revision}"/>
    49             </ant>
    50         </if>
    51     </target>
    52 
    53     <target name="create-distributions-3">
    54         <if><bool><istrue value="${execute}"/></bool>
    55             <ant antfile="${wirk3.home}/ant-scripts/operations-on-gs3home.xml" dir="distribution/greenstone3" target="create-distribution-3" inheritall="false">
    56                 <property name="app.version" value="${version}"/>
    57                 <property name="branch.path" value="${branch.path}"/>
    58             </ant>
    59         </if>
     40        <rsr
     41            file="distribution/greenstone3/resources/java/global.properties.in"
     42            pattern="(.*)@gsdl3version@(.*)"
     43            replacement="$1${version}$2" />
    6044    </target>
    6145
     
    6751
    6852    <target name="insert-user-manual">
    69         <if><bool><istrue value="${execute}"/></bool>
    70             <copy file="greenstone3/gsdl-manuals/manuals/build/en/pdf/User_en.pdf" tofile="distribution/greenstone3/docs/manual/gs2_user_en.pdf"/>
    71         </if>
     53        <copy file="greenstone3/gsdl-manuals/manuals/build/en/pdf/User_en.pdf" tofile="distribution/greenstone3/docs/manual/gs2_user_en.pdf"/>
    7254    </target>
    7355
    7456    <target name="insert-compiled-binaries">
    75         <if><bool><istrue value="${execute}"/></bool>
    76            
    77             <delete dir="distribution/greenstone3/lib/jni"/>
    78             <copy todir="distribution/greenstone3/lib/jni"><fileset dir="greenstone3/lib/jni"/></copy>
    79            
    80             <delete dir="distribution/greenstone3/gs2build/bin/windows"/>
    81             <copy todir="distribution/greenstone3/gs2build/bin/windows"><fileset dir="greenstone3/gs2build/bin/windows"/></copy>
    82            
    83             <delete dir="distribution/greenstone3/gs2build/bin/java"/>
    84             <copy todir="distribution/greenstone3/gs2build/bin/java"><fileset dir="greenstone3/gs2build/bin/java"/></copy>
     57        <delete dir="distribution/greenstone3/lib/jni"/>
     58        <copy todir="distribution/greenstone3/lib/jni"><fileset dir="greenstone3/lib/jni"/></copy>
    8559       
    86         </if>
     60        <delete dir="distribution/greenstone3/gs2build/bin/windows"/>
     61        <copy todir="distribution/greenstone3/gs2build/bin/windows"><fileset dir="greenstone3/gs2build/bin/windows"/></copy>
     62       
     63        <delete dir="distribution/greenstone3/gs2build/bin/java"/>
     64        <copy todir="distribution/greenstone3/gs2build/bin/java"><fileset dir="greenstone3/gs2build/bin/java"/></copy>
    8765    </target>
    8866
    8967    <target name="rename-build-xml-for-transit">
    90         <if><bool><istrue value="${execute}"/></bool>
    91             <move file="distribution/greenstone3/build.xml" tofile="distribution/greenstone3/greenstone3-build.xml"/>
    92         </if>
     68        <move
     69            file="distribution/greenstone3/build.xml"
     70            tofile="distribution/greenstone3/greenstone3-build.xml" />
    9371    </target>
    9472
Note: See TracChangeset for help on using the changeset viewer.