Changeset 35428 for main/trunk

Timestamp:

2021-09-20T10:29:37+12:00 (3 years ago)

Author:

kjdon

Message:

removed some apostrophes from comments to make syntax highlighting in emacs look better. Made the source and target 1.6 values a property, and added them to all javac commands

File:

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

main/trunk/greenstone3/build.xml

@@ -801 +801 @@
   <property name="compile.encoding"    value="UTF8"/>
   <property name="compile.includeantruntime" value="false"/> <!-- to get rid of annoying 'ant' warning -->
-
+  <property name="compile.java.target.version" value="1.6"/> <!-- used in -source and -target options-->
   <!--
 
@@ -1786 +1786 @@
       deprecation="${compile.deprecation}"
       optimize="${compile.optimize}"
-      encoding="${compile.encoding}">
+      encoding="${compile.encoding}"
+      source="${compile.java.target.version}"
+      target="${compile.java.target.version}">
       <classpath><path refid="compile.classpath"/></classpath>
     </javac>
@@ -1839 +1841 @@
       *********************************************************************
       A signed certificate is needed for your GS server to serve pages over https.
-      This target will attempt to obtain a certificate for you from the official and free Certificate Authority Let's Encrypt.
-      However, a certificate can only be obtained if you have admin/sudo permissions on this machine that you're installing Greenstone on.
+      This target will attempt to obtain a certificate for you from the official and free Certificate Authority Lets Encrypt.
+      However, a certificate can only be obtained if you have admin/sudo permissions on this machine that you are installing Greenstone on.
 
       Note that:
-      * if you already have a certificate, then you probably don't want to be running this target but the 'ant renew-existing-https-cert' target instead, to renew your existing certificate.
+      * if you already have a certificate, then you probably do not want to be running this target but the 'ant renew-existing-https-cert' target instead, to renew your existing certificate.
       * if you run this target when you already have a generated certificate, the existing certificate will remain unchanged and the script will terminate with a message alerting you to this fact.
     </echo>
@@ -1860 +1862 @@
         - tomcat.port.https set to a valid port number not yet in use
         - keystore.pass set to a password for the certification process
-    * read the Let's Encrypt Subscriber Agreement at https://letsencrypt.org/repository/
+    * read the Lets Encrypt Subscriber Agreement at https://letsencrypt.org/repository/
       If any of the above is not possible, quit this target. Continue [y/n]?
     </input>
@@ -3183 +3185 @@
       deprecation="${compile.deprecation}"
       optimize="${compile.optimize}"
-      encoding="${compile.encoding}">
+      encoding="${compile.encoding}"
+      source="${compile.java.target.version}"
+      target="${compile.java.target.version}">
       <classpath refid="compile.classpath"/>
       <include name="org/greenstone/gsdl3/${axis.servicesname}${axis.sitename}.java" />
@@ -3230 +3234 @@
            optimize="${compile.optimize}"
            encoding="${compile.encoding}"
-               source="1.6"
-               target="1.6">
-               
+               source="${compile.java.target.version}"
+               target="${compile.java.target.version}">
+          
       <classpath>
             <path refid="compile.classpath"/>
@@ -3245 +3249 @@
          deprecation="${compile.deprecation}"
          optimize="${compile.optimize}"
-         encoding="${compile.encoding}">
+         encoding="${compile.encoding}"
+                 source="${compile.java.target.version}"
+                 target="${compile.java.target.version}">
         <classpath>
               <path refid="compile.classpath"/>
@@ -4560 +4566 @@
                     deprecation="${compile.deprecation}" 
                     optimize="${compile.optimize}"
-                    encoding="${compile.encoding}">
+                    encoding="${compile.encoding}"
+                                        source="${compile.java.target.version}"
+                                        target="${compile.java.target.version}">
+
                     <classpath>
                         <fileset dir="${basedir}/ext/testing/lib/java">