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

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/kits

Files:

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

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