Permalink
Browse files

installer: fix installers for node.js rename

This commit completes the io.js to Node.js rename in the
Windows installer.

Fixes: #2418
PR-URL: #2367
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: João Reis <reis@janeasystems.com>
  • Loading branch information...
fhemberger authored and cjihrig committed Aug 20, 2015
1 parent a69ab27 commit 45a2046f5d73c019978d3659706367b7d28f0279
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
@@ -132,17 +132,6 @@ def files(action):
exeext = '.exe' if is_windows else ''
action(['out/Release/node' + exeext], 'bin/node' + exeext)
- if not is_windows:
- # Install iojs -> node compatibility symlink.
- link_target = 'bin/node'
- link_path = abspath(install_path, link_target)
- if action == uninstall:
- action([link_path], link_target)
- elif action == install:
- try_symlink('iojs', link_path)
- else:
- assert(0) # Unhandled action type.
-
if 'true' == variables.get('node_use_dtrace'):
action(['out/Release/node.d'], 'lib/dtrace/node.d')
@@ -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>
@@ -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>
View
@@ -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)"
@@ -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>
@@ -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' />
@@ -279,9 +259,6 @@
Return="check" />
<InstallExecuteSequence>
- <Custom Action="LinkNodeExeToIojsExe" After="InstallFiles">
- $NodeAlias = 3
- </Custom>
<Custom Action='BroadcastEnvironmentUpdate' After='InstallFinalize'/>
</InstallExecuteSequence>
@@ -1,8 +1,8 @@
<pkmkdoc spec="1.12">
<properties>
<title>Node.js</title>
- <build>/Users/iojs/Desktop/iojs.pkg</build>
- <organization>org.iojs</organization>
+ <build>/Users/nodejs/Desktop/node.pkg</build>
+ <organization>org.nodejs</organization>
<userSees ui="both"/>
<min-target os="3"/>
<domain system="true"/>
@@ -13,10 +13,10 @@
</distribution>
<contents>
<choice title="Node.js" id="choice1" starts_selected="true" starts_enabled="true" starts_hidden="false">
- <pkgref id="org.iojs.iojs.pkg"/>
+ <pkgref id="org.nodejs.pkg"/>
</choice>
<choice title="npm" id="choice2" starts_selected="true" starts_enabled="true" starts_hidden="false">
- <pkgref id="org.iojs.npm.pkg"/>
+ <pkgref id="org.nodejs.node.npm.pkg"/>
</choice>
</contents>
<resources bg-scale="none" bg-align="topleft">
@@ -28,16 +28,14 @@
{\colortbl;\red255\green255\blue255;}
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural
-\f0\fs26 \cf0 This package will install Node.js {iojsversion} and npm {npmversion} into /usr/local/. The binary /usr/local/bin/iojs will also be symlinked as /usr/local/bin/node.}]]></resource>
+\f0\fs26 \cf0 This package will install Node.js {nodeversion} and npm {npmversion} into /usr/local/.}]]></resource>
<resource mime-type="text/rtf" kind="embedded" type="conclusion"><![CDATA[{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360
{\fonttbl\f0\fnil\fcharset0 LucidaGrande;}
{\colortbl;\red255\green255\blue255;}
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural
\f0\fs26 \cf0 Node.js was installed at\
\
- /usr/local/bin/iojs\
-and symlinked at\
/usr/local/bin/node\
\
npm was installed at\

0 comments on commit 45a2046

Please sign in to comment.