Changeset 23076 for gs2-extensions/gnome-lib

Timestamp:

2010-10-11T10:27:08+13:00 (14 years ago)

Author:

sjm84

Message:

Several changes to the GNOME support library to fix issues when a pre-compiled version is used to assist Greenstone installation

Location:

gs2-extensions/gnome-lib/trunk/src

Files:

• CASCADE-MAKE.sh (modified) (1 diff)
• devel.bash (modified) (2 diffs)
• packages/CASCADE-MAKE.sh (modified) (2 diffs)
• setup.bash (modified) (1 diff)

gs2-extensions/gnome-lib/trunk/src/CASCADE-MAKE.sh

@@ -1 +1 @@
 #!/bin/bash
 
-source setup.bash
-
-cd cascade-make/lib ; source cascade-lib.bash ; cd ../..
+source devel.bash
 
 for d in packages ; do

gs2-extensions/gnome-lib/trunk/src/devel.bash

@@ -3 +3 @@
 if [ "x$GEXTGNOME" = "x" ] ; then
     source setup.bash
+fi
+
+if [ -d cascade-make ] ; then
+  source cascade-make/lib/cascade-lib.bash
 fi
 
@@ -15 +19 @@
     export LDFLAGS="-L$GEXTGNOME_INSTALLED/lib $LDFLAGS"
     
-    echo "+Your environment is now setup to compile with the Gnome Support Library"
+    echo "+Your environment is now setup to compile with the GNOME Support Library"
+
+    if [ -d "$GEXTGNOME_INSTALLED/lib/pkgconfig" ] ; then
+        echo ""
+        echo "+Testing that pkg-config is correctly configured..."
+
+        pushd $GEXTGNOME_INSTALLED/lib/pkgconfig
+
+#   pcfilelist=`ls *.pc`
+#   firstfile=`$pcfilelist | head -1`
+#   pkgconfigprefix=`awk '/^prefix=/{ sub(/^prefix=/, "") ; print }' $firstfile`
+
+#   if [ "$pkgconfigprefix" = "$GEXTGNOME_INSTALLED" ] ; then
+#       echo "OK"
+#   else
+#       echo "NO - Correcting configuration..."
+
+#       for file in $pcfilelist ; do
+#           awk '{ sub(/^prefix=\/.*$/, "prefix=$GEXTGNOME_INSTALLED") ; print }' $file > $file
+#       done 
+#       
+#       echo "COMPLETE"
+#   fi
+
+
+        if [ ! -e .fixed-prefix.awk ] ; then
+
+            echo "Configuring ..."
+
+            echo "/^prefix=/ { print \"prefix=$GEXTGNOME_INSTALLED\" ; next }" > .fixed-prefix.awk 
+            echo "  { print $0 }" >> .fixed-prefix.awk
+
+            for file in *.pc ; do
+                cat $file | awk -f .fixed-prefix.awk > $file.new && \
+                  /bin/mv $file.new $file
+            done
+            echo "... done"
+        else
+            echo "No configuration needed"
+        fi
+
+        popd
+    fi
 else
-    echo "+Your environment is already setup to compile with the Gnome Support Library"
+    echo "+Your environment is already setup to compile with the GNOME Support Library"
 fi

gs2-extensions/gnome-lib/trunk/src/packages/CASCADE-MAKE.sh

@@ -1 +1 @@
 #!/bin/bash
+
+source ../cascade-make/lib/cascade-lib.bash
 
 for d in INTLTOOL GETTEXT PKG-CONFIG LIBXML GLIB LIBGSF; do
@@ -11 +13 @@
     fi
 done
+
+
+if [ $install = "1" ] ; then
+  touch "$GEXTGNOME_INSTALLED/lib/pkgconfig/.fixed-prefix.awk"
+fi
+

gs2-extensions/gnome-lib/trunk/src/setup.bash

@@ -6 +6 @@
 fulldir=${fulldir%/.}
 
-source cascade-make/lib/cascade-lib.bash
+if [ "x$GSDLHOME" = "x" ] ; then
+  if [ -e ../../setup.bash ] ; then
+    ( gsopt_noexts=1 && cd ../.. && source setup.bash )
+  fi
+fi
+
 
 if [ "x$GEXTGNOME" = "x" ] ; then