Changeset 22237

Show
Ignore:
Timestamp:
04.06.2010 17:28:27 (9 years ago)
Author:
sjm84
Message:

Upgraded the technology used in this extension, also changed the apache building into a single pass rather than 2 passes

Location:
gs2-extensions/gsdl-amp/trunk
Files:
1 added
3 removed
6 modified

Legend:

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

    r16683 r22237  
    11#!/bin/bash 
    22 
    3 cd lib ; source cascade-lib.bash; cd .. 
     3cd cascade-make/lib ; source cascade-lib.bash; cd ../.. 
    44 
    55for d in packages ; do 
  • gs2-extensions/gsdl-amp/trunk/packages/CASCADE-MAKE.sh

    r22234 r22237  
    22 
    33 
    4 for d in MYSQL LIBPNG APACHE-PASS1 PHP  ; do 
     4for d in MYSQL LIBPNG APACHE PHP  ; do 
    55  echo "    Running CASCADE-MAKE/$d.sh $*" 
    66 
  • gs2-extensions/gsdl-amp/trunk/packages/CASCADE-MAKE/LIBPNG.sh

    r16721 r22237  
    66progname=$0 
    77 
    8 source ../bin/script/test-setup.bash 
    9 source ../lib/cascade-lib.bash 
     8source ../cascade-make/lib/cascade-lib.bash 
    109 
    1110prefix=$GEXTAMP_INSTALLED 
  • gs2-extensions/gsdl-amp/trunk/packages/CASCADE-MAKE/MYSQL.sh

    r22234 r22237  
    66progname=$0 
    77 
    8 source ../bin/script/test-setup.bash 
    9 source ../lib/cascade-lib.bash 
     8source ../cascade-make/lib/cascade-lib.bash 
    109 
    1110prefix=$GEXTAMP_INSTALLED 
  • gs2-extensions/gsdl-amp/trunk/packages/CASCADE-MAKE/PHP.sh

    r22234 r22237  
    88progname=$0 
    99 
    10 source ../bin/script/test-setup.bash 
    11 source ../lib/cascade-lib.bash 
     10source ../cascade-make/lib/cascade-lib.bash 
    1211 
    1312prefix=$GEXTAMP_INSTALLED 
     
    1514opt_run_untar $force_untar $auto_untar $package $version 
    1615 
    17 opt_run_configure $force_config $auto_config $package $version "$prefix" \ 
    18   "--with-mysql=$prefix \ 
    19    --with-png-dir=$prefix \ 
    20    --with-apxs2=$prefix/bin/apxs \ 
    21    --with-gd" 
    22  
    23 # --with-apxs2 \ 
    24 # --with-apache=../$apache_version \ 
    25 # --with-jpeg-dir=/usr/local/ --with-zlib- 
    26  
     16opt_run_configure $force_config $auto_config $package $version "$prefix" --with-mysql=$prefix --with-png-dir=$prefix --with-apxs2=$prefix/bin/apxs --with-gd 
    2717 
    2818opt_run_make $compile   $package $version 
     
    3222 
    3323opt_run_tarclean $tarclean $package $version 
    34  
    35  
    36  
  • gs2-extensions/gsdl-amp/trunk/setup.bash

    r22234 r22237  
    66if [ "x$GEXTAMP" = "x" ] ; then 
    77  export GEXTAMP=`pwd` 
    8   export GEXTAMP_INSTALLED=$GEXTAMP/installed 
     8  export GEXTAMP_INSTALLED=$GEXTAMP/installed/linux 
    99 
    1010  export PATH=$GEXTAMP_INSTALLED/bin:$PATH 
     
    2727      export COMPILE_UP_APACHE_HTTPD=0 
    2828      fi 
    29   if 
     29  fi 
    3030 
    3131