Changeset 16622
- Timestamp:
- 2008-07-31 15:16:45 (5 months ago)
- Files:
-
- release-kits/lirk3/ant-scripts/compile.xml (modified) (6 diffs)
- release-kits/lirk3/ant-scripts/operations-on-gs3home.xml (modified) (3 diffs)
- release-kits/lirk3/bin/lirk3 (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
release-kits/lirk3/ant-scripts/compile.xml
r16172 r16622 52 52 <addressedcall target="mgpp-add-static" /> 53 53 <addressedcall target="mg-add-static" /> 54 <addressedcall target="gs2build extra-add-static" />54 <addressedcall target="gs2build-add-static" /> 55 55 </target> 56 56 … … 62 62 63 63 <target name="dist-configure-unix"> 64 64 65 <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"> 66 67 <arg line="configure.in"/> 67 68 </exec> … … 69 70 <ant dir="greenstone3" antfile="${lirk3.home}/ant-scripts/operations-on-gs3home.xml" target="configure-unix" inheritAll="false"/> 70 71 </if> 72 71 73 </target> 72 74 … … 144 146 <target name="mgpp-add-static"> 145 147 <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"> 148 150 <arg line="configure.in"/> 149 151 </exec> … … 152 154 <target name="mg-add-static"> 153 155 <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"> 156 158 <arg line="configure.in"/> 157 159 </exec> 158 160 </if> 159 161 </target> 160 <target name="gs2build extra-add-static">162 <target name="gs2build-add-static"> 161 163 <if><bool><istrue value="${execute}"/></bool> 162 <rsr file="greenstone3/gs2build/gs2build-extra/packages.configure" pattern="^ENVIRONMENT=""$" replacement="ENVIRONMENT="LDFLAGS=-static"" /> 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=""$" replacement="ENVIRONMENT="LDFLAGS=-static"" /> 165 <rsr file="greenstone3/gs2build/build-src/packages/configure" pattern="^ENVIRONMENT=""$" replacement="ENVIRONMENT="LDFLAGS=-static"" /> 166 <rsr file="greenstone3/gs2build/configure.in" pattern="^LDFLAGS=.*" replacement="LDFLAGS=-static" /> 164 167 </if> 165 168 </target> … … 167 170 <target name="wv-add-static"> 168 171 <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" /> 170 173 </if> 171 174 </target> 172 175 <target name="xlhtml-add-static"> 173 176 <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" /> 175 178 </if> 176 179 </target> 177 180 <target name="ppthtml-add-static"> 178 181 <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" /> 180 183 </if> 181 184 </target> 182 185 <target name="rtftohtml-add-static"> 183 186 <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" /> 185 188 </if> 186 189 </target> release-kits/lirk3/ant-scripts/operations-on-gs3home.xml
r16522 r16622 28 28 <target name="update-unix" depends="init"> 29 29 <antcall target="svnupdate-distribution"/> 30 <antcall target="rename-gs2build-files-unix"/>31 30 <antcall target="delete-windows-files"/> 32 31 </target> … … 56 55 <!--<delete file="${gli.home}/gli.sh"/>--> 57 56 <delete file="${gli.home}/gems.sh"/> 58 <antcall target="rename-gs2build-files-dist"/>59 57 <delete dir="${gs2build.home}/gs2build-extra"/> 60 58 … … 149 147 </target> 150 148 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 157 149 <target name="configure-packages-and-indexers" depends="init"> 158 150 <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 } 1 rk_name="lirk3" 2 rk_fullname="Linux Release Kit for Greenstone3" 3 RK_HOME=$LIRK3_HOME 4 source $LIRK3_HOME/linux/rk 26 5 27 #work out the classpath28 CLASSPATH=$JAVA_HOME/lib/tools.jar29 for file in $LIRK3_HOME/lib/*.jar; do30 CLASSPATH=$CLASSPATH:$file31 done32 for file in $LIRK3_HOME/packages/ant/lib/*.jar; do33 CLASSPATH=$CLASSPATH:$file34 done35 for file in $LIRK3_HOME/packages/ant-installer/lib/*.jar; do36 CLASSPATH=$CLASSPATH:$file37 done38 CLASSPATH=$CLASSPATH:$LIRK3_HOME/packages/ant-installer/classes39 40 41 #create the command42 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 arguments45 while [ "$1" != "" ]; do46 47 if [ "$1" == "-help" ]; then48 show_help49 exit50 51 elif [ "$1" == "-cp" ]; then52 echo $CLASSPATH53 exit54 55 elif [ "$1" == "-sim" ]; then56 toexec="$toexec -Dexecute=false"57 shift58 59 elif [ "$1" == "-descend" ]; then60 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$descend63 shift 264 65 elif [ "$1" == "-from" ]; then66 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$from70 shift 271 72 elif [ "$1" == "-to" ]; then73 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$to77 shift 278 79 80 else81 toexec="$toexec $1"82 shift83 fi84 85 done86 87 #echo $toexec88 6 echo "O---------------------------------------O" 89 7 echo "| |" … … 92 10 echo "| |" 93 11 echo "O---------------------------------------O" 94 echo "Basedir : `pwd`"95 12 13 14 #run the command 96 15 $toexec
