Changeset 37020

Timestamp:

2022-12-12T13:55:38+13:00 (12 months ago)

Author:

anupama

Message:

New ant target unpack-cgimodule called during ant install command, that on a Unix system for perl >= 5.22 will unpack the common-src/cgi-bin/CGIModule.tar.gz into web/WEB-INF/cgi

File:

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

main/trunk/greenstone3/build.xml

@@ -1115 +1115 @@
     
 
-  <target name="install-runtime" depends="init,configure,configure-packages,configure-core,compile-web,compile-packages,compile-core,compile-classpath-jars"
+  <target name="install-runtime" depends="init,configure,configure-packages,configure-core,compile-web,compile-packages,compile-core,compile-classpath-jars,unpack-cgimodule"
     description="Install (configure, compile, install) the runtime system. Needs either common-src or collection-building to have been installed first." />
     
@@ -1955 +1955 @@
   <target name="update-web" depends="init,svnupdate-web,configure-web"
     description="update only the web stuff (config files)"/>
+
+
+  <!--
+      Newer versions of perl need CGI.pm placed in web/WEB-INF/cgi.
+      We have a CGIModule.tar.gz in common-src/cgi-bin, that we can use for linux (unix) systems.
+
+      - from perl5.22, CGI.pm is not included, but GS3 needs it:
+      https://stackoverflow.com/questions/45434990/why-does-this-code-have-issues-with-the-cgi-module
+      - bash line to get perl version: https://www.unix.com/shell-programming-and-scripting/18267-version-perl-installed-my-system.html
+      - run bash command using pipes with ant: https://stackoverflow.com/questions/1187402/ant-run-command-with-pipes
+      - single quotes in XML use &apos; https://stackoverflow.com/questions/7388695/how-can-i-escape-double-quotes-in-ant
+      - islessthan and isgreaterthan ant bool conditionals: https://stackoverflow.com/questions/7616159/apache-ant-less-than
+  -->  
+  <condition property="cgimodule.exists">
+    <and>
+      <available file="${web.home}/WEB-INF/cgi" type="dir"/> <!--Unavailable for custom web.home-->
+      <available file="${web.home}/WEB-INF/cgi/CGI.pm" type="file"/>
+      <available file="${web.home}/WEB-INF/cgi/Fh.pm" type="file"/>
+      <available file="${web.home}/WEB-INF/cgi/CGI" type="dir"/>
+    </and>
+  </condition>
+  
+  <target name="unpack-cgimodule" if="current.os.isunix" unless="cgimodule.exists">
+    <exec executable="bash" outputproperty="perl.major.version">
+      <arg value="-c"/>
+      <arg line='"perl -v | awk &apos;/This/ {print $4}&apos; | sed -e &apos;s/,//&apos;"'/>
+    </exec>
+    <echo>Got perl major version: ${perl.major.version}</echo>
+    <exec executable="bash" outputproperty="perl.min.version">
+      <arg value="-c"/>
+      <arg line='"perl -v | awk &apos;/This/ {print $6}&apos; | sed -e &apos;s/,//&apos;"'/>
+    </exec>
+    <echo>Got perl minor version: ${perl.min.version}</echo>
+
+    <if>
+      <bool>
+    <or>
+      <isgreaterthan arg1="${perl.major.version}" arg2="5"/>
+      <and>
+        <equals arg1="${perl.major.version}" arg2="5" trim="true"/>
+            <islessthan arg1="${perl.minor.version}" arg2="22"/>
+          </and>
+        </or>
+      </bool>    
+    <echo message="Unpacking the CGIModule needed for your perl version: ${perl.major.version}.${perl.min.version}" />
+
+    <untar compression="gzip" 
+       src="${common.src.home}/cgi-bin/CGIModule.tar.gz"
+       dest="${web.home}/WEB-INF/cgi"/>
+    <move todir="${web.home}/WEB-INF/cgi" failonerror="false">
+      <!-- This fileset moves *contents* of directory CGIModule into destination dir web.home -->
+      <fileset dir="${web.home}/WEB-INF/cgi/CGIModule"/>
+    </move>
+    <delete dir="${web.home}/WEB-INF/cgi/CGIModule"/>
+    
+    </if>
+  </target>
 
   <!-- ============ Targets concerned with https certification ================ -->