Changeset 27185 for main

Timestamp:

2013-04-16T15:01:57+12:00 (11 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:

• build.properties.in (modified) (1 diff)
• build.xml (modified) (8 diffs)

main/trunk/greenstone3/build.properties.in

@@ -82 +82 @@
 #compile.static=true
 
-## Uncomment this line to enable compilation with the gnome-lib extension
-## The gnome-lib extension should be in the [gsdl3home]/ext directory
-#use.support.lib=true
+# A flag used by the release-kit to compile with gnomelib
+# (Previously this flag was called use.support.lib but got conflated with
+# the property checkout.gnomelib.ext below)
+#use.gnomelib.ext=true
+
+## Uncomment these lines if enabling compilation with the gnome-lib extension
+## and if compiling imagemagick
+## These extensions should be in the [gsdl3home]/gs2build/ext directory
+checkout.gnomelib.ext=true
+#checkout.imagemagick.ext=true
 
 ## windows c++ compilation

main/trunk/greenstone3/build.xml

@@ -227 +227 @@
 
   <!-- 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="use.gnomelib.ext"/></bool>
     <property name="gnome-lib-dir" value="${basedir}/ext/gnome-lib-minimal/${os.bin.dir}"/>
 
@@ -536 +536 @@
       includes="*.sh,*.pl"/>
 
-    <!-- if the user has set use.support.lib to true, and is using a compiled version of gnome-lib
+    <!-- if the user has set checkout.gnomelib.ext to true, and is using a compiled version of gnome-lib
      (it would have been compiled up by this stage), remind them to source devel.bash before compiling -->
     <condition property="run.source.devel">
@@ -543 +543 @@
     <if><bool>
     <and>
-      <istrue value="${use.support.lib}"/>
+      <istrue value="${checkout.gnomelib.ext}"/>
       <istrue value="${run.source.devel}"/>
     </and>
@@ -549 +549 @@
       <echo>
     *********************************************
-    As you have set use.support.lib, 
+    As you have set checkout.gnomelib.ext, 
     before running ant install next,
     run source devel.bash from 
@@ -2274 +2274 @@
 
 
-  <!-- Compile up gnome-lib src folder if: use.support.lib is turned on, and if not using the binary
+  <!-- Compile up gnome-lib src folder if: checkout.gnomelib.ext is turned on, and if not using the binary
        version (gnome-lib-minimal), and if the gnome-lib src folder is not already compiled up. -->
-  <target name="compile-gnome-lib" if="use.support.lib">
+  <target name="compile-gnome-lib" if="checkout.gnomelib.ext">
 
     <!-- http://stackoverflow.com/questions/3290307/sourcing-a-shell-profile-in-an-ant-build-file 
@@ -2298 +2298 @@
       <bool>
     <and>
-      <!-- <istrue value="${use.support.lib}"/> make sure user wants gnome-lib -->
+      <!-- <istrue value="${checkout.gnomelib.ext}"/> make sure user wants gnome-lib -->
       <not><isset property="${gnome.lib.min.present}"/></not> <!-- no gnome-lib-minimal binary present -->
       <istrue value="${gnome.src.lib.present}"/> <!-- gnome-lib folder for compilation is present-->
@@ -2316 +2316 @@
     <if>
       <bool>
-    <istrue value="${use.support.lib}"/>
+    <istrue value="${checkout.gnomelib.ext}"/>
       </bool>
 
@@ -2324 +2324 @@
       <else>
     <echo>**** Not preparing gnome-lib:</echo>
-    <echo>property use.support.lib in build.properties was not set or was set to false</echo>
+    <echo>property checkout.gnomelib.ext in build.properties was not set or was set to false</echo>
       </else>
     </if>