Changeset 15329 for greenstone3

Timestamp:

2008-05-01T15:06:28+12:00 (16 years ago)

Author:

davidb

Message:

GDBM now always checked out by default and compiled. Simplies compiling under various Unix systems, in particular MacOs

Location:

greenstone3/trunk

Files:

• build.properties (modified) (1 diff)
• build.xml (modified) (4 diffs)

greenstone3/trunk/build.properties

@@ -51 +51 @@
 proxy.password=
 
-## Mac OS X specific stuff
-# set the path to your GDBM here
-#install.gdbm=true
-#gdbm.installed.path=${gdbm.home}
+# Not all unix systems (for example MacOS) come with GDBM pre-installed
+# To keep things simple, instruct Greenstone3 to download a GDBM tar file
+# configure and install it. The location used by default is within the
+# Greenstone3 src/packages area
+install.gdbm=true
+gdbm.installed.path=${gdbm.home}
 
 ##Flax stuff##

greenstone3/trunk/build.xml

@@ -1332 +1332 @@
   <!-- downloads a good XML-Parser -->
   <target name="get-macos-extra" depends="init" if="need.macos.extra">  
+<!--
       <get src="http://www.greenstone.org/gs3files/XML-Parser.tar.gz"
       dest="${gs2build.home}/perllib/cpan/XML-Parser.tar.gz"
       usetimestamp="true"/>
+-->
+    <echo>Nothing extra currently needed for MacOs prepare</echo>
   </target>  
 
@@ -1341 +1344 @@
     <!-- make sure these directories are present, otherwise chmod craps out 
     this chmod is needed in case we are unpacking for a second time -->
+<!--
     <mkdir dir="${gs2build.home}/perllib/cpan/perl-5.8"/>
     <mkdir dir="${gs2build.home}/perllib/cpan/perl-5.6"/>
@@ -1348 +1352 @@
       dest="${gs2build.home}/perllib/cpan/"
       compression="gzip"/>
+-->
+    <echo>Nothing extra currently needed for MacOs install</echo>
   </target>
 
@@ -1669 +1675 @@
   </target> 
 
+  
   <target name="compile-gdbm" depends="init"  if="install.gdbm">   
     <echo>compile GDBM</echo>
+    <exec executable="groups" outputproperty="usergroups"/>
+    <exec executable="awk" inputstring="${usergroups}" outputproperty="firstgroup">
+      <arg line="'{print $1}'"/>
+    </exec>
+
     <exec executable="make" os="${os.unix},${os.mac}" dir="${gdbm.home}"/>
     <exec executable="make" os="${os.unix},${os.mac}" dir="${gdbm.home}">
+      <arg value="BINOWN=${env.USER}"/>
+      <arg value="BINGRP=${firstgroup}"/>
       <arg value="install"/>
     </exec>