Changeset 24902 for main/trunk/greenstone2/gsicontrol.bat

Timestamp:

2011-12-15T14:40:07+13:00 (12 years ago)

Author:

ak19

Message:

GSDLARCH used in Windows makefiles (and gsicontrol.bat) when working out the cgi-bin path (now cgi-bin\GSDL_OS_ARCH) to install the binaries like library.cgi and oaiserver.cgi into.

File:

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

main/trunk/greenstone2/gsicontrol.bat

@@ -86 +86 @@
 echo.
 
-::set cgibin=cgi-bin
-::set cgibin=cgi-bin\windows
-set cgibin=cgi-bin\%GSDLOS%
+:: If %PROCESSOR_ARCHITECTURE% is x86, default the architecture to 32 bits, else 64.
+:: (Can't test for x64, since the 64 bit Win 7 here returns "AMD64" instead of "x64".)
+:: Then, if the svn version already uses just %GSDLOS% not %GSDLOS%%GSDLARCH%, 
+:: set GSDLARCH to the empty string. Same if %PROCESSOR_ARCHITECTURE% is empty.
+if "%PROCESSOR_ARCHITECTURE%" == "x86" (set GSDLARCH=32) else (set GSDLARCH=64)
+if "%PROCESSOR_ARCHITECTURE%" == "" set GSDLARCH=
+if exist "bin\windows" set GSDLARCH=
+set cgibin=cgi-bin\%GSDLOS%%GSDLARCH%
+::set cgibin=cgi-bin ::set cgibin=cgi-bin\windows
 
 if "%target%" == "web-start" goto start
@@ -335 +341 @@
 if exist "%GSDLHOME%\apache-httpd\%GSDLOS%\conf\httpd.conf" "%GSDLHOME%\bin\windows\stophttpd.exe" %GS2_APACHE_HTTPD_SIGNAL% SILENT
 echo Setting config file to use port %port%
-type "%GSDLHOME%\apache-httpd\%GSDLOS%\conf\httpd.conf.in" | %_sed% "s@\*\*GSDLOS\*\*@%GSDLOS%@g" | %_sed% "s@\*\*PORT\*\*@%port%@g" | %_sed% "s@\*\*CONNECTPERMISSION\*\*@%allowfromall%@g" | %_sed% "s@\*\*HOST_IP\*\*@%hostIP%@g" | %_sed% "s@\*\*HOSTS\*\*@%hosts%@g" | %_sed% "s@\*\*COLLECTHOME\*\*@%safecollectpath%@g" | %_sed% "s@\*\*GSDLHOME\*\*@%safepath%@g" | %_sed% "s@\*\*APACHE_HOME_OS\*\*@%safepath%\/apache-httpd\/%GSDLOS%@g" > "%GSDLHOME%\apache-httpd\%GSDLOS%\conf\httpd.conf"
+type "%GSDLHOME%\apache-httpd\%GSDLOS%\conf\httpd.conf.in" | %_sed% "s@\*\*GSDL_OS_ARCH\*\*@%GSDLOS%%GSDLARCH%@g" | %_sed% "s@\*\*PORT\*\*@%port%@g" | %_sed% "s@\*\*CONNECTPERMISSION\*\*@%allowfromall%@g" | %_sed% "s@\*\*HOST_IP\*\*@%hostIP%@g" | %_sed% "s@\*\*HOSTS\*\*@%hosts%@g" | %_sed% "s@\*\*COLLECTHOME\*\*@%safecollectpath%@g" | %_sed% "s@\*\*GSDLHOME\*\*@%safepath%@g" | %_sed% "s@\*\*APACHE_HOME_OS\*\*@%safepath%\/apache-httpd\/%GSDLOS%@g" > "%GSDLHOME%\apache-httpd\%GSDLOS%\conf\httpd.conf"
 echo Type '%0 web-start' to start the web server running on port %port%
 echo Done