fix #178. Enable x64 of node.js

tjanczuk · Oct 11, 2012 · 19c7e46 · 19c7e46
1 parent 681cbc9
commit 19c7e46
Show file tree

Hide file tree

Showing 12 changed files with 9 additions and 70 deletions.
diff --git a/src/config/iisnode_dev_x64.xml b/src/config/iisnode_dev_x64.xml
@@ -30,7 +30,7 @@ Details at http://learn.iis.net/page.aspx/241/configuration-extensibility/
     <attribute name="node_env" type="string" expanded="true" defaultValue="%node_env%"/>
     <attribute name="asyncCompletionThreadCount" type="uint" defaultValue="0"/>
     <attribute name="nodeProcessCountPerApplication" type="uint" defaultValue="1"/>
-    <attribute name="nodeProcessCommandLine" type="string" expanded="true" defaultValue="&quot;%programfiles%\nodejs\node.exe&quot;"/>
+    <attribute name="nodeProcessCommandLine" type="string" expanded="true" defaultValue="node.exe"/>
     <attribute name="interceptor" type="string" expanded="true" defaultValue="&quot;%programfiles(x86)%\iisnode-dev\release\x64\interceptor.js&quot;" />
     <attribute name="maxConcurrentRequestsPerProcess" type="uint" allowInfitnite="true" defaultValue="1024"/>
     <attribute name="maxNamedPipeConnectionRetry" type="uint" defaultValue="100"/>

diff --git a/src/config/iisnode_dev_x86_on_x64.xml b/src/config/iisnode_dev_x86_on_x64.xml
@@ -30,7 +30,7 @@ Details at http://learn.iis.net/page.aspx/241/configuration-extensibility/
     <attribute name="node_env" type="string" expanded="true" defaultValue="%node_env%"/>
     <attribute name="asyncCompletionThreadCount" type="uint" defaultValue="0"/>
     <attribute name="nodeProcessCountPerApplication" type="uint" defaultValue="1"/>
-    <attribute name="nodeProcessCommandLine" type="string" expanded="true" defaultValue="&quot;%programfiles%\nodejs\node.exe&quot;"/>
+    <attribute name="nodeProcessCommandLine" type="string" expanded="true" defaultValue="node.exe"/>
     <attribute name="interceptor" type="string" expanded="true" defaultValue="&quot;%programfiles(x86)%\iisnode-dev\release\x86\interceptor.js&quot;" />
     <attribute name="maxConcurrentRequestsPerProcess" type="uint" allowInfitnite="true" defaultValue="1024"/>
     <attribute name="maxNamedPipeConnectionRetry" type="uint" defaultValue="100"/>

diff --git a/src/config/iisnode_dev_x86_on_x86.xml b/src/config/iisnode_dev_x86_on_x86.xml
@@ -30,7 +30,7 @@ Details at http://learn.iis.net/page.aspx/241/configuration-extensibility/
     <attribute name="node_env" type="string" expanded="true" defaultValue="%node_env%"/>
     <attribute name="asyncCompletionThreadCount" type="uint" defaultValue="0"/>
     <attribute name="nodeProcessCountPerApplication" type="uint" defaultValue="1"/>
-    <attribute name="nodeProcessCommandLine" type="string" expanded="true" defaultValue="&quot;%programfiles%\nodejs\node.exe&quot;"/>
+    <attribute name="nodeProcessCommandLine" type="string" expanded="true" defaultValue="node.exe"/>
     <attribute name="interceptor" type="string" expanded="true" defaultValue="&quot;%programfiles%\iisnode-dev\release\x86\interceptor.js&quot;" />
     <attribute name="maxConcurrentRequestsPerProcess" type="uint" allowInfitnite="true" defaultValue="1024"/>
     <attribute name="maxNamedPipeConnectionRetry" type="uint" defaultValue="100"/>

