Changeset 19600

Timestamp:

2009-05-26T16:05:59+12:00 (15 years ago)

Author:

oranfry

Message:

source release fices

File:

• release-kits/sork2/ant-scripts/build.xml (modified) (3 diffs)

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

@@ -73 +73 @@
     <target name="create-sourcecode">
         <!-- create a directory for the sourcecode -->
-        <mkdir dir="distributions/Greenstone-${version}-source-component"/>
+        <mkdir dir="distributions/source-component"/>
 
         <!-- copy the files in -->
@@ -88 +88 @@
             <arg value="aclocal.m4"/>
             <arg value="config.sub"/>
+            <arg value="config.guess"/>
             <arg value="configtest.pl"/>
             <arg value="configure"/>
@@ -103 +104 @@
 
             <!-- destination -->
-            <arg value="../Greenstone-${version}-source-component"/>
+            <arg value="../source-component"/>
 
         </exec>
 
         <!-- unzip some windows packages -->
-        <unzip src="distributions/Greenstone-${version}-source-component/common-src/indexers/packages/windows/iconv/iconv.zip" dest="distributions/Greenstone-${version}-source-component/common-src/indexers/packages/windows/iconv"/>
-        <delete file="distributions/Greenstone-${version}-source-component/common-src/indexers/packages/windows/iconv/iconv.zip"/>
+        <unzip src="distributions/source-component/common-src/indexers/packages/windows/iconv/iconv.zip" dest="distributions/source-component/common-src/indexers/packages/windows/iconv"/>
+        <delete file="distributions/source-component/common-src/indexers/packages/windows/iconv/iconv.zip"/>
         
-        <unzip src="distributions/Greenstone-${version}-source-component/common-src/packages/windows/crypt/crypt.zip" dest="distributions/Greenstone-${version}-source-component/common-src/packages/windows/crypt"/>
-        <delete file="distributions/Greenstone-${version}-source-component/common-src/packages/windows/crypt/crypt.zip"/>
+        <unzip src="distributions/source-component/common-src/packages/windows/crypt/crypt.zip" dest="distributions/source-component/common-src/packages/windows/crypt"/>
+        <delete file="distributions/source-component/common-src/packages/windows/crypt/crypt.zip"/>
         
-        <unzip src="distributions/Greenstone-${version}-source-component/common-src/packages/windows/expat/expat.zip" dest="distributions/Greenstone-${version}-source-component/common-src/packages/windows/expat"/>
-        <delete file="distributions/Greenstone-${version}-source-component/common-src/packages/windows/expat/expat.zip"/>
+        <unzip src="distributions/source-component/common-src/packages/windows/expat/expat.zip" dest="distributions/source-component/common-src/packages/windows/expat"/>
+        <delete file="distributions/source-component/common-src/packages/windows/expat/expat.zip"/>
         
-        <unzip src="distributions/Greenstone-${version}-source-component/common-src/packages/windows/stlport/stlport.zip" dest="distributions/Greenstone-${version}-source-component/common-src/packages/windows/stlport"/>
-        <delete file="distributions/Greenstone-${version}-source-component/common-src/packages/windows/stlport/stlport.zip"/>
+        <unzip src="distributions/source-component/common-src/packages/windows/stlport/stlport.zip" dest="distributions/source-component/common-src/packages/windows/stlport"/>
+        <delete file="distributions/source-component/common-src/packages/windows/stlport/stlport.zip"/>
 
-        <untar src="distributions/Greenstone-${version}-source-component/common-src/packages/sqlite/sqlite-amalgamation-3.5.9.tar.gz" dest="distributions/Greenstone-${version}-source-component/common-src/packages/sqlite" compression="gzip"/>
-        <delete file="distributions/Greenstone-${version}-source-component/common-src/packages/sqlite/sqlite-amalgamation-3.5.9.tar.gz"/>
+        <exec executable="tar" dir="distributions/source-component/common-src/packages/sqlite"><arg value="-xzf"/><arg value="sqlite-amalgamation-3.5.9.tar.gz"/></exec>
+        <delete file="distributions/source-component/common-src/packages/sqlite/sqlite-amalgamation-3.5.9.tar.gz"/>
+
+        <exec executable="tar" dir="distributions/source-component/common-src/packages/expat"><arg value="-xzf"/><arg value="expat-1.95.8.tar.gz"/></exec>
+        <delete file="distributions/source-component/common-src/packages/sqlite/sqlite-amalgamation-3.5.9.tar.gz"/>
 
         <!-- archive it -->
         <delete file="products/Greenstone-${version}-source-component.zip"/>
-        <zip destfile="products/Greenstone-${version}-source-component.zip"  basedir="distributions" includes="Greenstone-${version}-source-component/**/*"/>
-        <exec dir="distributions" executable="tar">
-            <arg line="-czf ../products/Greenstone-${version}-source-component.tar.gz Greenstone-${version}-source-component"/>
+        <zip destfile="products/Greenstone-${version}-source-component.zip" basedir="distributions/source-component" includes="**/*"/>
+        <exec dir="distributions/source-component" executable="bash">
+            <arg value="-c"/>
+            <arg value="tar -czf ../../products/Greenstone-${version}-source-component.tar.gz *"/>
         </exec>
     </target>