Changeset 23987

Show
Ignore:
Timestamp:
04.05.2011 16:51:36 (9 years ago)
Author:
ak19
Message:

Bringing the windows scripts up to date with the linux scripts. Changes are still to do with moving resetting the server (and Greenstone) after moving Greenstone home. Now gs2-server can be launched as it is and will run from whichever folder GS is moved to, without having to explicitly call gsicontrol.bat's reset-gsdlhome target first.

Location:
main/trunk/greenstone2
Files:
2 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/gs2-web-server.bat

    r22990 r23987  
    235235 
    236236:runit  
     237:: whenever the server is started up, make sure gsdlhome is correct (in case the gs install was moved). 
     238:: In parallel with the linux equivalent script, redirect stdout into the void 
     239:: (If redirecting both stderr and stdout into the void, would need to use >nul 2>&1. See 
     240:: http://stackoverflow.com/questions/1420965/redirect-stdout-and-stderr-to-a-single-file-in-dos) 
     241call gsicontrol.bat reset-gsdlhome >nul 
     242 
    237243::echo port: %port%& echo conf: %conf%& echo.& echo. 
    238244:: "%JAVA_EXECUTABLE%" org.greenstone.server.Server2 "%GSDLHOME%" "%serverlang%" %* 
  • main/trunk/greenstone2/gsicontrol.bat

    r23974 r23987  
    44::set testdone=0 
    55set startdir=%CD% 
    6 ::cd /d "%~dp0" 
    7 if "%GSDLHOME%" == "" goto testgsdl 
    8 cd "%GSDLHOME%" 
     6cd /d "%~dp0" 
     7::we're now in the "%GSDLHOME%" folder 
     8call setup.bat  
    99 
    1010::set _sed="%GSDLHOME%\bin\windows\sed.exe" 
     
    206206if exist "%GSDLHOME%\%cgibin%\gsdlsite.cfg" goto cgimsg 
    207207echo Configuring %cgibin%\gsdlsite.cfg 
     208echo # **** This file is automatically generated, do not edit **** > "%cgibin%\gsdlsite.cfg" 
     209echo # For local customization of Greenstone, edit gsdlsite.cfg.in >> "%cgibin%\gsdlsite.cfg" 
     210echo. >> "%cgibin%\gsdlsite.cfg" 
    208211for /F "delims=*" %%T in ('"echo %GSDLHOME%| %_sed% s@\\@\\\\@g"') do set safepath=%%T 
    209 %_sed% "s@\*\*GSDLHOME\*\*@\"%safepath%\"@g" %cgibin%\gsdlsite.cfg.in > %cgibin%\gsdlsite.cfg    
     212%_sed% "s@\*\*GSDLHOME\*\*@\"%safepath%\"@g" "%cgibin%\gsdlsite.cfg.in" >> "%cgibin%\gsdlsite.cfg" 
    210213set safepath= 
    211214goto cgifin