Changeset 35682

Timestamp:

2021-10-23T18:47:29+13:00 (2 years ago)

Author:

davidb

Message:

Text/commment/echo/README tidy up

Location:

main/trunk/release-kits

Files:

• README.txt (modified) (2 diffs)
• bin/rk.bat (modified) (1 diff)
• build.xml (modified) (1 diff)
• rk-setup.bash (modified) (2 diffs)

main/trunk/release-kits/README.txt

@@ -22 +22 @@
 
 
+##
 # Getting Ready to use the Release Kit
 
-To use the Release Kit scripts, some source code needs to be compile first:
+It used to be that you needed to compile up the Release Kit to use the
+custom Ant Tasks it relied on.  However as the source code is 100%
+Java, JDK8 compile up jars have been produced and committed, so it now
+can be used immediately after an svn checkout.
 
-  ant compile
+It also used to be left to the developer to set their environment to
+the Release Kit scripts in <rkhome>/bin were found.  This is now
+take care of by:
 
-And the Release Kits 'bin' directory added to your PATH.  
-For Linux, for example:
+  . ./rk-setup.bash   (Unix)
+or
+  rk-setup.bat        (Windows)
 
-  export PATH=$PWD/bin:$PATH
 
-Or for Windows:
-
-  set PATH=%CD%\bin;%PATH%
-
-Finally, for compilation compilation of JNI code in Greenstone3 to be able to
-locate the necessary header files (e.g., jni.h), JAVA_HOME needs to be set,
+For compilation of JNI code in Greenstone3 to be able to locate the
+necessary header files (e.g., jni.h), JAVA_HOME needs to be set.
 
 For example (on Ubuntu-16 32-bit):
@@ -56 +58 @@
   # In the following the redirect character (>) is hard up against the version number
   #   to avoid a space occuring at end of echo of the line output to the property file
+
   echo version:3.11rc> rk3-build.properties
+
+For a Linux 64-bit build, add in:
+
+  echo x64:true>> rk3-build.properties
+  
+
+The kick off the whole process with:
 
   rk3
 
+The end result is an installer for Greenstone in:
 
-More detailed notes at:
+  products
+  
+
+##
+# Updating the Java source code to the Release Kit code base
+
+In the event any changes are made the custom Java based tasks the
+Release Kit provides, then the sequence to regenerate the compiled
+jar files is:
+
+  . ./gs3-setup.bash
+
+  ant compile
+
+  svn commit -m "<message>" \
+    shared/core/ant-tasks/greenstone/anttasks.jar \
+    shared/core/ant-installer/lib/ant-installer.jar \
+    shared/core/ant-installer/lib/ant-installer-ext.jar
+
+
+====
+
+# More detailed notes in general about the Release Kit code at:
 
   http://wiki.greenstone.org/doku.php?id=en:developer:release_kits

main/trunk/release-kits/bin/rk.bat

@@ -9 +9 @@
 set ANT_OPTS=-Xmx1024M
 
-:: set JAVACFLAGS (used in the relevant javac lines in our win32.mak/Makefiles) so that any compiled Java code
-:: is backwards compatible with Java v1.6
-echo ****** Setting JAVACFLAGS in rk.bat
-echo ****** Need to update the script so it is done through rk-setup.bat
-set JAVACFLAGS=-source 1.8 -target 1.8 -bootclasspath "%RK_HOME%\shared\core\java-rt\rt-openjdk8.jar" -extdirs ""
-
-:: 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

main/trunk/release-kits/build.xml

@@ -10 +10 @@
     <property name="compile.javac.flags" value="${env.JAVACFLAGS}"/>
     <else>
-      <property name="compile.javac.flags" value=""/>
-    </else> 
+      <echo>Failed to detect environment variable JAVACFLAGS.</echo>
+      <echo>Have you source gs3-setup.bash (Unix) or gs3-setup.bat (Windows)?</echo>
+      <echo>This is needed to ensure backward compatible Java class files are generated.</echo>
+      <fail/>
+    </else>
   </if>
   

main/trunk/release-kits/rk-setup.bash

@@ -19 +19 @@
 # so that any compiled Java code is backwards compatible with Java v1.8
 
+# To fully support backward compatible compilation need to specfiy
+# -bootclasspath in addition to -source and -target
+
 # Note: Given the way autoconf/configure uses 'eval' to test for
 #       javac, then the usual technique of double-quoting (e.g.) the
@@ -26 +29 @@
 #       is that we need to resort to backlash escaping any spaces
 #       to keep things on track
-
-# Given the way the bootclasspath developed to needing multiple jar
-# files, no longer use RK_HOME_BACKSLASH_ESCAPED.  But the
-# principle still applies
-
-##export RK_HOME_BACKSLASH_ESCAPED=`echo $RK_HOME | sed 's/ /\\\\ /g'`
 
 jrt_home_dir="$RK_HOME/shared/core/java-rt"