Changeset 38893 for main/trunk

Timestamp:

2024-04-04T10:39:56+13:00 (2 months ago)

Author:

kjdon

Message:

I got tired of being tripped up time and again when running ant install without JAVA_HOME set. added check-java-home target, and call this for prepare and install targets.

File:

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

main/trunk/greenstone3/build.xml

@@ -829 +829 @@
 
   
-
-  <target name="test-setup" depends="needs-gs3-setup">
+  <target name="check-java-home">
+    <property environment="envi"/>
+    <echo>using JAVA_HOME : ${envi.JAVA_HOME}</echo>
+
+    <condition property="java.home.set">
+        <isset property="envi.JAVA_HOME"/>
+    </condition>
+    <fail unless="java.home.set" message="Please make sure your JAVA_HOME is set to the installation of a JDK 1.8 or later"/>
+  </target>
+  <target name="test-setup" depends="needs-gs3-setup, check-java-home">
+    
     <echo>ant.version   = ${ant.version}</echo>
     <echo>java.version  = ${java.specification.version} (specification version)</echo>
@@ -843 +852 @@
     <echo>env.Path     : ${env.Path}</echo> 
     <echo>env.GSDLOS   : ${env.GSDLOS}</echo>
+    
   </target>
 
@@ -1131 +1141 @@
   <!-- ==================== Primary and Global Targets ============================= -->
 
-  <target name="prepare" depends="accept-properties,init,copy-dot-svn-files,prepare-core,prepare-packages,prepare-wget-for-windows,prepare-common-src,prepare-collection-building,prepare-tomcat,prepare-axis,prepare-web,prepare-collections, prepare-flax,prepare-binaries"
+  <target name="prepare" depends="check-java-home,accept-properties,init,copy-dot-svn-files,prepare-core,prepare-packages,prepare-wget-for-windows,prepare-common-src,prepare-collection-building,prepare-tomcat,prepare-axis,prepare-web,prepare-collections, prepare-flax,prepare-binaries"
     description="Use this when you first checkout the code: 'ant prepare install'. This will do some additional subversion checkouts and downloads, so you need to be online to run this.">
 
@@ -1145 +1155 @@
   <!-- install-common-src and install-collection-building are mutually exclusive and either one or the other will be done depending on whether collection building is enabled or not -->
   <!--before configuring build-src, make sure that gnome-lib is compiled up-->
-  <target name="install" depends="init,compile-imagemagick,compile-gnome-lib,install-common-src,install-collection-building,install-runtime,install-solr-ext,install-webswing-ext,install-gli-for-webswing,install-usersDB,setup-for-eclipse"
+  <target name="install" depends="check-java-home,init,compile-imagemagick,compile-gnome-lib,install-common-src,install-collection-building,install-runtime,install-solr-ext,install-webswing-ext,install-gli-for-webswing,install-usersDB,setup-for-eclipse"
     description="Install Greenstone 3. Use this when you first checkout the code: 'ant prepare new-install'.">
     <echo>After successful installation, you can turn on https support on Windows and Linux</echo>
@@ -1554 +1564 @@
   <!-- this sets up some initial properties -->
   <target name="init">
-    
+
     <condition property="java.too.old">
       <or>
@@ -3808 +3818 @@
   </target>
   
-  <target name="compile-packages" description="Compile only the source packages">
+  <target name="compile-packages" depends="init" description="Compile only the source packages">
+    <!-- Search4j -->
+    <antcall target="compile-search4j"/>
     <!-- javagdbm -->
     <antcall target="compile-javagdbm"/>
-    <!-- Search4j -->
-    <antcall target="compile-search4j"/>
   </target>