Changeset 28759

Show
Ignore:
Timestamp:
12.12.2013 14:43:31 (6 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

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/setup.bat

    r27966 r28759  
    133133 
    134134:doneexts 
     135 
     136 
     137if exist "%GSDLHOME%\local\setup.bat" ( 
     138    echo. 
     139    echo Running %GSDLHOME%\local\setup.bat 
     140    cd "%GSDLHOME%\local" 
     141    call setup.bat  
     142    cd "%GSDLHOME%" 
     143) 
     144 
    135145setlocal enabledelayedexpansion 
     146 
     147if exist "%GSDLHOME%\local" ( 
     148  set PATH=!GSDLHOME!\local\bin;!PATH! 
     149) 
    136150 
    137151if exist "%GSDLHOME%\apache-httpd" ( 
     
    139153  set PATH=!GSDLHOME!\apache-httpd\!GSDLOS!\bin;!PATH! 
    140154  set PATH=!GSDLHOME!\apache-httpd\!GSDLOS!\lib;!PATH! 
    141 ) 
    142  
    143 if exist "%GSDLHOME%\local" ( 
    144   if exist "!GSDLHOME!\local\setup.bat" ( 
    145     echo. 
    146     echo Running !GSDLHOME!\local\setup.bat 
    147     cd "!GSDLHOME!\local" 
    148     call setup.bat  
    149     cd "!GSDLHOME!" 
    150   ) 
    151   set PATH=!GSDLHOME!\local\bin;!PATH! 
    152155) 
    153156