Changeset 23100 for gs2-extensions

Timestamp:

2010-10-12T10:42:02+13:00 (14 years ago)

Author:

sjm84

Message:

Upgrading the gsdl-amp extension

Location:

gs2-extensions/gsdl-amp/trunk/src

Files:

• CASCADE-MAKE.sh (modified) (2 diffs)
• devel.bash (added)
• packages/CASCADE-MAKE/APACHE.sh (modified) (1 diff)
• packages/CASCADE-MAKE/LIBPNG.sh (modified) (1 diff)
• packages/CASCADE-MAKE/MYSQL.sh (modified) (1 diff)
• packages/CASCADE-MAKE/PHP.sh (modified) (1 diff)
• setup.bash (modified) (1 diff)

gs2-extensions/gsdl-amp/trunk/src/CASCADE-MAKE.sh

@@ -1 +1 @@
 #!/bin/bash
 
-cd cascade-make/lib ; source cascade-lib.bash ; cd ../..
+source devel.bash
 
 for d in packages ; do
@@ -14 +14 @@
 done
 
-
+if [ $makedist = "1" ] ; then
+  toplevel_make_dist
+fi

gs2-extensions/gsdl-amp/trunk/src/packages/CASCADE-MAKE/APACHE.sh

@@ -6 +6 @@
 progname=$0
 
-source ../cascade-make/lib/cascade-lib.bash
+source ../cascade-make/lib/cascade-lib.bash GEXTAMP ../.. $*
 
 prefix=$GEXTAMP_INSTALLED

gs2-extensions/gsdl-amp/trunk/src/packages/CASCADE-MAKE/LIBPNG.sh

@@ -6 +6 @@
 progname=$0
 
-source ../cascade-make/lib/cascade-lib.bash
+source ../cascade-make/lib/cascade-lib.bash GEXTAMP ../.. $*
 
 prefix=$GEXTAMP_INSTALLED

gs2-extensions/gsdl-amp/trunk/src/packages/CASCADE-MAKE/MYSQL.sh

@@ -6 +6 @@
 progname=$0
 
-source ../cascade-make/lib/cascade-lib.bash
+source ../cascade-make/lib/cascade-lib.bash GEXTAMP ../.. $*
 
 prefix=$GEXTAMP_INSTALLED

gs2-extensions/gsdl-amp/trunk/src/packages/CASCADE-MAKE/PHP.sh

@@ -6 +6 @@
 progname=$0
 
-source ../cascade-make/lib/cascade-lib.bash
+source ../cascade-make/lib/cascade-lib.bash GEXTAMP ../.. $*
 
 prefix=$GEXTAMP_INSTALLED

gs2-extensions/gsdl-amp/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
+    export gsopt_noexts=1 && pushd ../.. && source setup.bash && popd
+    export gsopt_noexts=
+  fi
+fi
 
 if [ "x$GEXTAMP" = "x" ] ; then