Changeset 21320

Timestamp:

2009-12-09T16:51:22+13:00 (14 years ago)

Author:

davidb

Message:

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

Location:

main/trunk/greenstone3

Files:

• gs3-setup.bat (modified) (1 diff)
• gs3-setup.sh (modified) (2 diffs)

main/trunk/greenstone3/gs3-setup.bat

@@ -52 +52 @@
 set GS_CP_SET=yes
 :skipSetCp
+
+:: ---- if gs2build is there, run its setup.bat file ----
+
+if exist gs2build\setup.bat (
+  echo.
+  echo Running gs2build\setup.bat
+  cd gs2build
+  call setup.bat 
+  cd ..
+)
+
+:: ---- Check for any setup files in ext or local folders ----
+if exist ext (
+    for /D %%e IN ("ext/*") do (
+        cd ext\%%e
+        if EXIST setup.bat call setup.bat
+        cd ..\..
+    )
+)
+
+
+if exist local\gs3-setup.bat (
+  echo.
+  echo Running local\gs3-setup.bat
+  cd local
+  call gs3-setup.bat 
+  cd ..
+)
 
 :: ---- Search for java ----

main/trunk/greenstone3/gs3-setup.sh

@@ -263 +263 @@
 setGS3ENV
 
+if test -e gs2build/setup.bash ; then 
+  echo ""
+  echo "Sourcing gs2build/setup.bash"
+  cd gs2build ; source setup.bash ; cd ..
+fi
+
 if test -e ext ; then
   for gsdl_ext in ext/* ; do
@@ -282 +288 @@
   fi
 
+  # Consider moving these into the local/gs3-setup.sh file
+
   PATH=$GSDL3SRCHOME/local/bin:$PATH
   export PATH