Changeset 16736

Timestamp:

2008-08-13 11:35:05 (5 months ago)

Author:

oranfry

Message:

changes to lirk3 after ant hack cleaned up

Files:

• release-kits/lirk3/ant-scripts/build.xml (modified) (1 diff)
• release-kits/lirk3/ant-scripts/compile.xml (modified) (4 diffs)
• release-kits/lirk3/ant-scripts/create-distribution.xml (modified) (2 diffs)
• release-kits/lirk3/ant-scripts/create-installer.xml (modified) (1 diff)
• release-kits/lirk3/ant-scripts/operations-on-gs3home.xml (modified) (2 diffs)

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

@@ -23 +23 @@
-        <!-- IMPORT OTHER ANT SCRIPTS -->
-        <import file="shared-ant-scripts/init.xml"/>
-
+
+
+
-        <import file="compile.xml"/>
-        <import file="create-distribution.xml"/>

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

@@ -9 +9 @@
-                <!-- preparation -->
-                <antcall target="set-version-number-property" />
-
+
+
-                <antcall target="tweak-configure-scripts" />
-
-                <!-- update -->
-call target="dist-update-unix" 
+ dir="greenstone3" antfile="${lirk3.home}/ant-scripts/operations-on-gs3home.xml" target="update-unix"  inheritAll="false"
-
-                <!-- configure -->
-
+
+
-                <antcall target="tweak-makefiles" />
-
-                <!-- build -->
-call target="dist-build-unix" 
+ dir="greenstone3" antfile="${lirk3.home}/ant-scripts/operations-on-gs3home.xml" target="build-unix" inheritAll="false"
-                <antcall target="linux-strip-execs" />
-
@@ -38 +40 @@
-        </target>
-
-        <target name="dist-prepare-unix">
-                <ant dir="greenstone3" antfile="${lirk3.home}/ant-scripts/operations-on-gs3home.xml" target="prepare-unix"  inheritAll="false"/>
-        </target>
-        <target name="tweak-configure-scripts">
-                <antcall target="mgpp-add-static" />
@@ -47 +46 @@
-        </target>
-
-
-
-
-
-
+
-                <exec dir="greenstone3/gs2build" executable="autoconf" output="greenstone3/gs2build/configure">
-                        <arg line="configure.in"/>
-                </exec>
-                <chmod file="greenstone3/gs2build/configure" perm="+x"/>
-                <ant dir="greenstone3" antfile="${lirk3.home}/ant-scripts/operations-on-gs3home.xml" target="configure-unix" inheritAll="false"/>
-        </target>
-
@@ -65 +59 @@
-                <antcall target="rtftohtml-add-static" />
-                <antcall target="gdbm-add-static" />
-        </target>
-
-        <target name="dist-build-unix">
-                <ant dir="greenstone3" antfile="${lirk3.home}/ant-scripts/operations-on-gs3home.xml" target="build-unix" inheritAll="false"/>
-        </target>
-

release-kits/lirk3/ant-scripts/create-distribution.xml

@@ -6 +6 @@
-                <antcall target="export-greenstone3" />
-                <antcall target="dist-set-version-number-property" />
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                <antcall target="copy-over-build-xml" />
-                <antcall target="insert-user-manual"/>
@@ -27 +43 @@
-        <target name="dist-set-version-number-property">
-                <rsr file="distribution/greenstone3/resources/java/global.properties.in" pattern="(.*)@gsdl3version@(.*)" replacement="$1${version}$2" />
-        </target>
-
-        <target name="dist-set-gli-version">
-                <ant antfile="${lirk3.home}/ant-scripts/shared-ant-scripts/operations-on-gli.xml" dir="${basedir}/distribution/greenstone3/gli" target="set-version-numbers"/>
-        </target>
-
-
-        <target name="create-distributions-1">
-                <ant antfile="${lirk3.home}/ant-scripts/operations-on-gs3home.xml" dir="distribution/greenstone3" target="create-distribution-1" inheritAll="false">
-                        <property name="app.version" value="${version}"/>
-                        <property name="branch.path" value="${branch.path}"/>
-                </ant>
-        </target>
-
-        <target name="create-distributions-2">
-                <ant antfile="${lirk3.home}/ant-scripts/operations-on-gs3home.xml" dir="distribution/greenstone3" target="create-distribution-2"  inheritAll="false">
-                        <property name="app.version" value="${version}"/>
-                        <property name="branch.path" value="${branch.path}"/>
-                </ant>
-        </target>
-
-        <target name="create-distributions-3">
-                <ant antfile="${lirk3.home}/ant-scripts/operations-on-gs3home.xml" dir="distribution/greenstone3" target="create-distribution-3"  inheritall="false">
-                        <property name="app.version" value="${version}"/>
-                        <property name="branch.path" value="${branch.path}"/>
-                </ant>
-        </target>
-

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

@@ -3 +3 @@
-
-        <target name="create-installer">
-                <antcall target="calculate-component-sizes"/> <!-- from rk3-targets -->
-                <antcall target="copy-installer-files"/>
-                <antcall target="make-installer-files-concrete"/> <!-- from rk3-targets -->

release-kits/lirk3/ant-scripts/operations-on-gs3home.xml

@@ -1 +1 @@
-<?xml version="1.0"?>
-
-
-
-
-
-
-
-
-
-
+
-  
-        <!-- include standard build file -->
@@ -40 +31 @@
-    
-
+        <target name="tester-abc">
+                <echo>tester ABC</echo>
+        </target>
-
-        <!-- creates the base distribution. Needs binaries copied in to it from other greenstones (prepare-os targets) -->
-        <target name="create-distribution-1" depends="init" description="do all the initial downloading and setting up">
-
+                <echo>checkout gs2build</echo>
-                <antcall target="checkout-gs2build"/>
+                <echo>done checking out gs2build</echo>
+
-
-                <!--