Changeset 16622


Ignore:
Timestamp:
07/31/08 15:16:45 (13 years ago)
Author:
oranfry
Message:

changes to lirk3 after gs2build project created in the repository

Location:
release-kits/lirk3
Files:
3 edited

Legend:

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

    r16172 r16622  
    5252        <addressedcall target="mgpp-add-static" />
    5353        <addressedcall target="mg-add-static" />
    54         <addressedcall target="gs2buildextra-add-static" />
     54        <addressedcall target="gs2build-add-static" />
    5555    </target>
    5656
     
    6262
    6363    <target name="dist-configure-unix">
     64
    6465        <if><bool><istrue value="${execute}"/></bool>
    65             <exec dir="greenstone3/gs2build/gs2build-extra" executable="autoconf" output="greenstone3/gs2build/configure">
     66            <exec dir="greenstone3/gs2build" executable="autoconf" output="greenstone3/gs2build/configure">
    6667                <arg line="configure.in"/>
    6768            </exec>
     
    6970            <ant dir="greenstone3" antfile="${lirk3.home}/ant-scripts/operations-on-gs3home.xml" target="configure-unix" inheritAll="false"/>
    7071        </if>
     72
    7173    </target>
    7274
     
    144146    <target name="mgpp-add-static">
    145147        <if><bool><istrue value="${execute}"/></bool>
    146             <rsr file="greenstone3/gs2build/indexers/mgpp/configure.in" pattern="^LDFLAGS=$" replacement="LDFLAGS=-static" />
    147             <exec dir="greenstone3/gs2build/indexers/mgpp" executable="autoconf" output="greenstone3/gs2build/indexers/mgpp/configure">
     148            <rsr file="greenstone3/gs2build/common-src/indexers/mgpp/configure.in" pattern="^LDFLAGS=$" replacement="LDFLAGS=-static" />
     149            <exec dir="greenstone3/gs2build/common-src/indexers/mgpp" executable="autoconf" output="greenstone3/gs2build/common-src/indexers/mgpp/configure">
    148150                <arg line="configure.in"/>
    149151            </exec>
     
    152154    <target name="mg-add-static">
    153155        <if><bool><istrue value="${execute}"/></bool>
    154             <rsr file="greenstone3/gs2build/indexers/mg/configure.in" pattern="^LDFLAGS=$" replacement="LDFLAGS=-static" />
    155             <exec dir="greenstone3/gs2build/indexers/mg" executable="autoconf" output="greenstone3/gs2build/indexers/mg/configure">
     156            <rsr file="greenstone3/gs2build/common-src/indexers/mg/configure.in" pattern="^LDFLAGS=$" replacement="LDFLAGS=-static" />
     157            <exec dir="greenstone3/gs2build/common-src/indexers/mg" executable="autoconf" output="greenstone3/gs2build/common-src/indexers/mg/configure">
    156158                <arg line="configure.in"/>
    157159            </exec>
    158160        </if>
    159161    </target>
    160     <target name="gs2buildextra-add-static">
     162    <target name="gs2build-add-static">
    161163        <if><bool><istrue value="${execute}"/></bool>
    162             <rsr file="greenstone3/gs2build/gs2build-extra/packages.configure" pattern="^ENVIRONMENT=&quot;&quot;$" replacement="ENVIRONMENT=&quot;LDFLAGS=-static&quot;" />
    163             <rsr file="greenstone3/gs2build/gs2build-extra/configure.in" pattern="^LDFLAGS=$" replacement="LDFLAGS=-static" />
     164            <rsr file="greenstone3/gs2build/common-src/packages/configure" pattern="^ENVIRONMENT=&quot;&quot;$" replacement="ENVIRONMENT=&quot;LDFLAGS=-static&quot;" />
     165            <rsr file="greenstone3/gs2build/build-src/packages/configure"  pattern="^ENVIRONMENT=&quot;&quot;$" replacement="ENVIRONMENT=&quot;LDFLAGS=-static&quot;" />
     166            <rsr file="greenstone3/gs2build/configure.in" pattern="^LDFLAGS=.*" replacement="LDFLAGS=-static" />
    164167        </if>
    165168    </target>
     
    167170    <target name="wv-add-static">
    168171        <if><bool><istrue value="${execute}"/></bool>
    169             <rsr file="greenstone3/gs2build/packages/wv/wv-gs/Makefile" pattern="^LDFLAGS =\s*$" replacement="LDFLAGS = -static" />
     172            <rsr file="greenstone3/gs2build/build-src/packages/wv/wv-gs/Makefile" pattern="^LDFLAGS =\s*$" replacement="LDFLAGS = -static" />
    170173        </if>
    171174    </target>
    172175    <target name="xlhtml-add-static">
    173176        <if><bool><istrue value="${execute}"/></bool>
    174             <rsr file="greenstone3/gs2build/packages/xlhtml/xlhtml-0.4.9.0/xlhtml/Makefile" pattern="^LDFLAGS =\s*$" replacement="LDFLAGS = -static" />
     177            <rsr file="greenstone3/gs2build/build-src/packages/xlhtml/xlhtml-0.4.9.0/xlhtml/Makefile" pattern="^LDFLAGS =\s*$" replacement="LDFLAGS = -static" />
    175178        </if>
    176179    </target>
    177180    <target name="ppthtml-add-static">
    178181        <if><bool><istrue value="${execute}"/></bool>
    179             <rsr file="greenstone3/gs2build/packages/xlhtml/xlhtml-0.4.9.0/ppthtml/Makefile" pattern="^LDFLAGS =\s*$" replacement="LDFLAGS = -static" />
     182            <rsr file="greenstone3/gs2build/build-src/packages/xlhtml/xlhtml-0.4.9.0/ppthtml/Makefile" pattern="^LDFLAGS =\s*$" replacement="LDFLAGS = -static" />
    180183        </if>
    181184    </target>
    182185    <target name="rtftohtml-add-static">
    183186        <if><bool><istrue value="${execute}"/></bool>
    184             <rsr file="greenstone3/gs2build/packages/rtftohtml/rtftohtml_src/Makefile" pattern="-o rtftohtml(.{2})EXEEXT(.{1})" replacement="-o rtftohtml$1EXEEXT$2 -static" />
     187            <rsr file="greenstone3/gs2build/build-src/packages/rtftohtml/rtftohtml_src/Makefile" pattern="-o rtftohtml(.{2})EXEEXT(.{1})" replacement="-o rtftohtml$1EXEEXT$2 -static" />
    185188        </if>
    186189    </target>
  • release-kits/lirk3/ant-scripts/operations-on-gs3home.xml

    r16522 r16622  
    2828    <target name="update-unix" depends="init">
    2929        <antcall target="svnupdate-distribution"/>
    30         <antcall target="rename-gs2build-files-unix"/>
    3130        <antcall target="delete-windows-files"/>
    3231    </target>
     
    5655        <!--<delete file="${gli.home}/gli.sh"/>-->
    5756        <delete file="${gli.home}/gems.sh"/>
    58         <antcall target="rename-gs2build-files-dist"/>   
    5957        <delete dir="${gs2build.home}/gs2build-extra"/>
    6058
     
    149147    </target>
    150148 
    151     <target name="rename-gs2build-files-dist" depends="init,rename-gs2build-files-unix">
    152         <copy file="${gs2build-extra.home}/lib.win32.mak" tofile="${gs2build.home}/lib/win32.mak"/>
    153         <copy file="${gs2build-extra.home}/win32.mak" tofile="${gs2build.home}/win32.mak"/>
    154         <copy file="${gs2build-extra.home}/setup.bat" tofile="${gs2build.home}/setup.bat"/>
    155     </target>   
    156 
    157149  <target name="configure-packages-and-indexers" depends="init">
    158150    <exec executable="${indexers.home}/configure"
  • release-kits/lirk3/bin/lirk3

    r16539 r16622  
    1 function show_help {
    2     echo "lirk3 - the LInux Release Kit for greenstone3"
    3     echo "Helps you to create releases of Greenstone3 from the Repository"
    4     echo
    5     echo "usage: lirk3 [-sim] [-from <target>] [other-args]"
    6     echo "  -sim"
    7     echo "      (shortcut for -Dexecute=false)"
    8     echo "      simulation only, don't actually do anything"
    9     echo
    10     echo "  -from <target>"
    11     echo "      (shortcut for -Dresume.from=<target>)"
    12     echo "      start execution from the target with the given target address"
    13     echo "      first level targets can be referred to by name. E.g., -from compile is the same as -from 1"
    14     echo
    15     echo "  -descend <target>"
    16     echo "      (shortcut for -Dresume.descend=<target>)"
    17     echo "      execute only the descendents of the target specified with -from"
    18     echo "      for example, with -descend 3, targets 3.1, 3.2, 3.3 etc. would be executed, but execution
    19     echo "      would stop before target 4
    20     echo
    21     echo "  -cp"
    22     echo "      show the classpath being used by LiRK3"
    23     echo "      (like `ant --diagnostics`)"
    24    
    25 }
     1rk_name="lirk3"
     2rk_fullname="Linux Release Kit for Greenstone3"
     3RK_HOME=$LIRK3_HOME
     4source $LIRK3_HOME/linux/rk
    265
    27 #work out the classpath
    28 CLASSPATH=$JAVA_HOME/lib/tools.jar
    29 for file in $LIRK3_HOME/lib/*.jar; do
    30     CLASSPATH=$CLASSPATH:$file
    31 done
    32 for file in $LIRK3_HOME/packages/ant/lib/*.jar; do
    33     CLASSPATH=$CLASSPATH:$file
    34 done
    35 for file in $LIRK3_HOME/packages/ant-installer/lib/*.jar; do
    36     CLASSPATH=$CLASSPATH:$file
    37 done
    38 CLASSPATH=$CLASSPATH:$LIRK3_HOME/packages/ant-installer/classes
    39 
    40 
    41 #create the command
    42 toexec="$LIRK3_HOME/packages/ant/bin/ant -lib `pwd`/installer/classes -f $LIRK3_HOME/ant-scripts/build.xml -Dbasedir=`pwd` -Dlirk3.home=$LIRK3_HOME"
    43 
    44 #pass on the arguments
    45 while [ "$1" != "" ]; do
    46 
    47     if [ "$1" == "-help" ]; then
    48         show_help
    49         exit
    50 
    51     elif [ "$1" == "-cp" ]; then
    52         echo $CLASSPATH
    53         exit
    54 
    55     elif [ "$1" == "-sim" ]; then
    56         toexec="$toexec -Dexecute=false"
    57         shift
    58 
    59     elif [ "$1" == "-descend" ]; then
    60         toexec="$toexec -Dresume.descend="
    61         descend=`echo $2 | sed 's/compile/1/g' | sed 's/create-distributions/2/g' | sed 's/create-installer/3/g' | sed 's/wrap/4/g'`
    62         toexec=$toexec$descend
    63         shift 2
    64 
    65     elif [ "$1" == "-from" ]; then
    66 
    67         toexec="$toexec -Dresume.from="
    68         from=`echo $2 | sed 's/compile/1/g' | sed 's/create-distributions/2/g' | sed 's/create-installer/3/g' | sed 's/wrap/4/g'`
    69         toexec=$toexec$from
    70         shift 2
    71 
    72     elif [ "$1" == "-to" ]; then
    73 
    74         toexec="$toexec -Dresume.to="
    75         to=`echo $2 | sed 's/compile/1/g' | sed 's/create-distributions/2/g' | sed 's/create-installer/3/g' | sed 's/wrap/4/g'`
    76         toexec=$toexec$to
    77         shift 2
    78 
    79 
    80     else
    81         toexec="$toexec $1"
    82         shift
    83     fi
    84 
    85 done
    86 
    87 #echo $toexec
    886echo "O---------------------------------------O"
    897echo "|                                       |"
     
    9210echo "|                                       |"
    9311echo "O---------------------------------------O"
    94 echo "Basedir  : `pwd`"
    9512
     13
     14#run the command
    9615$toexec
Note: See TracChangeset for help on using the changeset viewer.