Changeset 27185


Ignore:
Timestamp:
04/16/13 15:01:57 (8 years ago)
Author:
ak19
Message:

use.support.lib has now split into 2 properties. The first is use.gnomelib.ext which is used by the gs3 release-kit and the second is checkout.gnomelib.ext which is used when a GS3 developer manually turns it on to tell ant to download the gnomelib src folder into ext.

Location:
main/trunk/greenstone3
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone3/build.properties.in

    r26792 r27185  
    8282#compile.static=true
    8383
    84 ## Uncomment this line to enable compilation with the gnome-lib extension
    85 ## The gnome-lib extension should be in the [gsdl3home]/ext directory
    86 #use.support.lib=true
     84# A flag used by the release-kit to compile with gnomelib
     85# (Previously this flag was called use.support.lib but got conflated with
     86# the property checkout.gnomelib.ext below)
     87#use.gnomelib.ext=true
     88
     89## Uncomment these lines if enabling compilation with the gnome-lib extension
     90## and if compiling imagemagick
     91## These extensions should be in the [gsdl3home]/gs2build/ext directory
     92checkout.gnomelib.ext=true
     93#checkout.imagemagick.ext=true
    8794
    8895## windows c++ compilation
  • main/trunk/greenstone3/build.xml

    r27149 r27185  
    227227
    228228  <!-- If building a release then we want to adjust environment variables so that the support library can be see during compilation -->
    229   <if><bool><isset property="use.support.lib"/></bool>
     229  <if><bool><isset property="use.gnomelib.ext"/></bool>
    230230    <property name="gnome-lib-dir" value="${basedir}/ext/gnome-lib-minimal/${os.bin.dir}"/>
    231231
     
    536536      includes="*.sh,*.pl"/>
    537537
    538     <!-- if the user has set use.support.lib to true, and is using a compiled version of gnome-lib
     538    <!-- if the user has set checkout.gnomelib.ext to true, and is using a compiled version of gnome-lib
    539539     (it would have been compiled up by this stage), remind them to source devel.bash before compiling -->
    540540    <condition property="run.source.devel">
     
    543543    <if><bool>
    544544    <and>
    545       <istrue value="${use.support.lib}"/>
     545      <istrue value="${checkout.gnomelib.ext}"/>
    546546      <istrue value="${run.source.devel}"/>
    547547    </and>
     
    549549      <echo>
    550550    *********************************************
    551     As you have set use.support.lib,
     551    As you have set checkout.gnomelib.ext,
    552552    before running ant install next,
    553553    run source devel.bash from
     
    22742274
    22752275
    2276   <!-- Compile up gnome-lib src folder if: use.support.lib is turned on, and if not using the binary
     2276  <!-- Compile up gnome-lib src folder if: checkout.gnomelib.ext is turned on, and if not using the binary
    22772277       version (gnome-lib-minimal), and if the gnome-lib src folder is not already compiled up. -->
    2278   <target name="compile-gnome-lib" if="use.support.lib">
     2278  <target name="compile-gnome-lib" if="checkout.gnomelib.ext">
    22792279
    22802280    <!-- http://stackoverflow.com/questions/3290307/sourcing-a-shell-profile-in-an-ant-build-file
     
    22982298      <bool>
    22992299    <and>
    2300       <!-- <istrue value="${use.support.lib}"/> make sure user wants gnome-lib -->
     2300      <!-- <istrue value="${checkout.gnomelib.ext}"/> make sure user wants gnome-lib -->
    23012301      <not><isset property="${gnome.lib.min.present}"/></not> <!-- no gnome-lib-minimal binary present -->
    23022302      <istrue value="${gnome.src.lib.present}"/> <!-- gnome-lib folder for compilation is present-->
     
    23162316    <if>
    23172317      <bool>
    2318     <istrue value="${use.support.lib}"/>
     2318    <istrue value="${checkout.gnomelib.ext}"/>
    23192319      </bool>
    23202320
     
    23242324      <else>
    23252325    <echo>**** Not preparing gnome-lib:</echo>
    2326     <echo>property use.support.lib in build.properties was not set or was set to false</echo>
     2326    <echo>property checkout.gnomelib.ext in build.properties was not set or was set to false</echo>
    23272327      </else>
    23282328    </if>
Note: See TracChangeset for help on using the changeset viewer.