Changeset 28759 for main

Timestamp:

2013-12-12T14:43:31+13:00 (10 years ago)

Author:

kjdon

Message:

need to call the local setup.bat outside of setlocal commands, otherwise the environment variables aren't set properly. In particular, INCLUDE and LIB, which are needed for c++ compiling, are set by calling vcvarsall.bat in visual studio

File:

• main/trunk/greenstone2/setup.bat (modified) (2 diffs)

main/trunk/greenstone2/setup.bat

@@ -133 +133 @@
 
 :doneexts
+
+
+if exist "%GSDLHOME%\local\setup.bat" (
+    echo.
+    echo Running %GSDLHOME%\local\setup.bat
+    cd "%GSDLHOME%\local"
+    call setup.bat 
+    cd "%GSDLHOME%"
+)
+
 setlocal enabledelayedexpansion
+
+if exist "%GSDLHOME%\local" (
+  set PATH=!GSDLHOME!\local\bin;!PATH!
+)
 
 if exist "%GSDLHOME%\apache-httpd" (
@@ -139 +153 @@
   set PATH=!GSDLHOME!\apache-httpd\!GSDLOS!\bin;!PATH!
   set PATH=!GSDLHOME!\apache-httpd\!GSDLOS!\lib;!PATH!
-)
-
-if exist "%GSDLHOME%\local" (
-  if exist "!GSDLHOME!\local\setup.bat" (
-    echo.
-    echo Running !GSDLHOME!\local\setup.bat
-    cd "!GSDLHOME!\local"
-    call setup.bat 
-    cd "!GSDLHOME!"
-  )
-  set PATH=!GSDLHOME!\local\bin;!PATH!
 )