Changeset 35651 for main/trunk/release-kits

Timestamp:

2021-10-20T18:22:58+13:00 (3 years ago)

Author:

davidb

Message:

Need more careful control on how uninstaller Java code is compiled, so it too sticks with the -source -target values to produce a backwards compatible version of the installer

File:

• main/trunk/release-kits/shared/core/ant-scripts/shared.xml (modified) (3 diffs)

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

@@ -2 +2 @@
 <project name="rk-init">
 
+  <taskdef name="if" classname="ise.antelope.tasks.IfTask" classpath="${rk.home}/shared/core/lib/AntelopeTasks_3.4.2.jar"/>
+
     <!-- CHECK PRE-CONDITIONS  -->
     <target name="init">
-      <echo>@@ Shared called</echo>
         <!-- load in static properties from build.properties -->
         <property file="${rk.name}-build.properties" />
@@ -10 +11 @@
         <!-- load environment properties -->
         <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>
+        
         <!-- CLASSPATH -->
         <path id="project.classpath">
@@ -261 +270 @@
         
         <!-- copile to build -->
-        <javac
-            srcdir="${rk.home}/shared/core/uninstaller"
-            destdir="compiled/uninstaller/build" />
+        <javac includeantruntime="false"
+               srcdir="${rk.home}/shared/core/uninstaller"
+               destdir="compiled/uninstaller/build" >
+          <compilerarg line="${compile.javac.flags}"/>
+        </javac>
 
         <!-- copy language bundle into place -->
         <native2ascii
-            implementation="default"
-            src="${rk.home}/shared/core/language-strings"
-            dest="compiled/uninstaller/build/resources"/>
+               implementation="default"
+               src="${rk.home}/shared/core/language-strings"
+               dest="compiled/uninstaller/build/resources"/>
 
         <!-- jar it all up -->
-        <jar
-            destfile="compiled/uninstall/uninst.jar"
-            manifest="${rk.home}/shared/core/uninstaller/manifest.mf"
-            basedir="compiled/uninstaller/build" />
+        <jar   destfile="compiled/uninstall/uninst.jar"
+               manifest="${rk.home}/shared/core/uninstaller/manifest.mf"
+               basedir="compiled/uninstaller/build" />
 
         <!-- clean up build directory -->