diff --git a/src/config/iisnode_express_schema.xml b/src/config/iisnode_express_schema.xml
@@ -30,7 +30,7 @@ Details at http://learn.iis.net/page.aspx/241/configuration-extensibility/
     <attribute name="node_env" type="string" expanded="true" defaultValue="%node_env%"/>
     <attribute name="asyncCompletionThreadCount" type="uint" defaultValue="0"/>
     <attribute name="nodeProcessCountPerApplication" type="uint" defaultValue="1"/>
-    <attribute name="nodeProcessCommandLine" type="string" expanded="true" defaultValue="&quot;%programfiles%\nodejs\node.exe&quot;"/>
+    <attribute name="nodeProcessCommandLine" type="string" expanded="true" defaultValue="node.exe"/>
     <attribute name="interceptor" type="string" expanded="true" defaultValue="&quot;%programfiles%\iisnode-express\interceptor.js&quot;" />
     <attribute name="maxConcurrentRequestsPerProcess" type="uint" allowInfitnite="true" defaultValue="1024"/>
     <attribute name="maxNamedPipeConnectionRetry" type="uint" defaultValue="100"/>

diff --git a/src/config/iisnode_express_schema_x64.xml b/src/config/iisnode_express_schema_x64.xml
@@ -30,7 +30,7 @@ Details at http://learn.iis.net/page.aspx/241/configuration-extensibility/
     <attribute name="node_env" type="string" expanded="true" defaultValue="%node_env%"/>
     <attribute name="asyncCompletionThreadCount" type="uint" defaultValue="0"/>
     <attribute name="nodeProcessCountPerApplication" type="uint" defaultValue="1"/>
-    <attribute name="nodeProcessCommandLine" type="string" expanded="true" defaultValue="&quot;%programfiles%\nodejs\node.exe&quot;"/>
+    <attribute name="nodeProcessCommandLine" type="string" expanded="true" defaultValue="node.exe"/>
     <attribute name="interceptor" type="string" expanded="true" defaultValue="&quot;%programfiles(x86)%\iisnode-express\interceptor.js&quot;" />
     <attribute name="maxConcurrentRequestsPerProcess" type="uint" allowInfitnite="true" defaultValue="1024"/>
     <attribute name="maxNamedPipeConnectionRetry" type="uint" defaultValue="100"/>

diff --git a/src/config/iisnode_schema.xml b/src/config/iisnode_schema.xml
@@ -30,7 +30,7 @@ Details at http://learn.iis.net/page.aspx/241/configuration-extensibility/
     <attribute name="node_env" type="string" expanded="true" defaultValue="%node_env%"/>
     <attribute name="asyncCompletionThreadCount" type="uint" defaultValue="0"/>
     <attribute name="nodeProcessCountPerApplication" type="uint" defaultValue="1"/>
-    <attribute name="nodeProcessCommandLine" type="string" expanded="true" defaultValue="&quot;%programfiles%\nodejs\node.exe&quot;"/>
+    <attribute name="nodeProcessCommandLine" type="string" expanded="true" defaultValue="node.exe"/>
     <attribute name="interceptor" type="string" expanded="true" defaultValue="&quot;%programfiles%\iisnode\interceptor.js&quot;" />
     <attribute name="maxConcurrentRequestsPerProcess" type="uint" allowInfitnite="true" defaultValue="1024"/>
     <attribute name="maxNamedPipeConnectionRetry" type="uint" defaultValue="100"/>

diff --git a/src/config/iisnode_schema_x64.xml b/src/config/iisnode_schema_x64.xml
@@ -30,7 +30,7 @@ Details at http://learn.iis.net/page.aspx/241/configuration-extensibility/
     <attribute name="node_env" type="string" expanded="true" defaultValue="%node_env%"/>
     <attribute name="asyncCompletionThreadCount" type="uint" defaultValue="0"/>
     <attribute name="nodeProcessCountPerApplication" type="uint" defaultValue="1"/>
