Changeset 16736

Show
Ignore:
Timestamp:
13.08.2008 11:35:05 (11 years ago)
Author:
oranfry
Message:

changes to lirk3 after ant hack cleaned up

Location:
release-kits/lirk3/ant-scripts
Files:
5 modified

Legend:

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

    r16684 r16736  
    2323    <!-- IMPORT OTHER ANT SCRIPTS --> 
    2424    <import file="shared-ant-scripts/init.xml"/> 
    25     <import file="shared-ant-scripts/rk3-targets.xml"/> 
     25    <import file="shared-ant-scripts/operations-on-gli.xml"/> 
     26    <import file="../greenstone3/ant-scripts/rk3-targets.xml"/> 
     27 
    2628    <import file="compile.xml"/> 
    2729    <import file="create-distribution.xml"/> 
  • release-kits/lirk3/ant-scripts/compile.xml

    r16684 r16736  
    99        <!-- preparation --> 
    1010        <antcall target="set-version-number-property" /> 
    11         <antcall target="dist-prepare-unix" /> 
     11        <ant dir="greenstone3" antfile="${lirk3.home}/ant-scripts/operations-on-gs3home.xml" target="prepare-unix"  inheritAll="false"/> 
     12 
    1213        <antcall target="tweak-configure-scripts" /> 
    1314 
    1415        <!-- update --> 
    15         <antcall target="dist-update-unix" /> 
     16        <ant dir="greenstone3" antfile="${lirk3.home}/ant-scripts/operations-on-gs3home.xml" target="update-unix"  inheritAll="false"/> 
    1617 
    1718        <!-- configure --> 
    18         <antcall target="dist-configure-unix" /> 
     19        <antcall target="regenerate-configure"/> 
     20        <ant dir="greenstone3" antfile="${lirk3.home}/ant-scripts/operations-on-gs3home.xml" target="configure-unix" inheritAll="false"/> 
    1921        <antcall target="tweak-makefiles" /> 
    2022 
    2123        <!-- build --> 
    22         <antcall target="dist-build-unix" /> 
     24        <ant dir="greenstone3" antfile="${lirk3.home}/ant-scripts/operations-on-gs3home.xml" target="build-unix" inheritAll="false"/> 
    2325        <antcall target="linux-strip-execs" /> 
    2426 
     
    3840    </target> 
    3941 
    40     <target name="dist-prepare-unix"> 
    41         <ant dir="greenstone3" antfile="${lirk3.home}/ant-scripts/operations-on-gs3home.xml" target="prepare-unix"  inheritAll="false"/> 
    42     </target> 
    4342    <target name="tweak-configure-scripts"> 
    4443        <antcall target="mgpp-add-static" /> 
     
    4746    </target> 
    4847 
    49     <target name="dist-update-unix"> 
    50         <ant dir="greenstone3" antfile="${lirk3.home}/ant-scripts/operations-on-gs3home.xml" target="update-unix"  inheritAll="false"/> 
    51     </target> 
    52  
    53     <target name="dist-configure-unix"> 
     48    <target name="regenerate-configure"> 
    5449        <exec dir="greenstone3/gs2build" executable="autoconf" output="greenstone3/gs2build/configure"> 
    5550            <arg line="configure.in"/> 
    5651        </exec> 
    5752        <chmod file="greenstone3/gs2build/configure" perm="+x"/> 
    58         <ant dir="greenstone3" antfile="${lirk3.home}/ant-scripts/operations-on-gs3home.xml" target="configure-unix" inheritAll="false"/> 
    5953    </target> 
    6054 
     
    6559        <antcall target="rtftohtml-add-static" /> 
    6660        <antcall target="gdbm-add-static" /> 
    67     </target> 
    68  
    69     <target name="dist-build-unix"> 
    70         <ant dir="greenstone3" antfile="${lirk3.home}/ant-scripts/operations-on-gs3home.xml" target="build-unix" inheritAll="false"/> 
    7161    </target> 
    7262 
  • release-kits/lirk3/ant-scripts/create-distribution.xml

    r16684 r16736  
    66        <antcall target="export-greenstone3" /> 
    77        <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" /> 
     8        <antcall target="gli-set-version-numbers"> 
     9            <param name="glibasedir" value="${basedir}/distribution/greenstone3/gli"/> 
     10        </antcall> 
     11 
     12        <!-- create distributions 1, 2 and 3 --> 
     13        <ant antfile="${lirk3.home}/ant-scripts/operations-on-gs3home.xml" dir="distribution/greenstone3" target="create-distribution-1" inheritAll="false"> 
     14            <property name="app.version" value="${version}"/> 
     15            <property name="branch.path" value="${branch.path}"/> 
     16        </ant> 
     17 
     18        <ant antfile="${lirk3.home}/ant-scripts/operations-on-gs3home.xml" dir="distribution/greenstone3" target="create-distribution-2" inheritAll="false"> 
     19            <property name="app.version" value="${version}"/> 
     20            <property name="branch.path" value="${branch.path}"/> 
     21        </ant> 
     22 
     23        <ant antfile="${lirk3.home}/ant-scripts/operations-on-gs3home.xml" dir="distribution/greenstone3" target="create-distribution-3" inheritAll="false"> 
     24            <property name="app.version" value="${version}"/> 
     25            <property name="branch.path" value="${branch.path}"/> 
     26        </ant> 
     27 
    1228        <antcall target="copy-over-build-xml" /> 
    1329        <antcall target="insert-user-manual"/> 
     
    2743    <target name="dist-set-version-number-property"> 
    2844        <rsr file="distribution/greenstone3/resources/java/global.properties.in" pattern="(.*)@gsdl3version@(.*)" replacement="$1${version}$2" /> 
    29     </target> 
    30  
    31     <target name="dist-set-gli-version"> 
    32         <ant antfile="${lirk3.home}/ant-scripts/shared-ant-scripts/operations-on-gli.xml" dir="${basedir}/distribution/greenstone3/gli" target="set-version-numbers"/> 
    33     </target> 
    34  
    35  
    36     <target name="create-distributions-1"> 
    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> 
    41     </target> 
    42  
    43     <target name="create-distributions-2"> 
    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> 
    48     </target> 
    49  
    50     <target name="create-distributions-3"> 
    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> 
    5545    </target> 
    5646 
  • release-kits/lirk3/ant-scripts/create-installer.xml

    r16684 r16736  
    33 
    44    <target name="create-installer"> 
    5         <antcall target="calculate-component-sizes"/> <!-- from rk3-targets --> 
    65        <antcall target="copy-installer-files"/> 
    76        <antcall target="make-installer-files-concrete"/> <!-- from rk3-targets --> 
  • release-kits/lirk3/ant-scripts/operations-on-gs3home.xml

    r16684 r16736  
    11<?xml version="1.0"?> 
    2  
    3 <!-- ======================================================================  
    4      March 2005                                                     
    5  
    6      Greenstone3 build and install script 
    7                     
    8      kjdon                                                                 
    9      ====================================================================== --> 
    10  
    11 <project name="opeations-on-gs3home" default="usage"> 
     2<project name="opeations-on-gs3home"> 
    123   
    134    <!-- include standard build file --> 
     
    4031     
    4132 
     33    <target name="tester-abc"> 
     34        <echo>tester ABC</echo> 
     35    </target> 
    4236 
    4337    <!-- creates the base distribution. Needs binaries copied in to it from other greenstones (prepare-os targets) --> 
    4438    <target name="create-distribution-1" depends="init" description="do all the initial downloading and setting up"> 
    4539 
     40        <echo>checkout gs2build</echo> 
    4641        <antcall target="checkout-gs2build"/> 
     42        <echo>done checking out gs2build</echo> 
     43 
    4744 
    4845        <!--