Changeset 16175

Timestamp:

2008-06-25T13:33:37+12:00 (15 years ago)

Author:

oranfry

Message:

made lirk2 work under the new shared code scheme

Location:

release-kits/lirk2

Files:

• ant-scripts/build.xml (modified) (3 diffs)
• ant-scripts/compile.xml (modified) (3 diffs)
• ant-scripts/create-installer.xml (modified) (5 diffs)
• ant-scripts/init.xml (deleted)
• ant-scripts/wrap.xml (modified) (4 diffs)
• bin/lirk2 (modified) (2 diffs)

release-kits/lirk2/ant-scripts/build.xml

@@ -3 +3 @@
 <!--
         .......................................................... 
-        September 2007
-        Greenstone3 'release maker' script
+        June 2008
+        Linux Release Kit for Greenstone3 (lirk3)
         Oran Fry
         ..........................................................
@@ -11 +11 @@
 <project name="lirk2-build" default="lirk2">
 
-    <import file="init.xml"/>
+    <!-- CONSTANTS -->
 
+    <!-- for the benefit of the shared scripts, set release-kit home -->
+    <property name="rk.home" value="${lirk2.home}" />
+
+    <!-- IMPORT OTHER ANT SCRIPTS -->
+    <import file="shared-ant-scripts/init.xml"/>
     <import file="compile.xml"/>
     <import file="create-distribution.xml"/>
@@ -18 +23 @@
     <import file="wrap.xml"/>
 
+    <!-- THE MAIN TARGET -->
     <target name="lirk2" depends="init">
         <addressedcall target="compile"/>

release-kits/lirk2/ant-scripts/compile.xml

@@ -1 +1 @@
 <?xml version="1.0" encoding="utf-8" ?>
-
-<!--
-        .......................................................... 
-        September 2007
-        Greenstone3 'release maker' script
-        Oran Fry
-        ..........................................................
--->
-
 <project name="lirk2-compile" default="compile">
-
 
     <target name="compile">
@@ -34 +24 @@
 
     </target>
-
-
-    <!--
-
-        second level targets
-
-    -->
 
     <target name="checkout-gsdl-indexers-gli">
@@ -121 +104 @@
     <target name="build-demo-collection">
         <if><bool><istrue value="${execute}"/></bool>
-            <exec dir="${basedir}/gsdl" executable="${lirk2.home}/compile/build-demo.sh"/>
+            <exec dir="${basedir}/gsdl" executable="${lirk2.home}/resources/build-demo.sh"/>
         </if>
     </target>

release-kits/lirk2/ant-scripts/create-installer.xml

@@ -1 +1 @@
 <?xml version="1.0" encoding="utf-8" ?>
-
-<!--
-        .......................................................... 
-        September 2007
-        Greenstone3 'release maker' script
-        Oran Fry
-        ..........................................................
--->
-
 <project name="lirk2-create-installer" default="create-installer">
 
@@ -24 +15 @@
             <copy todir="${basedir}/installer" file="${lirk2.home}/installer/build.xml" overwrite="true"/>
             <copy todir="${basedir}/installer/resources" overwrite="true">
-                <fileset dir="${lirk2.home}/installer/resources">
-                    <include name="*.properties"/>
-                    <include name="*.png"/>
-                </fileset>
+                <fileset dir="${lirk2.home}/greenstone2/installer-resources"/>
             </copy>
 
             <!-- put the concrete values of things in the config -->
             <rsr file="${basedir}/installer/antinstall-config.xml" pattern="@version@" replacement="${version}"/>
-            <rsr file="${basedir}/installer/antinstall-config.xml" pattern="@component.size.java@" replacement="${component.size.java}"/>
+            <rsr file="${basedir}/installer/antinstall-config.xml" pattern="@component.size.java@" replacement="${component.size.linux-java}"/>
             <rsr file="${basedir}/installer/build.xml" pattern="@java.min.version@" replacement="${java.min.version}"/>
-            <rsr file="${basedir}/installer/build.xml" pattern="@java.extracted@" replacement="${java.extracted}"/>
+            <rsr file="${basedir}/installer/build.xml" pattern="@java.extracted@" replacement="${linux-java.extracted}"/>
 
             <!-- put the concrete values of things in the text -->
@@ -40 +28 @@
             <rsr file="${basedir}/installer/resources/LanguagePack.properties" pattern="@version@" replacement="${version}"/>
             <rsr file="${basedir}/installer/resources/LanguagePack.properties" pattern="@java.min.version@" replacement="${java.min.version}"/>
-            <rsr file="${basedir}/installer/resources/LanguagePack.properties" pattern="@bundled.version.java@" replacement="${bundled.version.java}"/>
+            <rsr file="${basedir}/installer/resources/LanguagePack.properties" pattern="@bundled.version.java@" replacement="${bundled.version.linux-java}"/>
 
             <!-- chinese -->
@@ -64 +52 @@
                     installConfig="${basedir}/installer/antinstall-config.xml"
                     buildFile="${basedir}/installer/build.xml"
-                    antInstallLib="${lirk2.home}/bin/ant-installer/lib"
-                    antLib="${lirk2.home}/bin/apache-ant-1.6.5/lib"
+                    antInstallLib="${lirk2.home}/packages/ant-installer/lib"
+                    antLib="${lirk2.home}/packages/ant/lib"
                     validateConfig="true"
                     failOnError="false"