-    <attribute name="nodeProcessCommandLine" type="string" expanded="true" defaultValue="&quot;%programfiles%\nodejs\node.exe&quot;"/>
+    <attribute name="nodeProcessCommandLine" type="string" expanded="true" defaultValue="node.exe"/>
     <attribute name="interceptor" type="string" expanded="true" defaultValue="&quot;%programfiles%\iisnode\interceptor.js&quot;" />
     <attribute name="maxConcurrentRequestsPerProcess" type="uint" allowInfitnite="true" defaultValue="1024"/>
     <attribute name="maxNamedPipeConnectionRetry" type="uint" defaultValue="100"/>

diff --git a/src/config/iisnode_schema_x64_wow.xml b/src/config/iisnode_schema_x64_wow.xml
@@ -30,7 +30,7 @@ Details at http://learn.iis.net/page.aspx/241/configuration-extensibility/
     <attribute name="node_env" type="string" expanded="true" defaultValue="%node_env%"/>
     <attribute name="asyncCompletionThreadCount" type="uint" defaultValue="0"/>
     <attribute name="nodeProcessCountPerApplication" type="uint" defaultValue="1"/>
-    <attribute name="nodeProcessCommandLine" type="string" expanded="true" defaultValue="&quot;%programfiles(x86)%\nodejs\node.exe&quot;"/>
+    <attribute name="nodeProcessCommandLine" type="string" expanded="true" defaultValue="node.exe"/>
     <attribute name="interceptor" type="string" expanded="true" defaultValue="&quot;%programfiles(x86)%\iisnode\interceptor.js&quot;" />
     <attribute name="maxConcurrentRequestsPerProcess" type="uint" allowInfitnite="true" defaultValue="1024"/>
     <attribute name="maxNamedPipeConnectionRetry" type="uint" defaultValue="100"/>

diff --git a/src/iisnode/cprotocolbridge.cpp b/src/iisnode/cprotocolbridge.cpp
@@ -164,8 +164,7 @@ BOOL CProtocolBridge::SendIisnodeError(IHttpContext* httpCtx, HRESULT hr)
 				"The iisnode module is unable to start the node.exe process. Make sure the node.exe executable is available "
 				"at the location specified in the <a href=""https://github.com/tjanczuk/iisnode/blob/master/src/samples/configuration/web.config"">"
 				"system.webServer/iisnode/@nodeProcessCommandLine</a> element of web.config. "
