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

Timestamp:

2008-06-11T15:25:31+12:00 (16 years ago)

Author:

oranfry

Message:

first bit of work on lirk2

File:

• release-kits/lirk2/ant-scripts/create-distribution.xml (modified) (1 diff)

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

@@ -9 +9 @@
 -->
 
-<project name="lirk3-create-distribution" default="create-distribution">
+<project name="lirk2-create-distribution" default="create-distribution">
 
 
     <target name="create-distribution">
-        <!-- create distribution -->
-        <addressedcall target="export-greenstone3" />
-        <addressedcall target="dist-set-version-number-property" />
-        <addressedcall target="create-distributions-1" />
-        <addressedcall target="create-distributions-2" />
-        <addressedcall target="create-distributions-3" />
-        <addressedcall target="copy-over-build-xml" />
-        <addressedcall target="insert-user-manual"/>
-        <addressedcall target="insert-compiled-binaries"/>
-    </target>
-
-
-
-    <!--
-
-        second level targets
-
-    -->
-    
-    <target name="export-greenstone3">
-        <if><bool><istrue value="${execute}"/></bool>
-            <mkdir dir="distribution"/>
-            <delete dir="distribution/greenstone3"/>
-            <svn>
-                <export srcurl="${svn.root}/greenstone3/${branch.path}" destPath="distribution/greenstone3"/>
-            </svn>
+        <if><bool><istrue value="${execute}" /></bool>
+            <addressedcall target="export-gsdl-gli-indexers" />
+            <addressedcall target="dist-set-version" />
+            <addressedcall target="compile-gli" />
+            <addressedcall target="create-gli-client-zip" />
+            <addressedcall target="tweak-files" />
         </if>
     </target>
 
-    <target name="dist-set-version-number-property">
+    <target name="export-gsdl-gli-indexers">
         <if><bool><istrue value="${execute}"/></bool>
-            <rsr file="distribution/greenstone3/resources/java/global.properties.in" pattern="(.*)@gsdl3version@(.*)" replacement="$1${version}$2" />
+
+            <mkdir dir="distribution"/>
+            <delete dir="distribution/gsdl"/>
+            <svn>
+                <export srcurl="${svn.root}/gsdl/${branch.path}"        destPath="distribution/gsdl"/>
+            </svn>
+
+            <svn>
+                <export srcurl="${svn.root}/gli/${branch.path}"         destPath="distribution/gsdl/gli"/>
+            </svn>
+
+            <svn>
+                <export srcurl="${svn.root}/indexers/${branch.path}"    destPath="distribution/gsdl/indexers"/>
+            </svn>
+
         </if>
     </target>
 
-    <target name="create-distributions-1">
+    <target name="dist-set-version">
         <if><bool><istrue value="${execute}"/></bool>
-            <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>
+
+            <echo level="info">Setting version in src/lib/gsdlconf.h</echo>
+            <rsr file="${basedir}/gsdl/src/lib/gsdlconf.h" pattern="(#define GSDL_VERSION) &quot;.*&quot;" replacement="$1 &quot;${version}&quot;" />
+
+            <echo level="info">Setting version in Install.sh</echo>
+            <rsr file="${basedir}/gsdl/Install.sh" pattern="(echo &quot;Version: ).*(&quot; .*)" replacement="$1${version}$2" />
+
+            <echo level="info">Setting version in etc/VERSION</echo>
+            <rsr file="${basedir}/gsdl/etc/VERSION" pattern="(gsdl version: ).*" replacement="$1${version}" />
+
         </if>
     </target>
 
-    <target name="create-distributions-2">
+    <target name="compile-gli">
         <if><bool><istrue value="${execute}"/></bool>
-            <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>
+
+            <echo>Compiling gli...</echo>
+            <exec dir="${basedir}/distribution/gsdl/gli" executable="${basedir}/distribution/gsdl/gli/makegli.sh"/>
+
+            <echo>Creating jar...</echo>
+            <exec dir="${basedir}/distribution/gsdl/gli" executable="${basedir}/distribution/gsdl/gli/makejar.sh"/>
+
+            <echo>Cleaning up intermediate files...</echo>
+            <delete dir="${basedir}/distribution/gsdl/gli/jar"/>
+            <delete dir="${basedir}/distribution/gsdl/gli/classes/org"/>
+
+            <echo>Putting gli server jar in a better place</echo>
+            <exec dir="${basedir}/distribution/gsdl" executable="mv" failonerror="true">
+                <arg line="gli/GLIServer.jar bin/java" />
+            </exec>
+
         </if>
     </target>
 
-    <target name="create-distributions-3">
+    <target name="create-gli-client-zip">
         <if><bool><istrue value="${execute}"/></bool>
-            <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>
-        </if>
-    </target>
+            <!--
+            # take a copy of GLI directory
+            &util::cp_r(&util::filename_cat($tmpdir, "gsdl", "gli"), $tmpdir);
 
-    <target name="copy-over-build-xml">
-        <if><bool><istrue value="${execute}"/></bool>
-            <move file="distribution/greenstone3/modified-build.xml" tofile="distribution/greenstone3/build.xml"/>
-        </if>
-    </target>
+            my $client_dirname = "gli-client-" . $version_num;
+            rename ("gli", $client_dirname);
+            chdir(&util::filename_cat($tmpdir, $client_dirname));
 
-    <target name="insert-user-manual">
-        <if><bool><istrue value="${execute}"/></bool>
-            <copy file="greenstone3/gsdl-manuals/manuals/build/en/pdf/User_en.pdf" tofile="distribution/greenstone3/docs/manual/gs2_user_en.pdf"/>
-        </if>
-    </target>
 
-    <target name="insert-compiled-binaries">
-        <if><bool><istrue value="${execute}"/></bool>
+            # delete unnecessary stuff
+            `rm -rf clean.* document.* gems.* gli*.sh gli*.bat make*.sh make*.bat lib src`;
+            # make sure permissions are ok
+            `chmod a+x client-gli.sh client-gli.bat`;
+            chdir($tmpdir);
 
-            <delete dir="distribution/greenstone3/lib/jni"/>
-            <exec executable="cp"><arg line="-r greenstone3/lib/jni distribution/greenstone3/lib"/></exec>
-
-            <delete dir="distribution/greenstone3/gs2build/bin/linux"/>
-            <exec executable="cp"><arg line="-r greenstone3/gs2build/bin/linux distribution/greenstone3/gs2build/bin"/></exec>
-
-            <delete dir="distribution/greenstone3/gs2build/bin/java"/>
-            <exec executable="cp"><arg line="-r greenstone3/gs2build/bin/java distribution/greenstone3/gs2build/bin"/></exec>
+            # zip up the client
+            &zip($client_dirname, $client_dirname, $tmpdir, 1);
+            -->
         </if>
     </target>
 
 
+    <target name="tweak-files">
+        <if><bool><istrue value="${execute}"/></bool>
+
+            <echo level="info">Changing Install.sh to web release</echo>
+            <rsr file="${basedir}/distribution/gsdl/Install.sh" pattern="^(iscdrom=).*" replacement="$1&quot;no&quot;" />
+
+        </if>
+    </target>
+
+    
+