Changeset 35634

Timestamp:

2021-10-18T22:51:14+13:00 (3 years ago)

Author:

davidb

Message:

To support using a newer JDK (such as OpenJDK11) with the Release Kit code base to generate an installer that operates with the bundled JDK8 then we need to be more careful over the .class files that are compiled up. This is what this set of introduced mods does

Location:

main/trunk

Files:

• ant-tasks/build.xml (modified) (2 diffs)
• release-kits/build.xml (modified) (1 diff)
• release-kits/rk-setup.bash (added)
• release-kits/shared/core/ant-installer/build.xml (modified) (3 diffs)
• release-kits/shared/core/lib/AntelopeTasks_3.4.2.jar (added)

main/trunk/ant-tasks/build.xml

@@ -1 +1 @@
 <project name="compile-ant-tasks" default="compile">
+
+  
 
         <!-- This file originally required the user to specify where to
@@ -20 +22 @@
     </condition>
 
-    <target name="compile" depends="check-libs">
-
-        <mkdir dir="classes"/>
-        <javac
-            srcdir="src/org/greenstone/anttasks"
-            destdir="classes"
-            classpath="${crypt.jar}"/>
-
-        <jar
-            destfile="anttasks.jar"
-            basedir="classes"/>
-
+    <target name="compile" depends="check-libs">      
+      <mkdir dir="classes"/>
+      <javac includeantruntime="true"
+         srcdir="src/org/greenstone/anttasks"
+         destdir="classes"
+         classpath="${crypt.jar}">
+        <compilerarg line="${compile.javac.flags}"/>
+      </javac>
+      
+      <jar destfile="anttasks.jar" basedir="classes"/>
     </target>
 

main/trunk/release-kits/build.xml

@@ -2 +2 @@
 <project name="rk-compilation" default="compile">
 
+  <taskdef name="if" classname="ise.antelope.tasks.IfTask" classpath="${basedir}/shared/core/lib/AntelopeTasks_3.4.2.jar"/>
+
+  <property environment="env"/>
+
+  <if>
+    <bool><isset property="env.JAVACFLAGS"/></bool>
+    <property name="compile.javac.flags" value="${env.JAVACFLAGS}"/>
+    <else>
+      <property name="compile.javac.flags" value=""/>
+    </else> 
+  </if>
+  
     <target name="compile">
-        <ant dir="shared/core/ant-tasks/greenstone" inheritAll="false">
+        <ant dir="shared/core/ant-tasks/greenstone" inheritAll="true">
             <property name="crypt.jar" value="${basedir}/shared/core/lib/crypt.jar"/>
         </ant>
-        <ant dir="shared/core/ant-installer" inheritAll="false">
+        <ant dir="shared/core/ant-installer" inheritAll="true">
             <property name="antlib" value="${ant.home}/lib"/>
         </ant>

main/trunk/release-kits/shared/core/ant-installer/build.xml

@@ -1 +1 @@
 <?xml version="1.0"?>
 <!--
-This is a normal Ant build file to build the release for sourceforge
--->
+  This is a normal Ant build file to build the release for sourceforge
+
+  Subsequently adapted to add in the 'compile.javac.flags' set in
+    the parent Greenstone Release Kit directory above to control
+    the target version of class files produced
+  -->
+
 <project name="Installation Build"  default="build">
 
@@ -111 +116 @@
 
         <echo message="*** Building ant-installer.jar ***"/>
-        <mkdir dir="./lib"/>
-        <javac destdir="${prepareDir}/classes" srcdir="src" classpathref="project.cp" debug="true"/>
+
+    <mkdir dir="./lib"/>
+
+        <javac includeantruntime="false"
+           srcdir="src"
+           destdir="${prepareDir}/classes"
+           classpathref="project.cp"
+           debug="true">
+      <compilerarg line="${compile.javac.flags}"/>
+    </javac>
+    
         <jar file="./lib/ant-installer.jar" whenempty="fail">
             <fileset dir="./src/resources">
@@ -131 +145 @@
         </jar>
     </target>
+    
+    <target name="_ant-installer-ext.jar">
+        <echo message="*** *** Building ant-installer-ext.jar *** *** "/>
+    <echo message="*** ***"/>
+        <mkdir dir="${prepareDir}/classes_ext"/>
 
-    <target name="_ant-installer-ext.jar">
-        <echo message="*** *** Building ant-installer-ext.jar *** *** "/>
-        <echo message="*** ***"/>
-        <mkdir dir="${prepareDir}/classes_ext"/>
-        <javac destdir="${prepareDir}/classes_ext" srcdir="src_ext" classpathref="project.ext.cp" debug="true"/>
-        <jar file="./lib/ant-installer-ext.jar" whenempty="fail">
+        <javac includeantruntime="false"
+           srcdir="src_ext"
+           destdir="${prepareDir}/classes_ext"
+           classpathref="project.ext.cp"
+           debug="true">
+      <compilerarg line="${compile.javac.flags}"/>
+    </javac>
+
+    <jar file="./lib/ant-installer-ext.jar" whenempty="fail">
             <fileset dir="./src/resources">
                 <include name="LICENSE-ant-install.txt"/>