Changeset 21748

Timestamp:

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

Author:

oranfry

Message:

moved binary specific forwarding properties to rk3, and fixed sork3

Location:

main/trunk/release-kits

Files:

• kits/rk3/ant-scripts/build.xml (modified) (1 diff)
• kits/rk3/ant-scripts/compile.xml (modified) (2 diffs)
• kits/sork3/ant-scripts/build.xml (modified) (4 diffs)
• kits/sork3/ant-scripts/create-sourcecode-component.xml (modified) (1 diff)
• shared/greenstone3/ant-scripts/greenstone3-shared.xml (modified) (2 diffs)

main/trunk/release-kits/kits/rk3/ant-scripts/build.xml

@@ -31 +31 @@
     <target name="properties" depends="core-properties,gs3-properties"/>
 
+
 </project>

main/trunk/release-kits/kits/rk3/ant-scripts/compile.xml

@@ -12 +12 @@
         </exec>
 
+        <!-- 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>
+
         <!-- run greenstone3's ant prepare -->
         <ant dir="compiled" inheritAll="false">
             <target name="prepare"/>
             <propertyset refid="forward.properties"/>
+            <property name="properties.accepted" value="true"/>
         </ant>
 
@@ -28 +34 @@
             <target name="dist-tidy"/>
             <propertyset refid="forward.properties"/>
+            <property name="properties.accepted" value="true"/>
         </ant>
 

main/trunk/release-kits/kits/sork3/ant-scripts/build.xml

@@ -22 +22 @@
         <!-- export the greenstone3 base code -->
         <exec executable="svn"><arg value="export"/><arg value="${svn.root}/main/${branch.path}/greenstone3"/><arg value="distributions/${dist.name}"/></exec>
+        <antcall target="persist-forwarded-properties">
+            <param name="greenstone3basedir" value="distributions/${dist.name}"/>
+        </antcall>
 
         <!-- set version numbers -->
@@ -30 +33 @@
             <property name="properties.accepted" value="true"/>
             <property name="app.version" value="${version}"/>
+            <propertyset refid="forward.properties"/>
         </ant>
 
@@ -53 +57 @@
             <target name="fix-execute-permissions"/>
             <target name="fix-execute-permissions-source"/>
+            <propertyset refid="forward.properties"/>
+            <property name="properties.accepted" value="true"/>
         </ant>
 
@@ -64 +70 @@
 
         <!-- create the sourcecode component -->
-        <ant dir="." antfile="${rk.home}/kits/${rk.name}/ant-scripts/create-sourcecode-component.xml" target="create-sourcecode-component"/>
+        <ant dir="${basedir}" antfile="${rk.home}/kits/${rk.name}/ant-scripts/create-sourcecode-component.xml" target="create-sourcecode-component"/>
     </target>
 

main/trunk/release-kits/kits/sork3/ant-scripts/create-sourcecode-component.xml

@@ -3 +3 @@
 <project name="create-sourcecode-component">
 
-    <import file="distributions/${dist.name}/resources/xml/components.xml"/>
-    <import file="distributions/${dist.name}/resources/xml/executables.xml"/>
+    <import file="${basedir}/distributions/${dist.name}/resources/xml/components.xml"/>
+    <import file="${basedir}/distributions/${dist.name}/resources/xml/executables.xml"/>
 
     <target name="create-sourcecode-component">

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">