Show
Ignore:
Timestamp:
04.06.2010 15:18:02 (9 years ago)
Author:
sjm84
Message:

Added the cascade make external

Location:
gs2-extensions/gsdl-amp/trunk
Files:
7 modified

Legend:

Unmodified
Added
Removed
  • gs2-extensions/gsdl-amp/trunk

    • Property svn:externals set to
  • gs2-extensions/gsdl-amp/trunk/packages/CASCADE-MAKE.sh

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

    r16729 r22234  
    11#!/bin/bash 
    22 
    3 package=apache 
    4 version=_1.3.41 
     3package=httpd 
     4version=-2.2.15 
    55 
    66progname=$0 
     
    1111prefix=$GEXTAMP_INSTALLED 
    1212 
    13 opt_run_untar $force_untar $auto_untar $package $version 
    14 opt_run_configure $force_config $auto_config $package $version "$prefix" \ 
    15   --with-layout=Apache  
     13if [ $COMPILE_UP_APACHE_HTTPD = "1" ] ; then 
     14  opt_run_untar $force_untar $auto_untar $package $version 
     15  opt_run_configure $force_config $auto_config $package $version "$prefix" \ 
     16    "--with-layout=Apache \ 
     17     --enable-so" 
    1618 
     19  opt_run_make $compile   $package $version 
     20  opt_run_make $install   $package $version "install" 
     21  opt_run_make $clean     $package $version "clean" 
     22  opt_run_make $distclean $package $version "distclean" 
    1723 
    18  
    19  
    20  
     24  opt_run_tarclean $tarclean $package $version 
     25else 
     26  echo "Using Apache HTTPD that is provided externally to the extension at:" 
     27  echo "  $APACHE_HTTPD_HOME" 
     28  echo "" 
     29fi 
  • gs2-extensions/gsdl-amp/trunk/packages/CASCADE-MAKE/APACHE-PASS2.sh

    r16728 r22234  
    11#!/bin/bash 
    22 
    3 package=apache 
    4 version=_1.3.41 
     3package=httpd 
     4version=-2.2.15 
    55 
    66progname=$0 
  • gs2-extensions/gsdl-amp/trunk/packages/CASCADE-MAKE/MYSQL.sh

    r16683 r22234  
    22 
    33package=mysql 
    4 version=-5.1.26-rc 
     4version=-5.1.47 
    55 
    66progname=$0 
  • gs2-extensions/gsdl-amp/trunk/packages/CASCADE-MAKE/PHP.sh

    r16721 r22234  
    22 
    33package=php 
    4 version=-5.2.6 
     4version=-5.3.2 
    55 
    6 apache_version=apache_1.3.41 
     6apache_version=httpd-2.2.15 
    77 
    88progname=$0 
     
    1818  "--with-mysql=$prefix \ 
    1919   --with-png-dir=$prefix \ 
    20    --with-apache=../$apache_version \ 
     20   --with-apxs2=$prefix/bin/apxs \ 
    2121   --with-gd" 
    2222 
     23# --with-apxs2 \ 
     24# --with-apache=../$apache_version \ 
    2325# --with-jpeg-dir=/usr/local/ --with-zlib- 
    2426 
  • gs2-extensions/gsdl-amp/trunk/setup.bash

    r16683 r22234  
    1616  fi 
    1717 
     18 
     19  export APACHE_HTTPD_HOME="$GEXTAMP_INSTALLED"; 
     20  export COMPILE_UP_APACHE_HTTPD=1 
     21 
     22  if [ -n "$GSDLHOME" ] ; then 
     23      # see if there is already an apache httpd we can use 
     24      # override default values if there is 
     25      if [ -e "$GSDLHOME/apache-httpd/$GSDLOS" ] ; then 
     26      export APACHE_HTTPD_HOME="$GSDLHOME/apache-httpd/$GSDLOS"; 
     27      export COMPILE_UP_APACHE_HTTPD=0 
     28      fi 
     29  if 
     30 
     31 
     32  extdir=${GEXTAMP##*/} 
     33 
    1834  if [ "x$GSDLEXTS" = "x" ] ; then 
    19     export GSDLEXTS=amp 
     35    export GSDLEXTS=$extdir 
    2036  else  
    21     export GSDLEXTS=$GSDLEXTS:amp 
     37    export GSDLEXTS=$GSDLEXTS:$extdir 
    2238  fi 
    2339