Skip to content

Commit

Permalink
win,msi: remove link node.exe to iojs.exe
Browse files Browse the repository at this point in the history
This reverts commit 42c31f4.
  • Loading branch information
joaocgreis committed Aug 18, 2015
1 parent 8dfedc7 commit e95970c
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 29 deletions.
3 changes: 0 additions & 3 deletions tools/msvs/msi/i18n/de-de.wxl
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@
<String Id="NodeRuntime_Title">Node.js-Laufzeitumgebung</String>
<String Id="NodeRuntime_Description">Installation der [ProductName]-Laufzeitumgebung (node.exe).</String>

<String Id="NodeAlias_Title">Verweis von node auf iojs</String>
<String Id="NodeAlias_Description">Erstelle node.exe als Verweis für iojs.exe.</String>

<String Id="NodePerfCtrSupport_Title">Performance Counter</String>
<String Id="NodePerfCtrSupport_Description">Installiert Unterstützung für [ProductName]-spezifische Performance Counter.</String>

Expand Down
3 changes: 0 additions & 3 deletions tools/msvs/msi/i18n/en-us.wxl
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@
<String Id="NodeRuntime_Title">Node.js runtime</String>
<String Id="NodeRuntime_Description">Install the core [ProductName] runtime (node.exe).</String>

<String Id="NodeAlias_Title">Alias node to iojs</String>
<String Id="NodeAlias_Description">Create node.exe as an alias for iojs.exe.</String>

<String Id="NodePerfCtrSupport_Title">Performance counters</String>
<String Id="NodePerfCtrSupport_Description">Installs support for [ProductName]-specific performance counters.</String>

Expand Down
23 changes: 0 additions & 23 deletions tools/msvs/msi/product.wxs
Original file line number Diff line number Diff line change
Expand Up @@ -49,13 +49,6 @@
<ComponentRef Id="AppData" />
<ComponentGroupRef Id="Product.Generated"/>

<Feature Id="NodeAlias"
Level="1"
Title="!(loc.NodeAlias_Title)"
Description="!(loc.NodeAlias_Description)">
<ComponentRef Id="NodeAlias"/>
</Feature>

<Feature Id="NodePerfCtrSupport"
Level="1"
Title="!(loc.NodePerfCtrSupport_Title)"
Expand Down Expand Up @@ -124,12 +117,6 @@
<File Id="node.exe" KeyPath="yes" Source="$(var.SourceDir)\node.exe"/>
</Component>

<Component Id="NodeAlias" Guid="fde09cce-a503-4409-a3c4-61ae2a5a5906">
<!-- Always remove node.exe. The hard link will be recreated by the
`LinkNodeExeToIojsExe` custom action whenever needed. -->
<RemoveFile Id="node.exe" Name="node.exe" On="both" />
</Component>

<Component Id="NodeVarsScript">
<File Id="nodevars.bat" KeyPath="yes" Source="$(var.RepoDir)\tools\msvs\nodevars.bat"/>
</Component>
Expand Down Expand Up @@ -262,13 +249,6 @@
</Component>
</DirectoryRef>

<CustomAction Id="LinkNodeExeToIojsExe"
FileKey="iojs.exe"
ExeCommand="-e &quot; require('fs').linkSync(process.execPath, require('path').resolve(process.execPath, '../node.exe')); &quot;"
Impersonate="no"
Execute="deferred"
Return="check" />

<Binary Id='BroadcastEnvironmentUpdate'
SourceFile='$(var.custom_actions.TargetDir)$(var.custom_actions.TargetName).dll' />

Expand All @@ -279,9 +259,6 @@
Return="check" />

<InstallExecuteSequence>
<Custom Action="LinkNodeExeToIojsExe" After="InstallFiles">
$NodeAlias = 3
</Custom>
<Custom Action='BroadcastEnvironmentUpdate' After='InstallFinalize'/>
</InstallExecuteSequence>

Expand Down

0 comments on commit e95970c

Please sign in to comment.