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

Timestamp:

2018-08-14T20:38:17+12:00 (6 years ago)

Author:

ak19

Message:

Tidying up

File:

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

main/trunk/greenstone3/build.xml

@@ -102 +102 @@
   </if>
 
-<!-- Use macrodef task from ant 1.6+ to define a macro https://ant.apache.org/manual/Tasks/macrodef.html -->
-<macrodef name="propertycopy">
-  <attribute name="name"/>
-  <attribute name="from"/>
-  <sequential>
-    <property name="@{name}" value="${@{from}}"/>
-  </sequential>
-</macrodef>
 
   <!-- If internal.tomcat.port not yet set, work it out based on server.protocol 
@@ -153 +145 @@
     </if>
 
+    <!-- 
+     1. Using the macrodef task from ant 1.6+ (https://ant.apache.org/manual/Tasks/macrodef.html)
+     to define "propertycopy" macro that then allows us to use nested variables in build.xml
+     (Is there any way to use nested variables in build.properties?)
+     Defining the propertycopy macro:
+     http://ant.apache.org/faq.html#propertyvalue-as-name-for-property
+    -->
+    <macrodef name="propertycopy">
+      <attribute name="name"/>
+      <attribute name="from"/>
+      <sequential>
+    <property name="@{name}" value="${@{from}}"/>
+      </sequential>
+    </macrodef>
     <!--
-    Now use the macro to use a propertyvalue (server.protocol) as a part of the name for a property
+    2. Now can use the 'propertycopy' macro defined above to allow us to use a property's value
+    (e.g. server.protocol's value) as a part of the name for a property.
     So we want do something like ${tomcat.port.${server.protocol}}, which, if server.protocol=http,
-    we want it to turn into tomcat.port.http. Then we want to use the constructed variable name
-    to assign its value to a new variable. Use as follows:
-    propertycopy name="tomcat.port.protocol" from="tomcat.port.${server.protocol}"
-    http://ant.apache.org/faq.html#propertyvalue-as-name-for-property
+    we'd like it to turn into tomcat.port.http. Then we want to use the constructed variable name
+    to assign its value to a new variable. Use is as follows:
+       propertycopy name="tomcat.port.protocol" from="tomcat.port.${server.protocol}"
     http://ant.1045680.n5.nabble.com/Property-expansion-in-macrodef-attributes-td5476406.html
     -->
     <propertycopy name="internal.tomcat.port" from="tomcat.port.${server.protocol}"/>
     <if>
-      <bool><matches string="${internal.tomcat.port}" pattern="tomcat"/></bool>
+      <bool><matches string="${internal.tomcat.port}" pattern="tomcat\.port"/></bool>
       <fail>...
       ********* ERROR: Unable to set tomcat.port:
@@ -170 +176 @@
       matching tomcat.port.${server.protocol} property line is enabled and set to a valid port number.</fail>
     </if>
-
-    <echo>### PORT PROTOCOL: ${internal.tomcat.port}</echo>
-
 
   <!-- If we got here, we got a valid tomcat port. Set tomcat.port in build.properties
@@ -183 +186 @@
        even though we can write it back out again to build.properties.
   -->
+  <echo>Using tomcat port: ${internal.tomcat.port}</echo>
   <propertyfile file="build.properties">
     <entry key="tomcat.port" value="${internal.tomcat.port}"/>