Changeset 24902

Show
Ignore:
Timestamp:
15.12.2011 14:40:07 (8 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.

Location:
main/trunk/greenstone2
Files:
5 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/common-src/cgi-bin/win32.mak

    r24880 r24902  
    3838DLLDEBUG = 0 
    3939 
     40CGIDIR="$(GSDLHOME)\cgi-bin\windows" 
     41!IF "$(PROCESSOR_ARCHITECTURE)"==""  
     42CGIDIR=$(GSDLHOME)\cgi-bin\windows 
     43!ELSE IF EXIST ("$(GSDLHOME)\bin\windows") 
     44CGIDIR=$(GSDLHOME)\cgi-bin\windows 
     45!ELSE IF "$(PROCESSOR_ARCHITECTURE)"=="x86"  
     46CGIDIR=$(GSDLHOME)\cgi-bin\windows32 
     47!ELSE 
     48CGIDIR=$(GSDLHOME)\cgi-bin\windows64 
     49!ENDIF 
    4050 
    41 all: 
    42     if not exist "$(GSDLHOME)\cgi-bin\windows" mkdir "$(GSDLHOME)\cgi-bin\windows"  
    43     for %%i in ("$(COMMON_DIR)\cgi-bin") do copy %%i "$(GSDLHOME)\cgi-bin\windows\." 
    44     for %%i in (Makefile.in Makefile win32.mak) do if exist "$(GSDLHOME)\cgi-bin\windows\%%i" del "$(GSDLHOME)\cgi-bin\windows\%%i"  
     51all:     
     52    if not exist "$(CGIDIR)" mkdir "$(CGIDIR)"  
     53    for %%i in ("$(COMMON_DIR)\cgi-bin") do copy %%i "$(CGIDIR)\." 
     54    for %%i in (Makefile.in Makefile win32.mak) do if exist "$(CGIDIR)\%%i" del "$(CGIDIR)\%%i"  
    4555 
    4656clean: 
    47     if exist "$(GSDLHOME)\cgi-bin\windows" rmdir /S "$(GSDLHOME)\cgi-bin\windows" 
     57    if exist "$(CGIDIR)" rmdir /S "$(CGIDIR)" 
    4858 
    4959install: 
  • main/trunk/greenstone2/gsicontrol.bat

    r24874 r24902  
    8686echo. 
    8787 
    88 ::set cgibin=cgi-bin 
    89 ::set cgibin=cgi-bin\windows 
    90 set cgibin=cgi-bin\%GSDLOS% 
     88:: If %PROCESSOR_ARCHITECTURE% is x86, default the architecture to 32 bits, else 64. 
     89:: (Can't test for x64, since the 64 bit Win 7 here returns "AMD64" instead of "x64".) 
     90:: Then, if the svn version already uses just %GSDLOS% not %GSDLOS%%GSDLARCH%,  
     91:: set GSDLARCH to the empty string. Same if %PROCESSOR_ARCHITECTURE% is empty. 
     92if "%PROCESSOR_ARCHITECTURE%" == "x86" (set GSDLARCH=32) else (set GSDLARCH=64) 
     93if "%PROCESSOR_ARCHITECTURE%" == "" set GSDLARCH= 
     94if exist "bin\windows" set GSDLARCH= 
     95set cgibin=cgi-bin\%GSDLOS%%GSDLARCH% 
     96::set cgibin=cgi-bin ::set cgibin=cgi-bin\windows 
    9197 
    9298if "%target%" == "web-start" goto start 
     
    335341if exist "%GSDLHOME%\apache-httpd\%GSDLOS%\conf\httpd.conf" "%GSDLHOME%\bin\windows\stophttpd.exe" %GS2_APACHE_HTTPD_SIGNAL% SILENT 
    336342echo Setting config file to use port %port% 
    337 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" 
     343type "%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" 
    338344echo Type '%0 web-start' to start the web server running on port %port% 
    339345echo Done 
  • main/trunk/greenstone2/runtime-src/packages/apache-httpd/windows-httpd.conf.in

    r24874 r24902  
    496496 
    497497 
    498   ScriptAlias /greenstone/cgi-bin "**GSDLHOME**/cgi-bin/**GSDLOS**" 
    499   <Directory "**GSDLHOME**/cgi-bin/**GSDLOS**"> 
     498  ScriptAlias /greenstone/cgi-bin "**GSDLHOME**/cgi-bin/**GSDL_OS_ARCH**" 
     499  <Directory "**GSDLHOME**/cgi-bin/**GSDL_OS_ARCH**"> 
    500500     Options None 
    501501     AllowOverride None 
  • main/trunk/greenstone2/runtime-src/src/oaiservr/win32.mak

    r24874 r24902  
    242242!ELSE 
    243243install: $(EXECUTABLE) 
     244!IF "$(PROCESSOR_ARCHITECTURE)"=="" 
    244245    copy $(EXECUTABLE) "$(GSDL_DIR)\cgi-bin\windows" 
     246!ELSE IF EXIST ("$(GSDL_DIR)\bin\windows")   
     247    copy $(EXECUTABLE) "$(GSDL_DIR)\cgi-bin\windows"     
     248!ELSE IF "$(PROCESSOR_ARCHITECTURE)"=="x86"  
     249    copy $(EXECUTABLE) "$(GSDL_DIR)\cgi-bin\windows32" 
     250!ELSE 
     251    copy $(EXECUTABLE) "$(GSDL_DIR)\cgi-bin\windows64" 
     252!ENDIF 
    245253!ENDIF 
    246254 
  • main/trunk/greenstone2/runtime-src/src/recpt/win32.mak

    r24874 r24902  
    384384!ELSE 
    385385install: $(EXECUTABLE) 
     386!IF "$(PROCESSOR_ARCHITECTURE)"==""  
    386387    copy $(EXECUTABLE) "$(GSDL_DIR)\cgi-bin\windows" 
     388!ELSE IF EXIST ("$(GSDL_DIR)\bin\windows") 
     389    copy $(EXECUTABLE) "$(GSDL_DIR)\cgi-bin\windows"     
     390!ELSE IF "$(PROCESSOR_ARCHITECTURE)"=="x86"  
     391    copy $(EXECUTABLE) "$(GSDL_DIR)\cgi-bin\windows32" 
     392!ELSE 
     393    copy $(EXECUTABLE) "$(GSDL_DIR)\cgi-bin\windows64" 
     394!ENDIF 
    387395!ENDIF 
    388396