Changeset 28636

Timestamp:

2013-11-18T21:45:29+13:00 (10 years ago)

Author:

ak19

Message:

As part of getting diffcol to work with GS3, GS3 needs to be compiled up, for which the following changes were made: 1. Modifications to build.properties and build.xml to checkout and set up gnome-lib-minimal and still pass the --enable-gnome-lib-ext flag to build-src/configure.in. 2. Fixing up build-src/Makefile.in so that sourcing gnome-lib can work on Ubuntu, which uses dash instead of bash and so does not recongise pushd/popd or source (only the dot). To get the build-src Makefile to work on Ubuntu, Makefile.in now sets the SHELL to be bin/bash for running make, and then executes the commands for sourcing gnome-lib in the same subshell as the one which compiles up build-src subdirs like wvware.

Location:

main/trunk

Files:

• greenstone2/build-src/Makefile.in (modified) (2 diffs)
• greenstone3/build.properties.in (modified) (1 diff)
• greenstone3/build.xml (modified) (4 diffs)

main/trunk/greenstone2/build-src/Makefile.in

@@ -26 +26 @@
 srcdir = @srcdir@
 
+SHELL=/bin/bash
 PACKAGE = @PACKAGE@
 VERSION = @VERSION@
@@ -58 +59 @@
 
 all:
-    if test $(ENABLE_GNOMELIB_EXT) = 1; then \
-      if test -d ../ext/gnome-lib; then \
-        pushd ../ext/gnome-lib && source ./devel.bash && popd; \
-      elif test -d ../ext/gnome-lib-minimal; then \
-        pushd ../ext/gnome-lib-minimal && source ./devel.bash && popd; \
-      fi; \
-    fi
     for odir in $(COMPILEDIRS) $(MODULEDIRS); do \
       echo making $@ in $$odir; \
-      (cd $$odir && $(MAKE) $(MDEFINES) $@) || exit 1; \
+      if test $(ENABLE_GNOMELIB_EXT) = 1; then \
+        if test -d ../ext/gnome-lib; then \
+          (pushd ../ext/gnome-lib && source ./devel.bash && popd && cd $$odir && $(MAKE) $(MDEFINES) $@) || exit 1; \
+        elif test -d ../ext/gnome-lib-minimal; then \
+          (pushd ../ext/gnome-lib-minimal && source ./devel.bash && popd && cd $$odir && $(MAKE) $(MDEFINES) $@) || exit 1; \
+        fi; \
+      else \
+        (cd $$odir && $(MAKE) $(MDEFINES) $@) || exit 1; \
+      fi; \
     done
 

main/trunk/greenstone3/build.properties.in

@@ -96 +96 @@
 ## and if compiling imagemagick
 ## These extensions should be in the [gsdl3home]/gs2build/ext directory
+#checkout.gnomelibmin.ext=true
 #checkout.gnomelib.ext=true
 #checkout.imagemagick.ext=true

main/trunk/greenstone3/build.xml

@@ -451 +451 @@
     <or>
       <available file="${gs2build.home}/ext/gnome-lib-minimal" type="dir"/>
+      <istrue value="${checkout.gnomelibmin.ext}"/>
       <istrue value="${use.gnomelib.ext}"/>
       <istrue value="${checkout.gnomelib.ext}"/>
@@ -873 +874 @@
     <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"/>
+    <!--<available file="${gnome-lib-dir}" property="gnome-lib.present"/>-->
+    <condition property="gnome-lib.present">
+      <or>
+    <available file="${gnome-lib-dir}" type="dir"/><!--Only set if use.gnomelib is on-->
+    <available file="${basedir}/gs2build/ext/gnome-lib" type="dir"/>
+    <available file="${basedir}/gs2build/ext/gnome-lib-minimal" type="dir"/>
+      </or>
+    </condition>
 
     <condition property="tomcat.islocal">
@@ -2704 +2712 @@
     <if>
       <bool>
-    <istrue value="${checkout.gnomelib.ext}"/>
+    <istrue value="${checkout.gnomelibmin.ext}"/>
       </bool>
 
-      <antcall target="checkout-gnome-lib"/>
-      <!--Compilation of gnome-lib happens during ant install, just before configuring (common-src and) build-src-->
-
+      <antcall target="checkout-gnome-lib-min"/>
       <else>
-    <echo>**** Not preparing gnome-lib:</echo>
-    <echo>property checkout.gnomelib.ext in build.properties was not set or was set to false</echo>
+
+    <if>
+      <bool>
+        <istrue value="${checkout.gnomelib.ext}"/>
+      </bool>
+      
+      <antcall target="checkout-gnome-lib"/>
+      <!--Compilation of gnome-lib happens during ant install, just before configuring (common-src and) build-src-->
+      
+      <else>
+        <echo>**** Not preparing gnome-lib:</echo>
+        <echo>property checkout.gnomelib.ext in build.properties was not set or was set to false</echo>
+      </else>
+    </if>
       </else>
     </if>
   </target>
 
+  <target name="checkout-gnome-lib-min" depends="init" if="collection.building.enabled" unless="nosvn.mode">
+    <if>
+      <bool>
+    <and>
+      <istrue value="${checkout.gnomelibmin.ext}"/>
+      <not><istrue value="${gnome-lib.present}"/></not>
+    </and>
+      </bool>
+
+      <echo>checking out gnome-lib-minimal</echo>
+      <exec executable="svn" os="${os.unix}">
+    <arg value="export"/>
+    <arg value="${svn.root}/gs2-extensions/gnome-lib/trunk/gnome-lib-minimal-linux-x64.tar.gz"/>
+    <arg value="${gs2build.home}/ext/gnome-lib-minimal.tar.gz"/>
+      </exec>
+      
+      <exec executable="tar" os="${os.unix}" dir="${gs2build.home}/ext">
+    <arg value="-xvzf" />
+    <arg value="${gs2build.home}/ext/gnome-lib-minimal.tar.gz" />
+      </exec>
+      <!--<untar compression="gzip" 
+         src="${gs2build.home}/ext/gnome-lib-minimal.tar.gz"
+         dest="${gs2build.home}/ext"/>-->
+
+      <delete file="${gs2build.home}/ext/gnome-lib-minimal.tar.gz"/>
+
+      <else>
+    <echo>gnomelib already exists at ${gnomelib.src.dir}</echo>
+      </else>
+    </if>
+
+  </target>
 
   <target name="checkout-gnome-lib" depends="init" if="collection.building.enabled" unless="nosvn.mode">
@@ -2832 +2882 @@
   </target>
  
-  <target name="configure-build-src" depends="init" if="collection.building.enabled"
+  <target name="configure-build-src" depends="init,checkout-gnome-lib-min" if="collection.building.enabled"
     description="Configure the build-src component">
     <exec executable="${build.src.home}/configure" os="${os.unix}"