@@ -85 +73 @@
                     installConfig="${basedir}/installer/antinstall-config.xml"
                     buildFile="${basedir}/installer/build.xml"
-                    antInstallLib="${lirk2.home}/bin/ant-installer/lib"
-                    antLib="${lirk2.home}/bin/apache-ant-1.6.5/lib"
+                    antInstallLib="${lirk2.home}/packages/ant-installer/lib"
+                    antLib="${lirk2.home}/packages/ant/lib"
                     validateConfig="true"
                     failOnError="false"

release-kits/lirk2/ant-scripts/wrap.xml

@@ -1 +1 @@
 <?xml version="1.0" encoding="utf-8" ?>
-
-<!--
-        .......................................................... 
-         September 2007
-         Greenstone3 'release maker' script
-         Oran Fry
-        ..........................................................
--->
-
 <project name="lirk2-wrap" default="wrap">
 
@@ -25 +16 @@
 
             <!-- copy bundled files -->
-            <copy todir="${basedir}/wrapped-installer/build" file="${lirk2.home}/search4j/search4j"/>
-            <copy todir="${basedir}/wrapped-installer/build" file="${lirk2.home}/linux/${java.installer}"/>
+            <copy todir="${basedir}/wrapped-installer/build" file="${lirk2.home}/packages/search4j/search4j"/>
+            <copy todir="${basedir}/wrapped-installer/build" file="${lirk2.home}/linux/${linux-java.installer}"/>
             <copy tofile="${basedir}/wrapped-installer/build/greenstone2.jar" file="${basedir}/installer/greenstone-${version}-linux.jar"/>
             <copy tofile="${basedir}/wrapped-installer/build/greenstone2-with-java.jar" file="${basedir}/installer/greenstone-${version}-linux-with-java.jar"/>
 
             <!-- substitute in real values -->
-            <rsr file="${basedir}/wrapped-installer/build/wrapper.cpp" pattern="@java.installer@" replacement="${java.installer}"/>
+            <rsr file="${basedir}/wrapped-installer/build/wrapper.cpp" pattern="@java.installer@" replacement="${linux-java.installer}"/>
             <rsr file="${basedir}/wrapped-installer/build/wrapper.cpp" pattern="@installer.name@" replacement="greenstone2"/>
-            <rsr file="${basedir}/wrapped-installer/build/wrapper.cpp" pattern="@java.extracted@" replacement="${java.extracted}"/>
+            <rsr file="${basedir}/wrapped-installer/build/wrapper.cpp" pattern="@java.extracted@" replacement="${linux-java.extracted}"/>
             <rsr file="${basedir}/wrapped-installer/build/wrapper.cpp" pattern="@java.min.version@" replacement="${java.min.version}"/>
 
@@ -53 +44 @@
             </exec>
             <exec executable="/usr/bin/objcopy" dir="${basedir}/wrapped-installer/build">
-                <arg line="-I binary -O elf32-i386 -B i386 --redefine-sym _binary_${java.installer}_start=java --readonly-text ${java.installer} java.o"/>
+                <arg line="-I binary -O elf32-i386 -B i386 --redefine-sym _binary_${linux-java.installer}_start=java --readonly-text ${linux-java.installer} java.o"/>
             </exec>
 
@@ -69 +60 @@
 
             <!-- get size of java -->
-            <exec executable="ls" dir="${basedir}/wrapped-installer/build" outputproperty="java.ls"><arg line="-l ${java.installer}"/></exec>
+            <exec executable="ls" dir="${basedir}/wrapped-installer/build" outputproperty="java.ls"><arg line="-l ${linux-java.installer}"/></exec>
             <exec executable="sed" inputstring="${java.ls}" outputproperty="java.size"><arg line="-e 's/^[^\ ]*\ *[^\ ]*\ *[^\ ]*\ *[^\ ]*\ *\([0-9]*\).*$/\1/g'"/></exec>
 

release-kits/lirk2/bin/lirk2

@@ -1 +1 @@
 function show_help {
-    echo "LiRK2 - the LInux Release Kit for greenstone3"
+    echo "lirk2 - the LInux Release Kit for greenstone3"
     echo "Helps you to create releases of Greenstone2 from the Repository"
     echo
@@ -29 +29 @@
     CLASSPATH=$CLASSPATH:$file
 done
-for file in $LIRK2_HOME/bin/apache-ant-1.6.5/lib/*.jar; do
+for file in $LIRK2_HOME/packages/ant/lib/*.jar; do
     CLASSPATH=$CLASSPATH:$file
 done
-for file in $LIRK2_HOME/bin/ant-installer/lib/*.jar; do
+for file in $LIRK2_HOME/packages/ant-installer/lib/*.jar; do
     CLASSPATH=$CLASSPATH:$file
 done
-CLASSPATH=$CLASSPATH:$LIRK2_HOME/bin/ant-installer/classes
-
+CLASSPATH=$CLASSPATH:$LIRK2_HOME/packages/ant-installer/classes
 
 #create the command
-toexec="$LIRK2_HOME/bin/apache-ant-1.6.5/bin/ant -lib `pwd`/installer -f $LIRK2_HOME/ant-scripts/build.xml -Dbasedir=`pwd` -Dlirk2.home=$LIRK2_HOME"
+toexec="$LIRK2_HOME/packages/ant/bin/ant -lib `pwd`/installer -f $LIRK2_HOME/ant-scripts/build.xml -Dbasedir=`pwd` -Dlirk2.home=$LIRK2_HOME"
 
 #pass on the arguments