Changeset 32967

Timestamp:

2019-04-02T15:34:28+13:00 (5 years ago)

Author:

ak19

Message:

Experimenting to get use.gnomelib.ext used by release-kit to work the same as when GS3 is compiled from SVN using a gnome-lib-minimal too.

File:

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

main/trunk/greenstone3/build.xml

@@ -531 +531 @@
 
     <if><bool><isset property="env.CFLAGS"/></bool>
-        <property name="cflags.arg" value="CFLAGS=&quot;-I${gnome-lib-dir}/include ${env.CFLAGS}&quot;"/>
+        <property name="cflags.arg" value="CFLAGS=&quot;-I${gnome-lib-dir}/include -I${gnome-lib-dir}/include/libxml2 ${env.CFLAGS}&quot;"/>
     <else>
-        <property name="cflags.arg" value="CFLAGS=&quot;-I${gnome-lib-dir}/include&quot;"/>
+        <property name="cflags.arg" value="CFLAGS=&quot;-I${gnome-lib-dir}/include -I${gnome-lib-dir}/include/libxml2&quot;"/>
     </else>
     </if>
 
     <if><bool><isset property="env.CPPFLAGS"/></bool>
-        <property name="cppflags.arg" value="CPPFLAGS=&quot;-I${gnome-lib-dir}/include ${env.CPPFLAGS}&quot;"/>
+        <property name="cppflags.arg" value="CPPFLAGS=&quot;-I${gnome-lib-dir}/include -I${gnome-lib-dir}/include/libxml2 ${env.CPPFLAGS}&quot;"/>
     <else>
-        <property name="cppflags.arg" value="CPPFLAGS=&quot;-I${gnome-lib-dir}/include&quot;"/>
+        <property name="cppflags.arg" value="CPPFLAGS=&quot;-I${gnome-lib-dir}/include -I${gnome-lib-dir}/include/libxml2&quot;"/>
     </else>
     </if>
 
     <if><bool><isset property="env.CXXFLAGS"/></bool>
-        <property name="cxxflags.arg" value="CXXFLAGS=&quot;-I${gnome-lib-dir}/include ${env.CXXFLAGS}&quot;"/>
+        <property name="cxxflags.arg" value="CXXFLAGS=&quot;-I${gnome-lib-dir}/include -I${gnome-lib-dir}/include/libxml2 ${env.CXXFLAGS}&quot;"/>
     <else>
-            <property name="cxxflags.arg" value="CXXFLAGS=&quot;-I${gnome-lib-dir}/include&quot;"/>
+            <property name="cxxflags.arg" value="CXXFLAGS=&quot;-I${gnome-lib-dir}/include -I${gnome-lib-dir}/include/libxml2&quot;"/>
     </else>
     </if>
@@ -3818 +3818 @@
       </else>
     </if>
+
+    <!-- Release kit makes use of use.gnomelib.ext property which works with gnome-lib-minimal.
+     It needs to mimic svn compilation of GS3 with gnome-lib-minimal, which does
+     'source devel.bash' in gnome-lib-minimal to create and adjust a lot of files -->
+    <if>
+      <bool>
+    <istrue value="${use.gnomelib.ext}"/>
+      </bool>
+      <exec dir="${gs2build.home}/ext/gnome-lib-minimal"
+        executable="source">
+    <arg value="devel.bash"/>
+      </exec>
+    </if>
+    
   </target>