Changeset 22821 for main/trunk

Timestamp:

2010-08-31T15:47:38+12:00 (14 years ago)

Author:

ak19

Message:

Linux and Mac release kits now use the gnome-lib extension to assist compilation

File:

• main/trunk/release-kits/kits/rk2/ant-scripts/compile.xml (modified) (6 diffs)

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

@@ -12 +12 @@
                 </or>
             </bool>
-            <exec executable="svn">
+            <exec executable="svn">
                 <arg value="checkout"/>
                 <arg value="${svn.root}/main/${branch.path}/greenstone2"/>
                 <arg value="${basedir}/compiled"/>
-            </exec>       
+            </exec>       
             <else>
                 <exec executable="svn">
@@ -26 +26 @@
         </if>
         
-        <exec executable="svn">
-          <arg value="checkout"/>
-          <arg value="${svn.root}/main/${branch.path}/gli"/>
-          <arg value="${basedir}/compiled/gli"/>
+        <exec executable="svn">
+            <arg value="checkout"/>
+            <arg value="${svn.root}/main/${branch.path}/gli"/>
+            <arg value="${basedir}/compiled/gli"/>
         </exec>
 
@@ -47 +47 @@
             <delete dir="${basedir}/compiled/gs2-server.app"/>
             <delete dir="${basedir}/compiled/gli.app"/>
+        </if>
+
+        <!-- mac or linux: compile the support library -->
+        <if><bool><or><equals arg1="${rk.os}" arg2="mac"/><equals arg1="${rk.os}" arg2="linux"/></or></bool>
+            <!-- checkout the gnome support library extension-->
+            <echo>GNOME LIB EXTENSION START</echo>
+            <!--<if><bool><and>
+                <not><equals arg1="${branch.path}" arg2="trunk"/></not>
+                <not><equals arg1="${branch.path}" arg2="tags/stable"/></not>
+                <isgreaterthan arg1="${branch.tag.version}" arg2="2.83"/>
+            </and></bool>-->
+                <exec executable="svn">
+                    <arg value="checkout"/>
+                    <arg value="${svn.root}/gs2-extensions/gnome-lib/trunk"/>
+                    <arg value="${basedir}/compiled/ext/gnome-lib"/>
+                </exec>
+                <exec executable="/bin/bash" dir="${basedir}/compiled/ext/gnome-lib">
+                    <arg value="-c"/>
+                    <arg value="./CASCADE-MAKE.sh"/>
+                </exec>
+            <!--</if>-->
+            <echo>GNOME LIB EXTENSION END</echo>
         </if>
         
@@ -132 +154 @@
         <!-- linux only -->
         <else><if><bool><equals arg1="${rk.os}" arg2="linux"/></bool>
-
             <!-- add static to configure.in -->
             <rsr file="${basedir}/compiled/configure.in" pattern="^LDFLAGS=.*$" replacement="LDFLAGS=-static"/>
@@ -146 +167 @@
             <exec dir="${basedir}/compiled" executable="${basedir}/compiled/configure" failonerror="true">
                 <arg line="--enable-apache-httpd"/>
-                <env key="LDFLAGS" value="-static"/>
+                <env key="PATH" value="${basedir}/compiled/ext/gnome-lib/linux/bin:${env.PATH}"/> 
+                <env key="CFLAGS" value="-I${basedir}/compiled/ext/gnome-lib/linux/include"/>
+                <env key="CXXFLAGS" value="-I${basedir}/compiled/ext/gnome-lib/linux/include"/>
+                <env key="LDFLAGS" value="-static -L${basedir}/compiled/ext/gnome-lib/linux/lib"/>
             </exec>
 
@@ -170 +194 @@
         <!-- mac and linux: compile -->
         <if><bool><or><equals arg1="${rk.os}" arg2="mac"/><equals arg1="${rk.os}" arg2="linux"/></or></bool>
-
             <!-- make -->
-            <exec dir="${basedir}/compiled" executable="make" failonerror="true"/>
+            <exec dir="${basedir}/compiled" executable="make" failonerror="true">
+                <env key="PATH" value="${basedir}/compiled/ext/gnome-lib/linux/bin:${env.PATH}"/> 
+                <env key="CFLAGS" value="-I${basedir}/compiled/ext/gnome-lib/linux/include"/>
+                <env key="CXXFLAGS" value="-I${basedir}/compiled/ext/gnome-lib/linux/include"/>
+                <env key="LDFLAGS" value="-static -L${basedir}/compiled/ext/gnome-lib/linux/lib"/>
+            </exec>
 
             <!-- make install -->