Changeset 18929 for release-kits/lirk2/ant-scripts/create-distribution.xml

Timestamp:

2009-04-09T10:08:46+12:00 (15 years ago)

Author:

oranfry

Message:

changing the way the release kits make the greenstone2 distribution: instead of starting from a fresh export of greenstone, start from a copy of the compiled working copy

File:

• release-kits/lirk2/ant-scripts/create-distribution.xml (modified) (2 diffs)

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

@@ -4 +4 @@
     <target name="create-distribution">
 
-        <antcall target="export-gsdl-gli"><param name="dest" value="distributions/web"/></antcall>
-        <antcall target="drop-in-docs"><param name="gsdl.basedir" value="distributions/web"/></antcall>
-        <antcall target="gsdl-set-version-numbers"><param name="gsdl.basedir" value="${basedir}/distributions/web"/></antcall>
-        <antcall target="gli-set-version-numbers"><param name="glibasedir" value="${basedir}/distributions/web/gli"/></antcall>
+        <antcall target="copy-compiled-to-dist"/> <!-- from init -->
+        <antcall target="dist-clean-sourcecode"/> <!-- from rk2-targets -->
+        <antcall target="dist-unzip-packages"/> <!-- from rk2-targets -->
+        <antcall target="insert-export-to-cd-package"><param name="gsdl.basedir" value="distributions/web"/></antcall> <!-- from rk2-targets -->
         <antcall target="insert-uninstaller"><param name="script-format" value="sh"/></antcall> <!-- from rk2-targets -->
-        <antcall target="dist-unzip-packages"/>
-        <antcall target="drop-in-demo-collection" />
-        <antcall target="insert-export-to-cd-package"><param name="gsdl.basedir" value="distributions/web"/></antcall> <!-- from rk2-targets -->
-        <antcall target="drop-in-binaries" />
-        <antcall target="export-imagemagick-linux-binaries" />
-        <antcall target="export-wvware-linux-binaries" />
-        <antcall target="compile-gli" />
+
+        <antcall target="export-imagemagick-linux-binaries"/>
+        <antcall target="export-wvware-linux-binaries"/>
+        
         <antcall target="remove-unneeded-files" />
+        <antcall target="strip-svn-dirs"><param name="dir" value="${basedir}/distributions/web"/></antcall>
         <antcall target="create-needed-empty-files"><param name="gsdl.basedir" value="distributions/web"/></antcall>
 
@@ -58 +56 @@
     </target>
 
-    <target name="compile-gli">
-        <echo>Compiling gli...</echo>
-        <exec dir="${basedir}/distributions/web/gli" executable="${basedir}/distributions/web/gli/makegli.sh"/>
-
-        <echo>Creating jar...</echo>
-        <exec dir="${basedir}/distributions/web/gli" executable="${basedir}/distributions/web/gli/makejar.sh"/>
-
-        <echo>Cleaning up intermediate files...</echo>
-        <delete dir="${basedir}/distributions/web/gli/jar"/>
-        <delete dir="${basedir}/distributions/web/gli/classes/org"/>
-
-        <echo>Putting gli server jar in a better place</echo>
-        <exec dir="${basedir}/distributions/web" executable="mv" failonerror="true">
-            <arg line="gli/GLIServer.jar bin/java" />
-        </exec>
-    </target>
-
-    <target name="dist-unzip-packages">
-        <untar src="${basedir}/distributions/web/common-src/packages/sqlite/sqlite-amalgamation-3.5.9.tar.gz" dest="${basedir}/distributions/web/common-src/packages/sqlite" compression="gzip"/>
-        <delete file="${basedir}/distributions/web/common-src/packages/sqlite/sqlite-amalgamation-3.5.9.tar.gz"/>
-    </target>
-
-
     <target name="remove-unneeded-files">
+        <delete dir="${basedir}/distributions/web/uninstaller" />
+        <delete dir="${basedir}/distributions/web/autom4te.cache" />
         <delete file="${basedir}/distributions/web/gli/.greenstonestore" />
-        <delete><fileset dir="${basedir}/distributions/web" includes="win32.mak,win32cfg.h,Install.sh,Support.htm"/></delete>
+        <delete><fileset dir="${basedir}/distributions/web" includes="win32.mak,win32cfg.h,Install.sh,Support.htm,micotest.cpp"/></delete>
         <delete file="${basedir}/distributions/web/bin/java/SignedGatherer.jar" />
         <delete><fileset dir="${basedir}/distributions/web/gli" includes="*.bat"/></delete>
         <delete><fileset dir="${basedir}/distributions/web" includes="*.bat"/></delete>
         <delete dir="${basedir}/distributions/web/common-src/packages/windows"/>
+        <delete dir="${basedir}/distributions/web/common-src/indexers/packages/windows"/>
     </target>