Changeset 35607 for main

Timestamp:

2021-10-15T12:45:22+13:00 (3 years ago)

Author:

davidb

Message:

Updated to zero in on Java 1.8 as minimum version (gs3-admin/GAI uses Java classes that only became available in v1.8 and upwards. (This was discovered by more carefully controlling rt.jar when compiling in the Release Kits). The other main change in this commit is to use the environment variable VisualStudioVersion to determine which iconv.zip needs to be unzipped and compiled. Some additional targets were also updated to depend on 'needs-gs-devel' to running sub-targets also function correctly in the long-run (even if right now they would work without gs3-devel being sourced/run

File:

• main/trunk/greenstone3/build.xml (modified) (10 diffs)

main/trunk/greenstone3/build.xml

@@ -13 +13 @@
       <echo>os.version: ${os.version}</echo>
   -->
-
+  
   <antversion property="ant.version.running"/>
   <property name="ant.version.minimum" value="1.8.2"/>
@@ -1380 +1380 @@
         <equals arg1="1.2" arg2="${ant.java.version}"/>
         <equals arg1="1.3" arg2="${ant.java.version}"/>
+        <equals arg1="1.4" arg2="${ant.java.version}"/>
+        <equals arg1="1.5" arg2="${ant.java.version}"/>
+        <equals arg1="1.6" arg2="${ant.java.version}"/>
+        <equals arg1="1.7" arg2="${ant.java.version}"/>
       </or>
     </condition>
-    <fail if="java.too.old" message="You need Java 1.4 or greater to run Greenstone 3"/>
+    <fail if="java.too.old" message="You need Java 1.8 or greater to run Greenstone 3"/>
     
     <available file="${basedir}/gli" property="gli.present"/>
@@ -1807 +1811 @@
   </target>
 
-  <target name="compile-web" depends="init,needs-gs3-devel">
+  <target name="compile-web" depends="needs-gs3-devel,init">
     <javac srcdir="${web.classes}"
       destdir="${web.classes}"
@@ -1820 +1824 @@
   </target>
 
-  <target name="compile-classpath-jars" depends="init,needs-gs3-devel">
+  <target name="compile-classpath-jars" depends="needs-gs3-devel,init">
     <if><bool><available file="admin/cp.mf"/></bool>
       <jar destfile="admin/cp.jar" manifest="admin/cp.mf"/>
@@ -3248 +3252 @@
   </target>
 
-  <target name="compile-core" depends="init,needs-gs3-devel" 
+  <target name="compile-core" depends="needs-gs3-devel,init" 
     description="Compile only the Greenstone core">
     <mkdir dir="${build.home}"/>
@@ -3732 +3736 @@
     </exec>
   </target>
-  <target name="compile-common-src" depends="init,needs-gs3-devel">
+  <target name="compile-common-src" depends="needs-gs3-devel,init">
     <!-- unix: -->
     <exec executable="make" os="${os.unix}" dir="${common.src.home}" failonerror="true">
@@ -3775 +3779 @@
     if="collection.building.enabled"/>
 
-  <target name="compile-collection-building" depends="init,needs-gs3-devel,compile-build-src,compile-gli" if="collection.building.enabled"
+  <target name="compile-collection-building" depends="needs-gs3-devel,init,compile-build-src,compile-gli" if="collection.building.enabled"
     description="Compile only the collection building components">
     <!-- make install for common-src -->
@@ -3882 +3886 @@
   </target>
  
-  <target name="compile-gli" depends="init,needs-gs3-devel" if="collection.building.enabled">
+  <target name="compile-gli" depends="needs-gs3-devel,init" if="collection.building.enabled">
     <if><bool><isset property="with.gli.and.gems"/></bool>
       <!-- gli -->
@@ -4237 +4241 @@
       src="${common.src.home}/packages/sqlite/${sqlite.targz.version}"
       dest="${common.src.home}/packages/sqlite"/>
+    <!-- VisualStudioVersion = 16.0 -->
+    <!-- diff unzip when >=14 -->
+
+    <if>
+      <bool>
+    <and>
+      <isset name="${env.VisualStudioVersion}"/>
+      <islessthan arg1="${env.VisualStudioVersion}" arg2="14.0"/>
+    </and>
+      </bool>
+      <echo>Unzipping Pre VS14.0 compatible version of iconv</echo>
+      <unzip src="${common.src.home}/indexers/packages/windows/iconv/iconv-PRE-VS14.zip"
+         dest="${common.src.home}/indexers/packages/windows/iconv"/>
+      <else>
+    <echo>Unzipping VS14.0 Plus compatible version of iconv</echo>
+    <unzip src="${common.src.home}/indexers/packages/windows/iconv/iconv-VS14-PLUS.zip"
+           dest="${common.src.home}/indexers/packages/windows/iconv"/>
+      </else>
+    </if>
+    <!--
     <unzip src="${common.src.home}/indexers/packages/windows/iconv/iconv.zip"
-      dest="${common.src.home}/indexers/packages/windows/iconv"/>
+       dest="${common.src.home}/indexers/packages/windows/iconv"/>
+    -->
   </target>
     
@@ -4298 +4323 @@
 
   <!-- common-src is done separately and needs to be compiled first -->
-  <target name="compile-build-src" depends="init,needs-gs3-devel" if="collection.building.enabled">
+  <target name="compile-build-src" depends="needs-gs3-devel,init" if="collection.building.enabled">
     
     <exec executable="make" dir="${build.src.home}" os="${os.unix}" failonerror="true">