Changeset 23101 for gs2-extensions/postgres-gis/trunk

Timestamp:

2010-10-12T10:44:29+13:00 (14 years ago)

Author:

sjm84

Message:

Upgrading the postgres-gis extension

Location:

gs2-extensions/postgres-gis/trunk/src

Files:

• CASCADE-MAKE.sh (modified) (2 diffs)
• devel.bash (added)
• packages/CASCADE-MAKE/BISON.sh (modified) (1 diff)
• packages/CASCADE-MAKE/FLEX.sh (modified) (1 diff)
• packages/CASCADE-MAKE/GEOS.sh (modified) (1 diff)
• packages/CASCADE-MAKE/POSTGIS.sh (modified) (1 diff)
• packages/CASCADE-MAKE/POSTGRES.sh (modified) (1 diff)
• packages/CASCADE-MAKE/PROJ.sh (modified) (1 diff)
• setup.bash (modified) (2 diffs)

gs2-extensions/postgres-gis/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
@@ -15 +13 @@
     fi
 done
+
+if [ $makedist = "1" ] ; then
+  toplevel_make_dist
+fi

gs2-extensions/postgres-gis/trunk/src/packages/CASCADE-MAKE/BISON.sh

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

gs2-extensions/postgres-gis/trunk/src/packages/CASCADE-MAKE/FLEX.sh

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

gs2-extensions/postgres-gis/trunk/src/packages/CASCADE-MAKE/GEOS.sh

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

gs2-extensions/postgres-gis/trunk/src/packages/CASCADE-MAKE/POSTGIS.sh

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

gs2-extensions/postgres-gis/trunk/src/packages/CASCADE-MAKE/POSTGRES.sh

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

gs2-extensions/postgres-gis/trunk/src/packages/CASCADE-MAKE/PROJ.sh

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

gs2-extensions/postgres-gis/trunk/src/setup.bash

@@ -1 @@
-
-extdesc="the PostgreSQL and PostGIS"
+extdesc="the PostgreSQL and PostGIS extension"
 
 full_setup=`pwd`/${BASH_SOURCE}
@@ -6 +5 @@
 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$GEXTPOSTGRES" = "x" ] ; then