Changeset 19666

Timestamp:

2009-05-29T12:21:36+12:00 (14 years ago)

Author:

oranfry

Message:

fixed code to propagate server.default.servlet property

File:

• release-kits/shared/greenstone3/ant-scripts/rk3-targets.xml (modified) (2 diffs)

release-kits/shared/greenstone3/ant-scripts/rk3-targets.xml

@@ -24 +24 @@
         <echo level="info">Install Flax? (install.flax): ${install.flax}</echo>
 
-        <property name="server.default.servlet" value="false"/>
-        <echo level="info">Greenstone3 default servlet? (server.default.servlet): ${server.default.servlet}</echo>
+        <if><bool><isset property="server.default.servlet"/></bool>
+            <echo level="info">default servlet: (server.default.servlet): ${server.default.servlet}</echo>
+        </if>
 
         </target>
@@ -34 +35 @@
             <rsr file="${greenstone3.basedir}/build.properties" pattern="^#install.flax\s*[=:].*" replacement="install.flax=true"/>
         </if>
-        <if><bool><isset property="${server.default.servlet}"/></bool>
-            <rsr file="${greenstone3.basedir}/build.properties" pattern="^#server.default.servlet\s*[=:].*" replacement="server.default.servlet=${server.default.servlet}"/>
+        <if><bool><isset property="server.default.servlet"/></bool>
+            <rsr file="${greenstone3.basedir}/build.properties" pattern="^#?server.default.servlet\s*[=:].*" replacement="server.default.servlet=${server.default.servlet}"/>
         </if>
     </target>