Changeset 23003 for gs2-extensions

Timestamp:

2010-10-01T15:56:46+13:00 (14 years ago)

Author:

sjm84

Message:

Various changes to the amp extension to make it compatible with having previously installed mysql extension

Location:

gs2-extensions/gsdl-amp/trunk

Files:

• packages/CASCADE-MAKE.sh (modified) (1 diff)
• packages/CASCADE-MAKE/MYSQL.sh (added)
• packages/CASCADE-MAKE/PHP.sh (modified) (2 diffs)
• packages/mysql-5.1.47.tar.gz (added)
• setup.bash (modified) (3 diffs)

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

@@ -1 +1 @@
 #!/bin/bash
 
+list=
+if [ "x$COMPILE_UP_MYSQL" = "x1" ] ; then
+  list="MYSQL LIBPNG APACHE PHP"
+else  
+  list="LIBPNG APACHE PHP"
+fi
 
-for d in MYSQL LIBPNG APACHE PHP  ; do
+for d in $list ; do
   echo "    Running CASCADE-MAKE/$d.sh $*"
 

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

@@ -3 +3 @@
 package=php
 version=-5.3.2
-
-apache_version=httpd-2.2.15
 
 progname=$0
@@ -11 +9 @@
 
 prefix=$GEXTAMP_INSTALLED
+mysqlprefix=
+if [ "x$COMPILE_UP_MYSQL" = "x1" ] ; then
+  mysqlprefix=$GEXTAMP_INSTALLED
+else
+  if [ -n "$GEXTMYSQL_INSTALLED" ] ; then
+    mysqlprefix=$GEXTMYSQL_INSTALLED
+  fi
+fi
 
 opt_run_untar $force_untar $auto_untar $package $version
 
-opt_run_configure $force_config $auto_config $package $version $prefix --with-mysql=$prefix --with-png-dir=$prefix --with-apxs2=$prefix/bin/apxs --with-gd
+opt_run_configure $force_config $auto_config $package $version $prefix --with-mysql=$mysqlprefix --with-png-dir=$prefix --with-apxs2=$prefix/bin/apxs --with-gd
 
 opt_run_make $compile   $package $version

gs2-extensions/gsdl-amp/trunk/setup.bash

@@ -5 +5 @@
 fulldir=${full_setup%/*}
 fulldir=${fulldir%/.}
-
-failed="false"
 
 source cascade-make/lib/cascade-lib.bash
@@ -33 +31 @@
       fi
   fi
-
-  if [ -e $GEXTAMP/packages/CASCADE-MAKE/MYSQL.sh ] ; then
-    echo "The MySQL extension extension has already been acquired"
-  else
-    echo "Attempting to acquire the MySQL extension ..."
-    if [ -e ../mysql ] ; then
-      cp ../mysql/packages/mysql-*.tar.gz packages/. && cp ../mysql/packages/CASCADE-MAKE/MYSQL.sh packages/CASCADE-MAKE/. 
-      
-      if [ $? != "0" ] ; then
-        echo "FAILED -- There was an error copying the necessary files"
-        failed="true"
-      else
-        echo "SUCCESS!"
-      fi 
-    else 
-      echo "FAILED -- The MySQL extension does not exist, please check it out into the extension directory by typing "
-      echo "svn co http://svn.greenstone.org/gs2-extensions/mysql-src/trunk mysql"
-      failed="true"
+  
+  export COMPILE_UP_MYSQL=1
+  if [ -n "$GEXTMYSQL" ] ; then
+    if [ -e "$GEXTMYSQL/$GSDLOS" ] ; then
+      export COMPILE_UP_MYSQL=0     
+      source $GEXTMYSQL/setup.bash
     fi
   fi
@@ -62 +48 @@
   fi
 
-  if [ $failed = "true" ] ; then
-    echo "+Your environment was not successfully setup for $extdesc to Greenstone"    
-    GEXTAMP=
-  else
-    echo "+Your environment is now setup for $extdesc to Greenstone"
-  fi
+  echo "+Your environment is now setup for $extdesc to Greenstone"
 else
   echo "+Your environment is already setup for $extdesc to Greenstone"