fix #281: enable 32 and 64 bit iisnode SxS on x64 machines

tjanczuk · Jun 11, 2013 · 203752c · 203752c
1 parent b95fcda
commit 203752c
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 95 deletions.
diff --git a/src/config/iisnode_schema_x64_wow.xml b/src/config/iisnode_schema_x64_wow.xml
diff --git a/src/iisnode/iisnode.vcxproj b/src/iisnode/iisnode.vcxproj
@@ -384,7 +384,6 @@ copy /y $(ProjectDir)\..\config\* $(ProjectDir)\..\..\build\$(Configuration)\$(P
     <None Include="..\config\iisnode_schema_x64.xml">
       <SubType>Designer</SubType>
     </None>
-    <None Include="..\config\iisnode_schema_x64_wow.xml" />
     <None Include="..\samples\configuration\hello.js" />
     <None Include="..\samples\configuration\iisnode.yml" />
     <None Include="..\samples\configuration\readme.htm">

diff --git a/src/iisnode/iisnode.vcxproj.filters b/src/iisnode/iisnode.vcxproj.filters
@@ -675,9 +675,6 @@
     <None Include="..\..\test\functional\www\124_node_config_override\iisnode.yml">
       <Filter>Tests\functional\www\124_node_config_override</Filter>
     </None>
-    <None Include="..\config\iisnode_schema_x64_wow.xml">
-      <Filter>Config</Filter>
-    </None>
     <None Include="..\scripts\interceptor.js">
       <Filter>Scripts</Filter>
     </None>

diff --git a/src/setup/iisnode-msi/customactions.wxi b/src/setup/iisnode-msi/customactions.wxi
@@ -54,13 +54,7 @@
 
     <?if $(var.isWin64) = "yes" ?>
     <CustomAction Id="AddIisnodeModuleRegistration"
-                  ExeCommand="[System64Folder]inetsrv\appcmd.exe install module /name:iisnode /image:&quot;[iisnoderootdir]iisnode.dll&quot; /preCondition:bitness64 /commit:apphost"
-                  Directory="TARGETDIR"
-                  Execute="deferred"
-                  Return="check"
-                  Impersonate="no"/>
-    <CustomAction Id="AddIisnodeModuleRegistrationWow"
-                  ExeCommand="[System64Folder]inetsrv\appcmd.exe install module /name:iisnode /image:&quot;[iisnoderootdirwow]iisnode.dll&quot; /preCondition:bitness32 /commit:apphost"
+                  ExeCommand="[System64Folder]inetsrv\appcmd.exe install module /name:iisnode /image:&quot;%programfiles%\iisnode\iisnode.dll&quot; /commit:apphost"
                   Directory="TARGETDIR"
                   Execute="deferred"
                   Return="check"

diff --git a/src/setup/iisnode-msi/iisnode.wxs b/src/setup/iisnode-msi/iisnode.wxs
@@ -62,15 +62,8 @@
 
     <Feature Id="iisnode4iis" Title="Hosting node.js applications in IIS 7.x" Level="1" Description="IIS 7.x native module for hosting node.js applications in IIS">
       <ComponentGroupRef Id="allfiles" />
-      <Condition Level="0">WOW</Condition>
-    </Feature>
-
-    <?if $(var.isWin64) = "yes" ?>
-    <Feature Id="iisnode4iiswow" Title="Hosting node.js applications in IIS 7.x in WOW mode" Level="1" Description="IIS 7.x native module for hosting node.js applications in IIS in WOW mode">
       <ComponentGroupRef Id="allfileswow" />
-      <Condition Level="0">NOT WOW</Condition>
     </Feature>
-    <?endif?>
 
     <?if $(var.ProjectName) = iisnode-msi-full ?>
     <WixVariable Id="WixUILicenseRtf" Value="$(var.ProjectDir)\License.rtf" />
@@ -104,12 +97,7 @@
 
       <!-- install/rollback/uninstall iisnode module -->
 
-      <?if $(var.isWin64) = "yes" ?>
-      <Custom Action="AddIisnodeModuleRegistration" After="RemoveIisnodeModuleRegistration">(REMOVE&lt;>"ALL") AND (NOT WOW)</Custom>      
-      <Custom Action="AddIisnodeModuleRegistrationWow" After="RemoveIisnodeModuleRegistration">(REMOVE&lt;>"ALL") AND WOW</Custom>
-      <?else?>
       <Custom Action="AddIisnodeModuleRegistration" After="RemoveIisnodeModuleRegistration">REMOVE&lt;>"ALL"</Custom>
-      <?endif?>
       <Custom Action="RollbackAddIisnodeModuleRegistration" After="RemoveIisnodeModuleRegistration">REMOVE&lt;>"ALL"</Custom>
       <Custom Action="UndoAddIisnodeModuleRegistration" After="RemoveIisnodeModuleRegistration">REMOVE="ALL"</Custom>
 

diff --git a/src/setup/iisnode-msi/iisnodefiles64wow.wxi b/src/setup/iisnode-msi/iisnodefiles64wow.wxi
@@ -23,17 +23,6 @@
       </Directory>
     </DirectoryRef>
   </Fragment>
-  <Fragment>
-    <DirectoryRef Id="inetsrvdirwow">
-        <Directory Id="dirC3B05243102F810BD3959CD3BA949E89" Name="config">
-          <Directory Id="dirC3B05243102F810BD3959CD3BA949E90" Name="schema">
-            <Component Win64="yes" Id="cmpBFBC3A88B5FB1B48E1CB3DBC62C46CAD" Guid="*">
-              <File Id="fil98FE22082D3964939C1CB4060FC2A0C7" KeyPath="yes" Source="$(var.wowsourcedir)\iisnode_schema_x64_wow.xml" Name="iisnode_schema.xml"/>
-            </Component>
-          </Directory>
-      </Directory>
-    </DirectoryRef>
-  </Fragment>
   <Fragment>
     <DirectoryRef Id="iisnoderootdirwow">
       <Component Win64="yes" Id="cmpF6505586D2A7DD2F0C68235A8CA281C6" Guid="*">
@@ -71,7 +60,6 @@
     <ComponentGroup Id="allfileswow">
       <ComponentRef Id="cmp1C33C88432AB7530411D254B8656120B"/>
       <ComponentRef Id="cmp1C33C88432AC7530411D254B8656120B" />
-      <ComponentRef Id="cmpBFBC3A88B5FB1B48E1CB3DBC62C46CAD" />
       <?if $(var.Configuration) = Debug ?>      
         <ComponentRef Id="cmpE429AFB5AD377FF35803A538B9BE37A8" />
       <?endif?>