Changeset 21748 for main/trunk/release-kits/shared/greenstone3

Timestamp:

2010-03-01T15:27:36+13:00 (14 years ago)

Author:

oranfry

Message:

moved binary specific forwarding properties to rk3, and fixed sork3

File:

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

main/trunk/release-kits/shared/greenstone3/ant-scripts/greenstone3-shared.xml

@@ -12 +12 @@
     <property name="version.major" value="3"/>
     <target name="gs3-init">
-
-        <!-- don't let greenstone3 block and wait for user input to accept
-            the properties for the build -->
-        <property name="forward.properties.accepted" value="true"/>
-
-        <!-- make sure all c++ compilation is done statically on linux -->
-        <if><bool><equals arg1="${rk.os}" arg2="linux"/></bool>
-            <property name="forward.compile.static" value="true"/>
-        </if>
 
         <!-- show the property set to be forwarded to greenstone3 -->
@@ -73 +64 @@
 
     </target>
+
+    <target name="persist-forwarded-properties">
+        <echoproperties prefix="forward." destfile="${greenstone3basedir}/forward.properties"/>
+        <replaceregexp file="${greenstone3basedir}/forward.properties" match="forward\.(.*)" replace="\1" byline="true"/>
+        <copy file="${greenstone3basedir}/build.properties.in" tofile="${greenstone3basedir}/build.properties"/>
+        <concat destfile="${greenstone3basedir}/build.properties" append="true" fixlastline="yes">
+            <fileset file="${greenstone3basedir}/forward.properties"/>
+        </concat>
+    </target>
     
-    <!-- unused. this or something similar might need to go back in, to make the forward.properties permanent -->
-    <target name="generate-build-properties">
-        <copy file="${greenstone3.basedir}/build.properties.in" tofile="${greenstone3.basedir}/build.properties"/>
-        <if><bool><istrue value="${install.flax}"/></bool>
-            <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>
-    </target>
-
     <!-- create the property set to be forwarded to greenstone3 -->
     <propertyset id="forward.properties">