Changeset 32967

Show
Ignore:
Timestamp:
02.04.2019 15:34:28 (6 months 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.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone3/build.xml

    r32881 r32967  
    531531 
    532532    <if><bool><isset property="env.CFLAGS"/></bool> 
    533         <property name="cflags.arg" value="CFLAGS=&quot;-I${gnome-lib-dir}/include ${env.CFLAGS}&quot;"/> 
     533        <property name="cflags.arg" value="CFLAGS=&quot;-I${gnome-lib-dir}/include -I${gnome-lib-dir}/include/libxml2 ${env.CFLAGS}&quot;"/> 
    534534    <else> 
    535         <property name="cflags.arg" value="CFLAGS=&quot;-I${gnome-lib-dir}/include&quot;"/> 
     535        <property name="cflags.arg" value="CFLAGS=&quot;-I${gnome-lib-dir}/include -I${gnome-lib-dir}/include/libxml2&quot;"/> 
    536536    </else> 
    537537    </if> 
    538538 
    539539    <if><bool><isset property="env.CPPFLAGS"/></bool> 
    540         <property name="cppflags.arg" value="CPPFLAGS=&quot;-I${gnome-lib-dir}/include ${env.CPPFLAGS}&quot;"/> 
     540        <property name="cppflags.arg" value="CPPFLAGS=&quot;-I${gnome-lib-dir}/include -I${gnome-lib-dir}/include/libxml2 ${env.CPPFLAGS}&quot;"/> 
    541541    <else> 
    542         <property name="cppflags.arg" value="CPPFLAGS=&quot;-I${gnome-lib-dir}/include&quot;"/> 
     542        <property name="cppflags.arg" value="CPPFLAGS=&quot;-I${gnome-lib-dir}/include -I${gnome-lib-dir}/include/libxml2&quot;"/> 
    543543    </else> 
    544544    </if> 
    545545 
    546546    <if><bool><isset property="env.CXXFLAGS"/></bool> 
    547         <property name="cxxflags.arg" value="CXXFLAGS=&quot;-I${gnome-lib-dir}/include ${env.CXXFLAGS}&quot;"/> 
     547        <property name="cxxflags.arg" value="CXXFLAGS=&quot;-I${gnome-lib-dir}/include -I${gnome-lib-dir}/include/libxml2 ${env.CXXFLAGS}&quot;"/> 
    548548    <else> 
    549             <property name="cxxflags.arg" value="CXXFLAGS=&quot;-I${gnome-lib-dir}/include&quot;"/> 
     549            <property name="cxxflags.arg" value="CXXFLAGS=&quot;-I${gnome-lib-dir}/include -I${gnome-lib-dir}/include/libxml2&quot;"/> 
    550550    </else> 
    551551    </if> 
     
    38183818      </else> 
    38193819    </if> 
     3820 
     3821    <!-- Release kit makes use of use.gnomelib.ext property which works with gnome-lib-minimal. 
     3822     It needs to mimic svn compilation of GS3 with gnome-lib-minimal, which does 
     3823     'source devel.bash' in gnome-lib-minimal to create and adjust a lot of files --> 
     3824    <if> 
     3825      <bool> 
     3826    <istrue value="${use.gnomelib.ext}"/> 
     3827      </bool> 
     3828      <exec dir="${gs2build.home}/ext/gnome-lib-minimal" 
     3829        executable="source"> 
     3830    <arg value="devel.bash"/> 
     3831      </exec> 
     3832    </if> 
     3833     
    38203834  </target> 
    38213835