Changeset 23612 for main/trunk/release-kits/kits/rk3

Timestamp:

2011-01-19T14:27:14+13:00 (13 years ago)

Author:

sjm84

Message:

Various fixes and tidying up

Location:

main/trunk/release-kits/kits/rk3/ant-scripts

Files:

• build.xml (modified) (1 diff)
• compile.xml (modified) (1 diff)
• create-components.xml (modified) (1 diff)

main/trunk/release-kits/kits/rk3/ant-scripts/build.xml

@@ -1 +1 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <!--
-        .......................................................... 
+        ..........................................................
         August 2009
         Release Kit for Greenstone3 (rk3)

main/trunk/release-kits/kits/rk3/ant-scripts/compile.xml

@@ -46 +46 @@
                 <isgreaterthan arg1="${branch.tag.version}" arg2="2.83"/>
             </or></bool>
-                <echo>COMPILING GNOME LIB EXTENSION</echo>
+                <echo>EXPORTING GNOME LIB EXTENSION</echo>
                 <exec executable="svn">
-                    <arg value="checkout"/>
-                    <arg value="${svn.root}/gs2-extensions/gnome-lib/trunk/src"/>
-                    <arg value="${basedir}/compiled/ext/gnome-lib"/>
+                    <arg value="export"/>
+                    <arg value="${svn.root}/gs2-extensions/gnome-lib/trunk/gnome-lib-minimal-${os.shell}${extension-x64}.tar.gz"/>
+                    <arg value="${basedir}/compiled/ext/gnome-lib-${os.shell}.tar.gz"/>
                 </exec>
-                <exec executable="/bin/bash" dir="${basedir}/compiled/ext/gnome-lib">
+
+                <exec executable="tar" dir="${basedir}/compiled/ext">
+                    <arg value="xvzf"/>
+                    <arg value="gnome-lib-${os.shell}.tar.gz"/>
+                </exec>
+
+                <exec executable="/bin/bash" dir="${basedir}/compiled/ext/gnome-lib-minimal">
                     <arg value="-c"/>
-                    <arg value="./CASCADE-MAKE.sh"/>
+                    <arg value="source devel.bash"/>
                 </exec>
                 <echo>DONE COMPILING GNOME LIB EXTENSION</echo>

main/trunk/release-kits/kits/rk3/ant-scripts/create-components.xml

@@ -8 +8 @@
 
         <!-- core -->
-        <antcall target="create-component"><param name="component" value="core"/></antcall>
+        <antcall target="create-component">
+            <param name="component" value="core"/>
+            <param name="ext-x64" value=""/>
+        </antcall>
 
         <!-- tomcat -->
-        <antcall target="create-component"><param name="component" value="tomcat"/></antcall>
+        <antcall target="create-component">
+            <param name="component" value="tomcat"/>
+            <param name="ext-x64" value=""/>
+        </antcall>
 
         <!-- imageagick -->
-        <antcall target="create-component"><param name="component" value="imagemagick"/></antcall>
+        <antcall target="create-component">
+            <param name="component" value="imagemagick"/>
+            <param name="ext-x64" value=""/>
+        </antcall>
 
         <!-- (windows and mac only) -->
         <if><bool><or><equals arg1="${rk.os}" arg2="windows"/><equals arg1="${rk.os}" arg2="mac"/></or></bool>
             <!-- ghostscript -->
-            <antcall target="create-component"><param name="component" value="ghostscript"/></antcall>
+            <antcall target="create-component">
+                <param name="component" value="ghostscript"/>
+                <param name="ext-x64" value=""/>
+            </antcall>
         </if>