Changeset 26791

Timestamp:

2013-01-25T15:38:28+13:00 (11 years ago)

Author:

davidb

Message:

Streamlining of compile sequence to checkout gnome-lib extension if use.support is set to true

File:

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

main/trunk/greenstone3/build.xml

@@ -746 +746 @@
     <available file="${basedir}/common-src" property="common.src.present"/>
     <available file="${basedir}/gs2build" property="gs2build.present"/>
+    <available file="${gnome-lib-dir}" property="gnome-lib.present"/>
 
     <condition property="tomcat.islocal">
@@ -2210 +2211 @@
   <target name="prepare-gs2build" depends="init" if="collection.building.enabled" unless="gs2build.present">
     <antcall target="checkout-gs2build"/>
+    <antcall target="prepare-gnome-lib"/>
     <antcall target="unzip-windows-packages"/>
     <antcall target="checkout-winbin"/>
@@ -2223 +2225 @@
       <arg value="-r"/><arg value="${branch.revision}"/>
     </exec>
-
-
+  </target>
+
+  <target name="prepare-gnome-lib" depends="init" if="collection.building.enabled" unless="gnome-lib.present">
+    <antcall target="checkout-gnome-lib"/>
+  </target>
+
+  <target name="checkout-gnome-lib" depends="init" if="collection.building.enabled" unless="nosvn.mode">
+    <echo>checking out gnome-lib extension</echo>
+    <exec executable="svn">
+      <arg value="checkout"/>
+      <arg value="${svn.root}/gs2-extensions/gnome-lib/trunk/src"/>
+      <arg value="${gs2build.home}/ext/gnome-lib"/>
+    </exec>
   </target>