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

changes to mark3 after ant cleaned up

File:
1 edited

Legend:

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

    r16655 r16744  
    22<project name="mark3-create-distribution" default="create-distribution">
    33
     4    <target name="create-distribution">
     5        <!-- create distribution -->
     6        <antcall target="export-greenstone3" />
     7        <antcall target="dist-set-version-number-property" />
     8        <antcall target="gli-set-version-numbers"><param name="glibasedir" value="${basedir}/distribution/greenstone3/gli"/></antcall>
    49
    5     <target name="create-distribution">
     10        <ant target="create-distribution-1" antfile="${mark3.home}/ant-scripts/operations-on-gs3home.xml" dir="distribution/greenstone3" inheritAll="false">
     11            <property name="app.version" value="${version}"/>
     12            <property name="branch.path" value="${branch.path}"/>
     13        </ant>
    614
    7         <!-- 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"/>
     15        <ant target="create-distribution-2" antfile="${mark3.home}/ant-scripts/operations-on-gs3home.xml" dir="distribution/greenstone3" inheritAll="false">
     16            <property name="app.version" value="${version}"/>
     17            <property name="branch.path" value="${branch.path}"/>
     18        </ant>
    1719
     20        <ant target="create-distribution-3" antfile="${mark3.home}/ant-scripts/operations-on-gs3home.xml" dir="distribution/greenstone3" inheritAll="false">
     21            <property name="app.version" value="${version}"/>
     22            <property name="branch.path" value="${branch.path}"/>
     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"/>
    1829    </target>
    1930
    2031    <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>
     32        <mkdir dir="distribution"/>
     33        <delete dir="distribution/greenstone3"/>
     34        <svn>
     35            <export srcurl="${svn.root}/greenstone3/${branch.path}" destPath="distribution/greenstone3"/>
     36            <export srcurl="${svn.root}/gli/${branch.path}" destPath="distribution/greenstone3/gli"/>
     37        </svn>
    2938    </target>
    3039
    3140    <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>
     41        <rsr
     42            file="distribution/greenstone3/resources/java/global.properties.in"
     43            pattern="(.*)@gsdl3version@(.*)"
     44            replacement="$1${version}$2" />
    3545    </target>
    3646
    37     <target name="dist-set-gli-version">
    38         <if><bool><istrue value="${execute}"/></bool>
    39             <ant antfile="${mark3.home}/ant-scripts/shared-ant-scripts/operations-on-gli.xml" dir="${basedir}/distribution/greenstone3/gli" target="set-version-numbers"/>
    40         </if>
     47    <target name="copy-over-build-xml">
     48        <move file="distribution/greenstone3/modified-build.xml" tofile="distribution/greenstone3/build.xml"/>
     49    </target>
     50
     51    <target name="insert-user-manual">
     52        <copy file="greenstone3/gsdl-manuals/manuals/build/en/pdf/User_en.pdf" tofile="distribution/greenstone3/docs/manual/gs2_user_en.pdf"/>
     53    </target>
     54
     55    <target name="insert-compiled-binaries">
     56        <delete dir="distribution/greenstone3/lib/jni"/>
     57        <exec executable="cp"><arg line="-r greenstone3/lib/jni distribution/greenstone3/lib"/></exec>
     58
     59        <delete dir="distribution/greenstone3/gs2build/bin/linux"/>
     60        <exec executable="cp"><arg line="-r greenstone3/gs2build/bin/linux distribution/greenstone3/gs2build/bin"/></exec>
     61
     62        <delete dir="distribution/greenstone3/gs2build/bin/java"/>
     63        <exec executable="cp"><arg line="-r greenstone3/gs2build/bin/java distribution/greenstone3/gs2build/bin"/></exec>
     64    </target>
     65
     66    <target name="rename-build-xml-for-transit">
     67        <move file="distribution/greenstone3/build.xml" tofile="distribution/greenstone3/greenstone3-build.xml"/>
    4168    </target>
    4269
    4370
    44     <target name="create-distributions-1">
    45         <if><bool><istrue value="${execute}"/></bool>
    46             <ant antfile="${mark3.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>
    51     </target>
    52 
    53     <target name="create-distributions-2">
    54         <if><bool><istrue value="${execute}"/></bool>
    55             <ant antfile="${mark3.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>
    60     </target>
    61 
    62     <target name="create-distributions-3">
    63         <if><bool><istrue value="${execute}"/></bool>
    64             <ant antfile="${mark3.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>
    69     </target>
    70 
    71     <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>
    75     </target>
    76 
    77     <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>
    81     </target>
    82 
    83     <target name="insert-compiled-binaries">
    84         <if><bool><istrue value="${execute}"/></bool>
    85 
    86             <delete dir="distribution/greenstone3/lib/jni"/>
    87             <exec executable="cp"><arg line="-r greenstone3/lib/jni distribution/greenstone3/lib"/></exec>
    88 
    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>
    96     </target>
    97 
    98 
    99 
    100 
    10171</project>
Note: See TracChangeset for help on using the changeset viewer.