Changeset 16175

Timestamp:

2008-06-25 13:33:37 (3 months ago)

Author:

oranfry

Message:

made lirk2 work under the new shared code scheme

Files:

• release-kits/lirk2/ant-scripts/build.xml (modified) (3 diffs)
• release-kits/lirk2/ant-scripts/compile.xml (modified) (3 diffs)
• release-kits/lirk2/ant-scripts/create-installer.xml (modified) (5 diffs)
• release-kits/lirk2/ant-scripts/init.xml (deleted)
• release-kits/lirk2/ant-scripts/wrap.xml (modified) (4 diffs)
• release-kits/lirk2/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>
-compile
+resources
-                </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">
-
-
-
-
+
-                        </copy>
-
-                        <!-- put the concrete values of things in the config -->
-                        <rsr file="${basedir}/installer/antinstall-config.xml" pattern="@version@" replacement="${version}"/>
-
+linux-
-                        <rsr file="${basedir}/installer/build.xml" pattern="@java.min.version@" replacement="${java.min.version}"/>
-
+linux-
-
-                        <!-- 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}"/>
-
+linux-
-
-                        <!-- chinese -->
@@ -64 +52 @@
-                                        installConfig="${basedir}/installer/antinstall-config.xml"
-                                        buildFile="${basedir}/installer/build.xml"
-bin
-bin/apache-ant-1.6.5
+packages
+packages/ant
-                                        validateConfig="true"
-                                        failOnError="false"
@@ -85 +73 @@
-                                        installConfig="${basedir}/installer/antinstall-config.xml"
-                                        buildFile="${basedir}/installer/build.xml"
-bin
-bin/apache-ant-1.6.5
+packages
+packages/ant
-                                        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 -->
-
-
+packages/
+linux-
-                        <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 -->
-
+linux-
-                        <rsr file="${basedir}/wrapped-installer/build/wrapper.cpp" pattern="@installer.name@" replacement="greenstone2"/>
-
+linux-
-                        <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">
-java.installer}_start=java --readonly-text ${
+linux-java.installer}_start=java --readonly-text ${linux-
-                        </exec>
-
@@ -69 +60 @@
-
-                        <!-- get size of java -->
-
+linux-
-                        <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 {
-LiRK
+lirk
-        echo "Helps you to create releases of Greenstone2 from the Repository"
-        echo
@@ -29 +29 @@
-        CLASSPATH=$CLASSPATH:$file
-done
-bin/apache-ant-1.6.5
+packages/ant
-        CLASSPATH=$CLASSPATH:$file
-done
-bin
+packages
-        CLASSPATH=$CLASSPATH:$file
-done
-
-
+
-
-#create the command
-bin/apache-ant-1.6.5
+packages/ant
-
-#pass on the arguments