Changeset 29393 for main/trunk/release-kits

Timestamp:

2014-10-20T20:50:49+13:00 (10 years ago)

Author:

sjm84

Message:

Related to commit 29387. Changes to allow the release-kits to preserve the source code, to better enable debugging of differences in the release-kits. Tested with GS3 on the 32 bit linux: without setting the new KEEP_SRC env var in bin/rk, it still removes the src code as before and produces a binary of the same size as before. With the KEEP_SRC env var set to true in bin/rk, src code (gs2build/common-src, gli/src and GS3/src) is preserved. Untested on Windows or with gs2 since the gs2 binary generation on linux 32 is not working at present.

Location:

main/trunk/release-kits

Files:

• bin/rk (modified) (1 diff)
• kits/rk2/ant-scripts/compile.xml (modified) (3 diffs)
• kits/rk3/ant-scripts/compile.xml (modified) (1 diff)
• shared/core/ant-scripts/shared.xml (modified) (2 diffs)

main/trunk/release-kits/bin/rk

@@ -46 +46 @@
 toexec="ant -lib \"`pwd`/installer/classes\" -f \"$RK_HOME/kits/$rk_name/ant-scripts/build.xml\" \"-Dbasedir=`pwd`\" \"-Drk.home=$RK_HOME\" \"-Drk.name=$rk_name\""
 
+# Generally, an ant property can be true|on|yes vs false|off|no (or left unset)
+# see https://ant.apache.org/manual/properties.html#if+unless
+# However, the release-kit code requires envvar KEEP_SRC to be "true" in order to stop it deleting source code
+#KEEP_SRC=true
+if test -n $KEEP_SRC ; then
+    toexec="$toexec \"-Dkeep.src=$KEEP_SRC\""
+fi
+
 #pass on the arguments
 while [ "$1" != "" ]; do

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

@@ -251 +251 @@
 
         <!-- Delete all but the lib folder and the setup.bash script of the gnome support library -->
-        <if><bool><or><equals arg1="${rk.os}" arg2="mac"/><equals arg1="${rk.os}" arg2="linux"/></or></bool>
+        <if><bool><and>
+          <not><equals arg1="${keep.src}" arg2="true"/></not>
+          <or><equals arg1="${rk.os}" arg2="mac"/><equals arg1="${rk.os}" arg2="linux"/></or>
+        </and></bool>
             <delete dir="${basedir}/compiled/ext/gnome-lib-minimal/${os.shell}/bin"/>
             <delete dir="${basedir}/compiled/ext/gnome-lib-minimal/${os.shell}/include"/>
@@ -308 +311 @@
         </if></else></if>
 
-        <delete dir="compiled/gli/jar"/>
-        <delete dir="compiled/gli/classes/org"/>
+        <if><bool><not><equals arg1="${keep.src}" arg2="true"/></not></bool>
+          <delete dir="compiled/gli/jar"/>
+          <delete dir="compiled/gli/classes/org"/>
+        </if>
         <move file="compiled/gli/GLIServer.jar" todir="compiled/bin/java"/>
 
@@ -316 +321 @@
 
         <!-- delete the source code -->
-        <delete><fileset dir="compiled" includes="Makefile,config.cache,config.h,config.log,stamp-h,config.status"/></delete>
-        <delete dir="compiled/common-src"/>
-        <delete dir="compiled/build-src"/>
-        <delete dir="compiled/runtime-src"/>
-        <delete><fileset dir="compiled" includes="Install.txt,acconfig.h,aclocal.m4,config.guess,config.sub,configtest.pl,configure,configure.in,install-sh,Makefile.in,micotest.cpp,config.h.in,win32.mak,win32cfg.h,lib/**/*.a"/></delete>
+        <if><bool><not><equals arg1="${keep.src}" arg2="true"/></not></bool>        
+          <delete><fileset dir="compiled" includes="Makefile,config.cache,config.h,config.log,stamp-h,config.status"/></delete>
+          <delete dir="compiled/common-src"/>
+          <delete dir="compiled/build-src"/>
+          <delete dir="compiled/runtime-src"/>
+          <delete><fileset dir="compiled" includes="Install.txt,acconfig.h,aclocal.m4,config.guess,config.sub,configtest.pl,configure,configure.in,install-sh,Makefile.in,micotest.cpp,config.h.in,win32.mak,win32cfg.h,lib/**/*.a"/></delete>
+        </if>
 
         <!-- strip .svn working-copy dirs -->

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

@@ -88 +88 @@
             <propertyset refid="forward.properties"/>
             <property name="properties.accepted" value="true"/>
+            <property name="properties.keep.src" value="${keep.src}"/>
         </ant>
 

main/trunk/release-kits/shared/core/ant-scripts/shared.xml

@@ -236 +236 @@
 
     <!-- a target to strip any directory of .svn folders -->
-    <target name="strip-svn-dirs">
+    <target name="strip-svn-dirs" unless="${keep.src}">
         <delete includeemptydirs="true">
             <fileset dir="${dir}" defaultexcludes="false">
@@ -380 +380 @@
 
     <!-- target to tidy gli up for distribution -->
-    <target name="gli-tidy-for-dist">
+    <target name="gli-tidy-for-dist" unless="${keep.src}">
         <!-- delete unneeded things -->
         <delete file="${glibasedir}/.greenstonestore"/>