Changeset 32421 for main/trunk/greenstone3/build.xml

Timestamp:

2018-09-03T16:50:23+12:00 (6 years ago)

Author:

ak19

Message:

1. build.xml now determines the bitness of a Windows OS so it can use the correct ZeroSSL binary when obtaining an https certificate; 2. Tested out getting a test certificate.

File:

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

main/trunk/greenstone3/build.xml

@@ -290 +290 @@
             <isfalse value="${https.test.mode}"/>
         </condition>
+        <!-- Set bitness of windows OS, so we can use it for the zeroSSL executable.
+            The Java system property os.arch will return x86 for 32 bit and AMD64 (or x64) for 64 bit OS.
+            See https://stackoverflow.com/questions/20856694/how-to-find-the-os-bit-type -->
+        <condition property="os.bitness" value="64" else="32">
+            <matches string="${os.arch}" pattern="64"/>
+        </condition>         
     </if>
 
@@ -1788 +1794 @@
     <exec executable="cmd" osfamily="windows" dir="${basedir}/bin/${os.bin.dir}" spawn="false">
       <arg value="/c" />
-      <arg value="le64" />
+      <arg value="le${os.bitness}" />
       <arg value="--key" /><arg value="${packages.home}\tomcat\conf\https_cert\privkey.key" />
       <arg value="--csr" /><arg value="${packages.home}\tomcat\conf\https_cert\${tomcat.server}.csr" />