Changeset 22845 for main/trunk/greenstone3

Timestamp:

2010-09-03T13:32:30+12:00 (14 years ago)

Author:

sjm84

Message:

Added additional properties that are used when the release-kit wants to create a static build using the support library

File:

• main/trunk/greenstone3/build.xml (modified) (5 diffs)

main/trunk/greenstone3/build.xml

@@ -220 +220 @@
     <isset property="compile.static"/>
   </condition>
+
+  <!-- If building a release then we want to adjust environment variables so that the support library can be see during compilation -->
+  <if><bool><isset property="use.support.lib"/></bool>
+    <if><bool><isset property="env.CFLAGS"/></bool>
+      <property name="cflags.arg" value="CFLAGS=-I${basedir}/ext/gnome-lib/include ${env.CFLAGS}"/>
+      <else>
+        <property name="cflags.arg" value="CFLAGS=-I${basedir}/ext/gnome-lib/include"/>
+      </else>
+    </if>
+    <else>
+      <property name="cflags.arg" value=" "/>
+    </else>
+  </if>
+
+  <if><bool><isset property="use.support.lib"/></bool>
+    <if><bool><isset property="env.CPPFLAGS"/></bool>
+      <property name="cppflags.arg" value="CPPFLAGS=-I${basedir}/ext/gnome-lib/include ${env.CPPFLAGS}"/>
+      <else>
+        <property name="cppflags.arg" value="CPPFLAGS=-I${basedir}/ext/gnome-lib/include"/>
+      </else>
+    </if>
+    <else>
+      <property name="cppflags.arg" value=" "/>
+    </else>
+  </if>
+
+  <if><bool><isset property="use.support.lib"/></bool>
+    <if><bool><isset property="env.CXXFLAGS"/></bool>
+      <property name="cxxflags.arg" value="CXXFLAGS=-I${basedir}/ext/gnome-lib/include ${env.CXXFLAGS}"/>
+      <else>
+        <property name="cxxflags.arg" value="CXXFLAGS=-I${basedir}/ext/gnome-lib/include"/>
+      </else>
+    </if>
+    <else>
+      <property name="cxxflags.arg" value=" "/>
+    </else>
+  </if>
 
   <condition property="gs2.opt.args" value= " " else="--disable-mg --disable-mgpp --disable-accentfold --disable-gdbm --disable-sqlite">
@@ -1308 +1345 @@
         <arg value="--bindir=${basedir}/bin"/>
         <arg value="${static.arg}"/>
+        <env key="CFLAGS" value="${cflags.arg}"/>        
+        <env key="CPPFLAGS" value="${cppflags.arg}"/>
+        <env key="CXXFLAGS" value="${cxxflags.arg}"/>
       </exec>
       <exec executable="make" dir="${src.packages.home}/search4j" failonerror="true"/>
@@ -1401 +1441 @@
       <arg line="${gs2.opt.args}"/>
       <arg line="${static.arg}"/>
+      <env key="CFLAGS" value="${cflags.arg}"/>        
+      <env key="CPPFLAGS" value="${cppflags.arg}"/>
+      <env key="CXXFLAGS" value="${cxxflags.arg}"/>
     </exec>
   </target>
@@ -1434 +1477 @@
     <exec executable="make" os="${os.unix}" dir="${common.src.home}" failonerror="true">
       <arg value="${gs2.compile.target}"/>
+      <env key="CFLAGS" value="${cflags.arg}"/>        
+      <env key="CPPFLAGS" value="${cppflags.arg}"/>
+      <env key="CXXFLAGS" value="${cxxflags.arg}"/>
     </exec>
     <!-- windows: -->
@@ -1722 +1768 @@
   <target name="compile-build-src" depends="init" if="collection.building.enabled">
     
-    <exec executable="make" dir="${build.src.home}" os="${os.unix}" failonerror="true"/>
+    <exec executable="make" dir="${build.src.home}" os="${os.unix}" failonerror="true">
+      <env key="CFLAGS" value="${cflags.arg}"/>        
+      <env key="CPPFLAGS" value="${cppflags.arg}"/>
+      <env key="CXXFLAGS" value="${cxxflags.arg}"/>
+    </exec>
+    
     <exec executable="make" dir="${build.src.home}" os="${os.unix}" failonerror="true">
       <arg value="install"/>