Changeset 21173


Ignore:
Timestamp:
2009-12-01T22:32:16+13:00 (12 years ago)
Author:
davidb
Message:

No longer have top level 'installed' folder.

Location:
gs2-extensions/gsdl-video/trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • gs2-extensions/gsdl-video/trunk/CASCADE-MAKE.bat

    r18996 r21173  
    1111)
    1212
     13if "x%$APACHE_HTTPD_HOME%" == "x" (
     14  set APACHE_HTTPD_HOME=%GSDLHOME%\apache-httpd\windows
     15)
     16
    1317if not exist "%GSDLHOME%\apache-httpd" (
    1418  REM ... and it also needs to have been configured with --enable-apache-httpd
    1519  REM This is because the entension needs to add mod_flvx to the web server
    1620
    17   echo Could not find the directory "%GSDLHOME%\apache-httpd"
    18   echo Has the main Greenstone been configure for this?
    19   echo e.g. nmake /f win32.mak APACHE_HTTPD=1 [... other options]
    20   exit ErrorExitNeg1
     21  echo Warning: Could not find the directory "%GSDLHOME%\apache-httpd"
     22  echo          Has the main Greenstone been configure for this?
     23  echo          e.g. nmake /f win32.mak APACHE_HTTPD=1 [... other options]
     24  echo.
     25  echo => Only the build-time code for the extension will be compiled
     26  set APACHE_HTTPD_HOME=
    2127)
    2228
     
    2834
    2935
    30 for /D %%d IN ("%GSDLOS%") do (
    31   if not exist "%GEXTVIDEO_INSTALLED%\%%d" (
    32     echo Creating %GEXTVIDEO_INSTALLED%\%%d
    33     mkdir "%GEXTVIDEO_INSTALLED%\%%d"
    34   )
     36echo "Test for directory in Windows might not be correct syntax!!"
     37if not exist "%GEXTVIDEO_INSTALLED%" (
     38  echo Creating %GEXTVIDEO_INSTALLED%
     39  mkdir "%GEXTVIDEO_INSTALLED%"
    3540)
    3641
    37 set dirlist=build-srcpack runtime-srcpack
     42set dirlist=build-srcpack
     43
     44if "x%APACHE_HTTPD_HOME%" != "x" (
     45  set dirlist=%dirlist% runtime-srcpack
     46)
     47
    3848if exist "devel-srcpack" (
    3949  set dirlist=%dirlist% devel-srcpack
  • gs2-extensions/gsdl-video/trunk/CASCADE-MAKE.sh

    r18953 r21173  
    99fi
    1010
    11 if [ ! -d "$GSDLHOME/apache-httpd" ] ; then
     11if [ -z $APACHE_HTTPD_HOME ] ; then
     12  export APACHE_HTTPD_HOME=$GSDLHOME/apache-httpd/$GSDLOS
     13fi
     14
     15if [ ! -d "$APACHE_HTTPD_HOME" ] ; then
    1216  # ... and it also needs to have been configured with --enable-apache-httpd
    1317  # This is because the entension needs to add mod_flvx to the web server
    1418
    15   echo "Could not find the directory \"$GSDLHOME/apache-httpd\""
    16   echo "Has the main Greenstone been configure for this? "
    17   echo "e.g. ./configure --enable-apache-httpd [... other options]"
    18   exit -1
     19  echo "Warning: Could not find the directory \"$APACHE_HTTPD_HOME\""
     20  echo "         Has the main Greenstone been configure for this? "
     21  echo "         e.g. ./configure --enable-apache-httpd [... other options]"
     22  echo ""
     23  echo "=> Only the build-time code for the extension will be compiled"
     24  export APACHE_HTTPD_HOME=
    1925fi
    2026
     
    2531# Guaranteed that GSDLOS has now been set
    2632
    27 for d in $GSDLOS ; do
    28   if [ ! -e $GEXTVIDEO_INSTALLED/$d ] ; then
    29     echo "Creating $GEXTVIDEO_INSTALLED/$d"
    30     mkdir $GEXTVIDEO_INSTALLED/$d
    31   fi
    32 done
     33if [ ! -e $GEXTVIDEO_INSTALLED ] ; then
     34  echo "Creating $GEXTVIDEO_INSTALLED"
     35  mkdir $GEXTVIDEO_INSTALLED
     36fi
    3337
    34 dirlist="build-srcpack runtime-srcpack"
     38dirlist="build-srcpack"
     39
     40if [ ! -z $APACHE_HTTPD_HOME ] ; then
     41  dirlist="$dirlist runtime-srcpack"
     42fi
     43
    3544if [ -e devel-srcpack ] ; then
    3645  dirlist="$dirlist devel-srcpack"
  • gs2-extensions/gsdl-video/trunk/setup.bash

    r18955 r21173  
    66if [ "x$GEXTVIDEO" = "x" ] ; then
    77  export GEXTVIDEO=`pwd`
    8   export GEXTVIDEO_INSTALLED=$GEXTVIDEO/installed
     8  export GEXTVIDEO_INSTALLED=$GEXTVIDEO/$GSDLOS
    99
    10   export PATH=$GEXTVIDEO_INSTALLED/$GSDLOS/bin:$PATH
     10  export PATH=$GEXTVIDEO_INSTALLED/bin:$PATH
    1111
    1212  if [ "x$LD_LIBRARY_PATH" = "x" ] ; then
    13     export LD_LIBRARY_PATH=$GEXTVIDEO_INSTALLED/$GSDLOS/lib
     13    export LD_LIBRARY_PATH=$GEXTVIDEO_INSTALLED/lib
    1414  else
    15     export LD_LIBRARY_PATH=$GEXTVIDEO_INSTALLED/$GSDLOS/lib:$LD_LIBRARY_PATH
     15    export LD_LIBRARY_PATH=$GEXTVIDEO_INSTALLED/lib:$LD_LIBRARY_PATH
     16  fi
     17  if [ "x$DYLD_LIBRARY_PATH" = "x" ] ; then
     18    export DYLD_LIBRARY_PATH=$GEXTVIDEO_INSTALLED/lib
     19  else
     20    export DYLD_LIBRARY_PATH=$GEXTVIDEO_INSTALLED/lib:$DYLD_LIBRARY_PATH
    1621  fi
    1722
    1823  if [ -e "devel-srcpack" ] ; then
    19     export LD_LIBRARY_PATH=$GEXTVIDEO_INSTALLED/devel/$GSDLOS/lib:$LD_LIBRARY_PATH
     24    export LD_LIBRARY_PATH=$GEXTVIDEO_INSTALLED/devel/lib:$LD_LIBRARY_PATH
     25    export DYLD_LIBRARY_PATH=$GEXTVIDEO_INSTALLED/devel/lib:$DYLD_LIBRARY_PATH
    2026  fi
    2127
  • gs2-extensions/gsdl-video/trunk/setup.bat

    r18983 r21173  
    1515:WinNT
    1616set GEXTVIDEO=%CD%
    17 set GEXTVIDEO_INSTALLED=%GEXTVIDEO%\installed
     17set GEXTVIDEO_INSTALLED=%GEXTVIDEO%\windows
    1818
    19 set PATH=%GEXTVIDEO_INSTALLED%\windows\bin;%PATH%
     19set PATH=%GEXTVIDEO_INSTALLED%\bin;%PATH%
    2020set GS_CP_SET=yes
    2121goto Success
     
    3030:Win95Env
    3131set GEXTVIDEO=%CD%
    32 set PATH="%GEXTVIDEO_INSTALLED%\windows\bin";"%PATH%"
     32set PATH="%GEXTVIDEO_INSTALLED%\bin";"%PATH%"
    3333set GS_CP_SET=yes
    3434goto Success
Note: See TracChangeset for help on using the changeset viewer.