Changeset 35317 for main/trunk

Timestamp:

2021-08-21T16:46:31+12:00 (3 years ago)

Author:

davidb

Message:

Updated the version of ant minimum to be 1.8.2. This is to be able to use the 'force=true' attribute in the file <copy> task; also changed some chmod permissions from 644 to 664. This is to make the process of running Greenstone3 as a service (e.g. user=www-data, group=www-data) simplier. If setting things up this way it will also probably help to put the user that is compiling up and installing greenstone in the www-data group also

File:

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

main/trunk/greenstone3/build.xml

@@ -13 +13 @@
       <echo>os.version: ${os.version}</echo>
   -->
-  
-  <antversion property="ant.version.running" />
-  <fail message="Minimum of Ant v1.7.1 required to operate Greenstone3 (detected version ${ant.version.running})">
-    <condition>
-      <not><antversion atleast="1.7.1" /></not>
+
+  <!-- Need to be using ant v1.8.2+ to support the 'force="true"' attribute in the file <copy> flag -->
+  <antversion property="ant.version.running" />  
+  <fail message="Minimum of Ant v1.8.2 required to operate Greenstone3 (detected version ${ant.version.running})">
+    <condition>      
+      <not><antversion atleast="1.8.2" /></not>
     </condition>
   </fail>
@@ -1760 +1761 @@
     <filter token="disable.collection.building" value="${disable.collection.building}"/>
     <copy file="${basedir}/resources/cgi/gsdl3site.cfg.in" tofile="${web.writablehome}/WEB-INF/cgi/gsdl3site.cfg" filtering="true" overwrite="true"/>
-    <copy file="${basedir}/resources/web/global.properties.in" tofile="${web.writableclasses}/global.properties" filtering="true" overwrite="true"/>
-    <copy file="${basedir}/resources/web/log4j.properties.in" tofile="${web.writableclasses}/log4j.properties" filtering="true" overwrite="true"/>
+    <copy file="${basedir}/resources/web/global.properties.in" tofile="${web.writableclasses}/global.properties" filtering="true" overwrite="true" force="true"/>
+    <copy file="${basedir}/resources/web/log4j.properties.in" tofile="${web.writableclasses}/log4j.properties" filtering="true" overwrite="true" force="true"/>
     <if>
       <bool><istrue value="${gsdl3home.isreadonly}"/></bool>
@@ -1767 +1768 @@
       <rsr verbosity="1" file="${web.writableclasses}/global.properties" pattern="^#gsdl3\.(writable{1})?home" replacement="gsdl3.$1home" />
     </if>
-    <chmod file="${web.writableclasses}/global.properties" perm="644"/>
-    <chmod file="${web.writableclasses}/log4j.properties" perm="644"/>
-
-    <copy file="${basedir}/resources/iiif/cantaloupe.properties.in" tofile="${basedir}/cantaloupe.properties" filtering="true" overwrite="true"/>
-    <chmod file="${basedir}/cantaloupe.properties" perm="644"/>
+    <chmod file="${web.writableclasses}/global.properties" perm="664"/>
+    <chmod file="${web.writableclasses}/log4j.properties" perm="664"/>
+
+    <copy file="${basedir}/resources/iiif/cantaloupe.properties.in" tofile="${basedir}/cantaloupe.properties" filtering="true" overwrite="true" force="true"/>
+    <chmod file="${basedir}/cantaloupe.properties" perm="664"/>
   </target>
 
@@ -2438 +2439 @@
     </exec>
 
-    <copy file="${basedir}/ext/solr/solr-tomcat-context.xml.in" tofile="${packages.home}/tomcat/conf/Catalina/localhost/solr.xml" overwrite="true">
+    <copy file="${basedir}/ext/solr/solr-tomcat-context.xml.in" tofile="${packages.home}/tomcat/conf/Catalina/localhost/solr.xml" overwrite="true" force="true">
       <filterset>
     <filter token="solr.context" value="${solr.context}"/>
@@ -2451 +2452 @@
         <copy file="${basedir}/resources/tomcat/greenstone3.xml.in" tofile="${basedir}/resources/tomcat/${greenstone.context}.xml.in" overwrite="true"/>
     </if>
-    <copy file="${basedir}/resources/tomcat/${greenstone.context}.xml.in" tofile="${packages.home}/tomcat/conf/Catalina/localhost/${greenstone.context}.xml" overwrite="true">
+    <copy file="${basedir}/resources/tomcat/${greenstone.context}.xml.in" tofile="${packages.home}/tomcat/conf/Catalina/localhost/${greenstone.context}.xml" overwrite="true" force="true">
       <filterset>
         <filter token="gsdl3webhome" value="${web.home}"/>