[Sashimi-commit] SF.net SVN: sashimi:[5069] branches/4-4/trans_proteomic_pipeline/ installer_win32/CheckWebServer.nsh

[<sla...@us...>]

Revision: 5069
          http://sashimi.svn.sourceforge.net/sashimi/?rev=5069&view=rev
Author:   slagelwa
Date:     2010-07-19 20:14:54 +0000 (Mon, 19 Jul 2010)

Log Message:
-----------
On 64 bit windows, the 32 bit version of programs are in %ProgramFiles(x86)%.  Since we happen to install a 32bit version of apache lets also check for it.

Modified Paths:
--------------
    branches/4-4/trans_proteomic_pipeline/installer_win32/CheckWebServer.nsh

Modified: branches/4-4/trans_proteomic_pipeline/installer_win32/CheckWebServer.nsh
===================================================================
--- branches/4-4/trans_proteomic_pipeline/installer_win32/CheckWebServer.nsh	2010-07-19 19:06:03 UTC (rev 5068)
+++ branches/4-4/trans_proteomic_pipeline/installer_win32/CheckWebServer.nsh	2010-07-19 20:14:54 UTC (rev 5069)
@@ -45,6 +45,7 @@
  
 	; no IIS found - do we have apache?
     CheckApache:
+
         ; first thing is to check the registry - presence of config files proves nothing, could be old
         ClearErrors
 		EnumRegKey $0 HKEY_LOCAL_MACHINE  "SOFTWARE\Apache Software Foundation\Apache" 0
@@ -85,6 +86,27 @@
 		FindFirst $0 $1 $ApacheConfFile
 		IfErrors 0 doConfigApache
 
+		; 32 bit Apache 2.0.x on 64 bit machines
+   	ClearErrors
+		ExpandEnvStrings $ApacheConfFile "%ProgramFiles(x86)%\Apache Group\Apache2\conf\httpd.conf"
+		ExpandEnvStrings $ApacheExe '"%ProgramFiles(x86)%\Apache Group\Apache2\bin\Apache.exe"'
+		FindFirst $0 $1 $ApacheConfFile
+		IfErrors 0 doConfigApache
+
+		; 32 bit Apache 2.2.x on 64 bit machines
+   	ClearErrors
+		ExpandEnvStrings $ApacheConfFile "%ProgramFiles(x86)%\Apache Software Foundation\Apache2.2\conf\httpd.conf"
+		ExpandEnvStrings $ApacheExe '"%ProgramFiles(x86)%\Apache Software Foundation\Apache2.2\bin\httpd.exe" -n Apache2.2'
+		FindFirst $0 $1 $ApacheConfFile
+		IfErrors 0 doConfigApache
+
+		; 32 bit Apache 2.3.x on 64 bit machines
+   	ClearErrors
+		ExpandEnvStrings $ApacheConfFile "%ProgramFiles(x86)%\Apache Software Foundation\Apache2.3\conf\httpd.conf"
+		ExpandEnvStrings $ApacheExe '"%ProgramFiles(x86)%\Apache Software Foundation\Apache2.3\bin\httpd.exe" -n Apache2.3'
+		FindFirst $0 $1 $ApacheConfFile
+		IfErrors 0 doConfigApache
+
 		; no Apache found
 		Goto NoWebServer
 
@@ -104,7 +126,7 @@
 If you are certain you have a webserver installed and have manually configured it as described in the links above, press No.$\r$\n$\r$\nInstall the Apache webserver now?"  IDNO done IDCANCEL abort
 		!insertmacro LogDetail "Installing Apache: please use the default options."
 		MessageBox MB_OK|MB_ICONINFORMATION "Ready to begin installing Apache: please use the default options.$\r$\n$\r$\n\
-(Please note that a newer version of the Apache webserver may be available; you may want to check the Apache website after the ${PRODUCT_NAME} installtion completes.)"
+(Please note that a newer version of the Apache webserver may be available; you may want to check the Apache website after the ${PRODUCT_NAME} installation completes.)"
 	    File "..\extern\apache-w32-2.2.8\apache.msi"
 		ExecWait 'MSIEXEC.EXE /I "$INSTDIR\apache.msi" ALLUSERS=1'
 	    ; Delete "apache.msi" ; don't delete - leave as cue (and tool) for uninstaller 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.