Changeset 21320

Show
Ignore:
Timestamp:
09.12.2009 16:51:22 (10 years ago)
Author:
davidb
Message:

setup now automatically runs gs2build's setup file if the directory is present

Location:
main/trunk/greenstone3
Files:
2 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone3/gs3-setup.bat

    r20824 r21320  
    5252set GS_CP_SET=yes 
    5353:skipSetCp 
     54 
     55:: ---- if gs2build is there, run its setup.bat file ---- 
     56 
     57if exist gs2build\setup.bat ( 
     58  echo. 
     59  echo Running gs2build\setup.bat 
     60  cd gs2build 
     61  call setup.bat  
     62  cd .. 
     63) 
     64 
     65:: ---- Check for any setup files in ext or local folders ---- 
     66if exist ext ( 
     67    for /D %%e IN ("ext/*") do ( 
     68        cd ext\%%e 
     69        if EXIST setup.bat call setup.bat 
     70        cd ..\.. 
     71    ) 
     72) 
     73 
     74 
     75if exist local\gs3-setup.bat ( 
     76  echo. 
     77  echo Running local\gs3-setup.bat 
     78  cd local 
     79  call gs3-setup.bat  
     80  cd .. 
     81) 
    5482 
    5583:: ---- Search for java ---- 
  • main/trunk/greenstone3/gs3-setup.sh

    r20984 r21320  
    263263setGS3ENV 
    264264 
     265if test -e gs2build/setup.bash ; then  
     266  echo "" 
     267  echo "Sourcing gs2build/setup.bash" 
     268  cd gs2build ; source setup.bash ; cd .. 
     269fi 
     270 
    265271if test -e ext ; then 
    266272  for gsdl_ext in ext/* ; do 
     
    282288  fi 
    283289 
     290  # Consider moving these into the local/gs3-setup.sh file 
     291 
    284292  PATH=$GSDL3SRCHOME/local/bin:$PATH 
    285293  export PATH