Changeset 23003

Show
Ignore:
Timestamp:
01.10.2010 15:56:46 (9 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:
2 added
3 modified

Legend:

Unmodified
Added
Removed
  • gs2-extensions/gsdl-amp/trunk/packages/CASCADE-MAKE.sh

    r22237 r23003  
    11#!/bin/bash 
    22 
     3list= 
     4if [ "x$COMPILE_UP_MYSQL" = "x1" ] ; then 
     5  list="MYSQL LIBPNG APACHE PHP" 
     6else   
     7  list="LIBPNG APACHE PHP" 
     8fi 
    39 
    4 for d in MYSQL LIBPNG APACHE PHP ; do 
     10for d in $list ; do 
    511  echo "    Running CASCADE-MAKE/$d.sh $*" 
    612 
  • gs2-extensions/gsdl-amp/trunk/packages/CASCADE-MAKE/PHP.sh

    r22242 r23003  
    33package=php 
    44version=-5.3.2 
    5  
    6 apache_version=httpd-2.2.15 
    75 
    86progname=$0 
     
    119 
    1210prefix=$GEXTAMP_INSTALLED 
     11mysqlprefix= 
     12if [ "x$COMPILE_UP_MYSQL" = "x1" ] ; then 
     13  mysqlprefix=$GEXTAMP_INSTALLED 
     14else 
     15  if [ -n "$GEXTMYSQL_INSTALLED" ] ; then 
     16    mysqlprefix=$GEXTMYSQL_INSTALLED 
     17  fi 
     18fi 
    1319 
    1420opt_run_untar $force_untar $auto_untar $package $version 
    1521 
    16 opt_run_configure $force_config $auto_config $package $version $prefix --with-mysql=$prefix --with-png-dir=$prefix --with-apxs2=$prefix/bin/apxs --with-gd 
     22opt_run_configure $force_config $auto_config $package $version $prefix --with-mysql=$mysqlprefix --with-png-dir=$prefix --with-apxs2=$prefix/bin/apxs --with-gd 
    1723 
    1824opt_run_make $compile   $package $version 
  • gs2-extensions/gsdl-amp/trunk/setup.bash

    r22995 r23003  
    55fulldir=${full_setup%/*} 
    66fulldir=${fulldir%/.} 
    7  
    8 failed="false" 
    97 
    108source cascade-make/lib/cascade-lib.bash 
     
    3331      fi 
    3432  fi 
    35  
    36   if [ -e $GEXTAMP/packages/CASCADE-MAKE/MYSQL.sh ] ; then 
    37     echo "The MySQL extension extension has already been acquired" 
    38   else 
    39     echo "Attempting to acquire the MySQL extension ..." 
    40     if [ -e ../mysql ] ; then 
    41       cp ../mysql/packages/mysql-*.tar.gz packages/. && cp ../mysql/packages/CASCADE-MAKE/MYSQL.sh packages/CASCADE-MAKE/.  
    42        
    43       if [ $? != "0" ] ; then 
    44         echo "FAILED -- There was an error copying the necessary files" 
    45         failed="true" 
    46       else 
    47         echo "SUCCESS!" 
    48       fi  
    49     else  
    50       echo "FAILED -- The MySQL extension does not exist, please check it out into the extension directory by typing " 
    51       echo "svn co http://svn.greenstone.org/gs2-extensions/mysql-src/trunk mysql" 
    52       failed="true" 
     33   
     34  export COMPILE_UP_MYSQL=1 
     35  if [ -n "$GEXTMYSQL" ] ; then 
     36    if [ -e "$GEXTMYSQL/$GSDLOS" ] ; then 
     37      export COMPILE_UP_MYSQL=0      
     38      source $GEXTMYSQL/setup.bash 
    5339    fi 
    5440  fi 
     
    6248  fi 
    6349 
    64   if [ $failed = "true" ] ; then 
    65     echo "+Your environment was not successfully setup for $extdesc to Greenstone"     
    66     GEXTAMP= 
    67   else 
    68     echo "+Your environment is now setup for $extdesc to Greenstone" 
    69   fi 
     50  echo "+Your environment is now setup for $extdesc to Greenstone" 
    7051else 
    7152  echo "+Your environment is already setup for $extdesc to Greenstone"