Changeset 17996 for release-kits/shared

Timestamp:

2008-12-02T11:38:30+13:00 (15 years ago)

Author:

oranfry

Message:

sorting out the binary zip release

Location:

release-kits/shared

Files:

• ant-scripts/init.xml (modified) (1 diff)
• greenstone2/ant-scripts/rk2-targets.xml (modified) (1 diff)
• linux/rk (modified) (1 diff)

release-kits/shared/ant-scripts/init.xml

@@ -379 +379 @@
         <if>
             <bool><equals arg1="zip" arg2="${format}"/></bool>
-            <zip destfile="products/Greenstone-${version}-${os.suffix}-binary.zip" basedir="distributions/web" compress="true"/>
+            <zip destfile="products/Greenstone-${version}-${os.suffix}-binary.zip" basedir="distributions/Greenstone-${version}-${os.suffix}-binary" compress="true"/>
             <else>
                 <exec dir="distributions" executable="tar">
-                    <arg line="-czf ../products/Greenstone-${version}-${os.suffix}-binary.tar.gz web"/>
+                    <arg line="-czf ../products/Greenstone-${version}-${os.suffix}-binary.tar.gz Greenstone-${version}-${os.suffix}-binary"/>
                 </exec>
             </else>

release-kits/shared/greenstone2/ant-scripts/rk2-targets.xml

@@ -38 +38 @@
     </target>
 
+    <target name="create-binary-zip-linux">
+        <property name="binzip.dir" value="distributions/Greenstone-${version}-${os.suffix}-binary"/>
+        <!--
+        <exec dir="${basedir}" executable="cp"><arg line="-r distributions/web ${binzip.dir}"/></exec>
+        <exec dir="${basedir}" executable="cp"><arg line="${binzip.dir}/bin/linux/library distributions/Greenstone-${version}-${os.suffix}-binary/cgi-bin"/></exec>
+        <exec dir="${basedir}" executable="cp"><arg line="${binzip.dir}/bin/linux/oaiserver distributions/Greenstone-${version}-${os.suffix}-binary/cgi-bin"/></exec>
+        -->
+
+        <!-- delete sourcecode -->
+        <delete dir="${binzip.dir}/common-src"/>
+        <delete dir="${binzip.dir}/build-src"/>
+        <delete dir="${binzip.dir}/runtime-src"/>
+
+        <!-- delete loose files -->
+        <delete>
+            <fileset dir="${binzip.dir}" includes="README*.txt,Uninstall.sh,uninst.jar" excludes="READMEen.txt"/>
+        </delete>
+
+    </target>
+
+    <target name="create-binary-zip-windows">
+        <copy todir="distributions/Greenstone-${version}-${os.suffix}-binary">
+            <fileset dir="distributions/web"/>
+        </copy>
+        <copy todir="distributions/Greenstone-${version}-${os.suffix}-binary/cgi-bin">
+            <fileset dir="distributions/Greenstone-${version}-${os.suffix}-binary/bin/${shell.os}">
+                <includes name="library,oaiservr"/>
+            </fileset>
+        </copy>
+        <delete>
+            <fileset dir="distributions/Greenstone-${version}-${os.suffix}-binary">
+                <include name="common-src/**/*"/>
+                <include name="common-src"/>
+                <include name="build-src/**/*"/>
+                <include name="build-src"/>
+                <include name="runtime-src/**/*"/>
+                <include name="runtime-src"/>
+                <include name="README*.txt"/>
+                <exclude name="READMEen.txt"/>
+                <include name="Uninstaller.bat"/>
+                <include name="uninst.bat"/>
+                <include name="uninst.jar"/>
+            </fileset>
+        </delete>
+    </target>
+
 </project>

release-kits/shared/linux/rk

@@ -36 +36 @@
 
 #cd up a level or two if needed
-if [ ! -e "build.properties" ]; then
-    if [ -e "../build.properties" ]; then
+if [ ! -e "$rk_name-build.properties" ]; then
+    if [ -e "../$rk_name-build.properties" ]; then
         RKOLDPWD=`pwd`
         cd ..
-    elif [ -e "../../build.properties" ]; then
+    elif [ -e "../../$rk_name-build.properties" ]; then
         RKOLDPWD=`pwd`
         cd ../..