Changeset 24874 for main/trunk/greenstone2/gs2-web-server.bat

Timestamp:

2011-12-09T18:25:27+13:00 (12 years ago)

Author:

ak19

Message:

Third set of commits to do with the migration of cgi-bin into common-src, so that upon make install, common-src\cgi-bin will be installed in cgi-bin\GSDLOS(GSDLARCH). The first commit was of changes to files in cgi-bin itself. The second commit was moving cgi-bin. This one involves changes to all the files referring to cgi-bin where this needs to be changed to cgi-bin\OS_and_ARCH.

File:

• main/trunk/greenstone2/gs2-web-server.bat (modified) (1 diff)

main/trunk/greenstone2/gs2-web-server.bat

@@ -209 +209 @@
 ::echo port: %port%& echo conf: %conf%& echo.& echo.
 :: Do not remove the quotes around %* !!! It's what helps Server2.jar deal with spaces in configfile path
-"%JAVA_EXECUTABLE%" org.greenstone.server.Server2 "%GSDLHOME%" "%serverlang%" "%*"
-
+if not defined GSDLARCH "%JAVA_EXECUTABLE%" org.greenstone.server.Server2 "%GSDLHOME%" "%GSDLOS%" "%serverlang%" "%*"
+if defined GSDLARCH "%JAVA_EXECUTABLE%" org.greenstone.server.Server2 "%GSDLHOME%" "%GSDLOS%%GSDLARCH%" "%serverlang%" "%*"
 
 :: All params are stored in %* now. This batch script can be called from the commandline or from GLI