-				"By default node.exe is expected to be installed in %ProgramFiles%\\nodejs folder on x86 systems and "
-				"%ProgramFiles(x86)%\\nodejs folder on x64 systems.";
+				"By default node.exe is expected in one of the directories listed in the PATH environment variable.";
 
 		CProtocolBridge::SendSyncResponse(
 			httpCtx, 

diff --git a/src/setup/iisnode-express-msi/iisnode.wxs b/src/setup/iisnode-express-msi/iisnode.wxs
@@ -23,18 +23,6 @@
 
     <Property Id="ALLUSERS" Secure="yes"/>
 
-    <Property Id="NODEEXE32">
-      <DirectorySearch Id="NodeDir32" Path="[ProgramFilesFolder]nodejs">
-        <FileSearch Name="node.exe" />
-      </DirectorySearch>
-    </Property>
-
-    <Property Id="NODEEXE64">
-      <DirectorySearch Id="NodeDir64" Path="[ProgramFiles64Folder]nodejs">
-        <FileSearch Name="node.exe" />
-      </DirectorySearch>
-    </Property>
-
     <Property Id="APPCMDEXE">
       <DirectorySearch Id="IISExpressDir" Path="[ProgramFilesFolder]IIS Express">
         <FileSearch Name="appcmd.exe" />
@@ -56,14 +44,6 @@
     <Condition Message="IIS Express 7.x or later must be installed before iisnode for IIS Express 7.x installation.">
       <![CDATA[Installed or APPCMDEXE]]>
     </Condition>
-
-    <Condition Message="Node.js x64 is not found in the [ProgramFiles64Folder]\nodejs folder. Please install node.js x64 and restart this installer.">
-      <![CDATA[VersionNT64 and (Installed OR NODEEXE64)]]>
-    </Condition>
-
-    <Condition Message="Node.js x86 is not found in the [ProgramFilesFolder]\nodejs folder. Please install node.js x86 and restart this installer.">
-      <![CDATA[NOT(VersionNT64) and (Installed OR NODEEXE32)]]>
-    </Condition>
 
     <PropertyRef Id="WIX_DIR_COMMON_DOCUMENTS"/>
 

diff --git a/src/setup/iisnode-msi/customactions.wxi b/src/setup/iisnode-msi/customactions.wxi
@@ -106,21 +106,5 @@
                   Impersonate="no"/>
     <?endif?>
 
-    <?if $(var.isWin64) = "yes" ?>
-    <CustomAction Id="AddPermissionsToNodeExeForDefaultIISUser"
-                  ExeCommand="[System64Folder]icacls.exe &quot;[NODEEXE64]&quot; /grant IIS_IUSRS:rx"
-                  Directory="TARGETDIR"
-                  Execute="deferred"
-                  Return="check"
-                  Impersonate="no"/>
-    <?else?>
-    <CustomAction Id="AddPermissionsToNodeExeForDefaultIISUser"
-                  ExeCommand="[SystemFolder]icacls.exe &quot;[NODEEXE32]&quot; /grant IIS_IUSRS:rx"
-                  Directory="TARGETDIR"
-                  Execute="deferred"
-                  Return="check"
-                  Impersonate="no"/>
-    <?endif?>
-
   </Fragment>
 </Include>
diff --git a/src/setup/iisnode-msi/iisnode.wxs b/src/setup/iisnode-msi/iisnode.wxs
@@ -48,18 +48,6 @@
 
     <Property Id="ALLUSERS" Value="1" />
 
-    <Property Id="NODEEXE32">
-      <DirectorySearch Id="NodeDir32" Path="[ProgramFilesFolder]nodejs">
-        <FileSearch Name="node.exe" />
-      </DirectorySearch>
-    </Property>
-
-    <Property Id="NODEEXE64">
-      <DirectorySearch Id="NodeDir64" Path="[ProgramFiles64Folder]nodejs">
-        <FileSearch Name="node.exe" />
-      </DirectorySearch>
-    </Property>
-
     <Property Id="VCREDIST2012INSTALLED">
       <?if $(var.isWin64) = "yes"?>
       <RegistrySearch Id="VCRedist2012Search64" Root="HKLM" Key="Software\Wow6432Node\Microsoft\Windows\CurrentVersion\Uninstall\{15134cb0-b767-4960-a911-f2d16ae54797}" Name="Installed" Type="raw" />
@@ -84,14 +72,6 @@
       <![CDATA[IISMAJORVERSION >= "#7"]]>
     </Condition>
 
-    <Condition Message="Node.js x64 is not found in the [ProgramFiles64Folder]\nodejs folder. Please install node.js x64 and restart this installer.">
-      <![CDATA[Installed OR NOT(VersionNT64) OR NODEEXE64 OR WOW]]>
-    </Condition>
-
-    <Condition Message="Node.js x86 is not found in the [ProgramFilesFolder]\nodejs folder. Please install node.js x86 and restart this installer.">
-      <![CDATA[Installed OR (VersionNT64 and NOT(WOW)) OR NODEEXE32]]>
-    </Condition>
-
     <Directory Id="TARGETDIR" Name="SourceDir">
       <?if $(var.isWin64) = "yes" ?>
       <Directory Id="System64Folder" />
@@ -151,10 +131,6 @@
       <Custom Action="RollbackAddIisnodeModuleRegistration" After="RemoveIisnodeModuleRegistration">REMOVE&lt;>"ALL"</Custom>
       <Custom Action="UndoAddIisnodeModuleRegistration" After="RemoveIisnodeModuleRegistration">REMOVE="ALL"</Custom>
 
-      <!-- grant permissions for default IIS user to read and execute pre-installed node.exe -->
-
-      <Custom Action="AddPermissionsToNodeExeForDefaultIISUser" After="AddIisnodeModuleRegistration">REMOVE&lt;>"ALL"</Custom>
-
     </InstallExecuteSequence>
 
   </Product>