Skip to content

Commit f78c97c

Browse files
rvaggrvagg
committed
src: rename node to io.js for Windows installer
* quote "NODE_VERSION_STRING" in node.rc to allow for complex version strings * change user-facing strings
1 parent f0c6fe5 commit f78c97c

File tree

6 files changed

+43
-42
lines changed

6 files changed

+43
-42
lines changed

‎.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
test/fixtures/* -text
2+
*.bat text eol=crlf

‎src/res/node.rc

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -50,14 +50,14 @@ BEGIN
5050
BEGIN
5151
BLOCK "040904b0"
5252
BEGIN
53-
VALUE "CompanyName", "Joyent, Inc"
54-
VALUE "ProductName", "Node.js"
55-
VALUE "FileDescription", "Node.js: Evented I/O for V8 JavaScript"
56-
VALUE "FileVersion", NODE_VERSION_STRING
57-
VALUE "ProductVersion", NODE_VERSION_STRING
53+
VALUE "CompanyName", "io.js"
54+
VALUE "ProductName", "io.js"
55+
VALUE "FileDescription", "io.js: Server-side JavaScript"
56+
VALUE "FileVersion", "NODE_VERSION_STRING"
57+
VALUE "ProductVersion", "NODE_VERSION_STRING"
5858
VALUE "OriginalFilename", "iojs.exe"
59-
VALUE "InternalName", "node"
60-
VALUE "LegalCopyright", "Copyright Joyent, Inc. and other Node contributors. MIT license."
59+
VALUE "InternalName", "iojs"
60+
VALUE "LegalCopyright", "Copyright io.js contributors. MIT license."
6161
END
6262
END
6363
BLOCK "VarFileInfo"

‎tools/msvs/msi/nodemsi.wixproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<ProductVersion>3.5</ProductVersion>
77
<ProjectGuid>{1d808ff0-b5a9-4be9-859d-b334b6f48be2}</ProjectGuid>
88
<SchemaVersion>2.0</SchemaVersion>
9-
<OutputName>node-v$(NodeVersion)-$(Platform)</OutputName>
9+
<OutputName>iojs-v$(NodeVersion)-$(Platform)</OutputName>
1010
<OutputType>Package</OutputType>
1111
<EnableProjectHarvesting>True</EnableProjectHarvesting>
1212
<WixTargetsPath Condition=" '$(WixTargetsPath)' == '' AND '$(MSBuildExtensionsPath32)' != '' ">$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>

‎tools/msvs/msi/product.wxs

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
33
xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
44

5-
<?define ProductName = "Node.js" ?>
6-
<?define ProductDescription = "Node.js" ?>
7-
<?define ProductAuthor = "Joyent, Inc. and other Node contributors" ?>
5+
<?define ProductName = "io.js" ?>
6+
<?define ProductDescription = "io.js" ?>
7+
<?define ProductAuthor = "io.js contributors" ?>
88

9-
<?define RegistryKeyPath = "SOFTWARE\Node.js" ?>
9+
<?define RegistryKeyPath = "SOFTWARE\io.js" ?>
1010

1111
<?define RepoDir="$(var.ProjectDir)..\..\..\" ?>
1212
<?define SourceDir="$(var.RepoDir)\$(var.Configuration)\" ?>
@@ -23,11 +23,11 @@
2323
<Media Id="1" Cabinet="media1.cab" EmbedCab="yes"/>
2424

2525
<MajorUpgrade AllowSameVersionUpgrades="yes"
26-
DowngradeErrorMessage="A later version of node.js is already installed. Setup will now exit."/>
26+
DowngradeErrorMessage="A later version of io.js is already installed. Setup will now exit."/>
2727

2828
<Icon Id="NodeIcon" SourceFile="$(var.RepoDir)\src\res\node.ico"/>
2929
<Property Id="ARPPRODUCTICON" Value="NodeIcon"/>
30-
<Property Id="ApplicationFolderName" Value="nodejs"/>
30+
<Property Id="ApplicationFolderName" Value="iojs"/>
3131
<Property Id="WIXUI_INSTALLDIR" Value="INSTALLDIR"/>
3232

3333
<Property Id="INSTALLDIR">
@@ -40,8 +40,8 @@
4040

4141
<Feature Id="NodeRuntime"
4242
Level="1"
43-
Title="Node.js runtime"
44-
Description="Install the core Node.js runtime (node.exe)."
43+
Title="io.js runtime"
44+
Description="Install the core io.js runtime (iojs.exe)."
4545
Absent="disallow">
4646
<ComponentRef Id="NodeExecutable"/>
4747
<ComponentRef Id="NodeVarsScript"/>
@@ -51,22 +51,22 @@
5151
<Feature Id="NodePerfCtrSupport"
5252
Level="1"
5353
Title="Performance counters"
54-
Description="Installs support for Node.js-specific performance counters.">
54+
Description="Installs support for io.js-specific performance counters.">
5555
<ComponentRef Id="NodePerfCtrSupport"/>
5656
</Feature>
5757

5858
<Feature Id="NodeEtwSupport"
5959
Level="1"
6060
Title="Event tracing (ETW)"
61-
Description="Installs support for event tracing (ETW) events generated by Node.js.">
61+
Description="Installs support for event tracing (ETW) events generated by io.js.">
6262
<ComponentRef Id="NodeEtwSupport"/>
6363
</Feature>
6464
</Feature>
6565

6666
<Feature Id="npm"
6767
Level="1"
6868
Title="npm package manager"
69-
Description="Install npm, the recommended package manager for Node.js.">
69+
Description="Install npm, the recommended package manager for io.js.">
7070
<ComponentRef Id="NpmCmdScript"/>
7171
<ComponentRef Id="NpmBashScript"/>
7272
<ComponentRef Id="NpmConfigurationFile"/>
@@ -76,18 +76,18 @@
7676
<Feature Level="1"
7777
Id="DocumentationShortcuts"
7878
Title="Online documentation shortcuts"
79-
Description="Add start menu entries that link the the online documentation for Node.js $(var.ProductVersion) and the Node.js website.">
79+
Description="Add start menu entries that link the the online documentation for io.js $(var.ProductVersion) and the io.js website.">
8080
<ComponentRef Id="DocumentationShortcuts"/>
8181
</Feature>
8282

8383
<Feature Id="EnvironmentPath"
8484
Level="1"
8585
Title="Add to PATH"
86-
Description="Add Node, npm, and modules that were globally installed by npm to the PATH environment variable.">
86+
Description="Add io.js, npm, and modules that were globally installed by npm to the PATH environment variable.">
8787
<Feature Id="EnvironmentPathNode"
8888
Level="1"
89-
Title="Node and npm"
90-
Description="Add Node and npm (if installed) to the PATH environment variable.">
89+
Title="io.js and npm"
90+
Description="Add io.js and npm (if installed) to the PATH environment variable.">
9191
<ComponentRef Id="EnvironmentPathNode"/>
9292
</Feature>
9393

@@ -101,11 +101,11 @@
101101

102102
<Directory Id="TARGETDIR" Name="SourceDir">
103103
<Directory Id="ProgramMenuFolder">
104-
<Directory Id="ApplicationProgramsFolder" Name="Node.js"/>
104+
<Directory Id="ApplicationProgramsFolder" Name="io.js"/>
105105
</Directory>
106106

107107
<Directory Id="$(var.ProgramFilesFolderId)">
108-
<Directory Id="INSTALLDIR" Name="nodejs">
108+
<Directory Id="INSTALLDIR" Name="iojs">
109109
</Directory>
110110
</Directory>
111111
</Directory>
@@ -150,17 +150,17 @@
150150
Type="string"
151151
Value="$(var.ProductVersion)"/>
152152
<Shortcut Id="NodeVarsScriptShortcut"
153-
Name="Node.js command prompt"
153+
Name="io.js command prompt"
154154
Target="[%ComSpec]"
155155
Arguments='/k "[INSTALLDIR]nodevars.bat"'
156156
Show="normal"
157157
WorkingDirectory="INSTALLDIR"/>
158158
<Shortcut Id="NodeExecutableShortcut"
159-
Name="Node.js"
159+
Name="io.js"
160160
Target="[INSTALLDIR]iojs.exe"
161161
WorkingDirectory="INSTALLDIR"/>
162162
<Shortcut Id="UninstallProduct"
163-
Name="Uninstall Node.js"
163+
Name="Uninstall io.js"
164164
Target="[SystemFolder]msiexec.exe"
165165
Arguments="/x [ProductCode]"/>
166166
<RemoveFolder Id="RemoveApplicationProgramsFolder"
@@ -195,12 +195,12 @@
195195
Value="1"
196196
KeyPath="yes"/>
197197
<util:InternetShortcut Id="WebsiteShortcut"
198-
Name="Node.js website"
199-
Target="http://nodejs.org"
198+
Name="io.js website"
199+
Target="http://iojs.org"
200200
Type="url"/>
201201
<util:InternetShortcut Id="DocsShortcut"
202-
Name="Node.js documentation"
203-
Target="http://nodejs.org/dist/v$(var.ProductVersion)/docs/api/"
202+
Name="io.js documentation"
203+
Target="https://iojs.org/dist/v$(var.ProductVersion)/docs/api/"
204204
Type="url"/>
205205
</Component>
206206
</DirectoryRef>
@@ -281,7 +281,7 @@
281281
<Publish Dialog="CustomizeDlg" Control="Back" Event="NewDialog" Value="InstallDirDlg" Order="2">NOT Installed</Publish>
282282
<Publish Dialog="CustomizeDlg" Control="Next" Event="NewDialog" Value="VerifyReadyDlg">1</Publish>
283283

284-
<Property Id="WIXUI_EXITDIALOGOPTIONALTEXT" Value="Node.js has been successfully installed."/>
284+
<Property Id="WIXUI_EXITDIALOGOPTIONALTEXT" Value="io.js has been successfully installed."/>
285285
</UI>
286286

287287
<UIRef Id="WixUI_Common"/>

‎tools/msvs/nodevars.bat

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
11
@echo off
22

3-
rem Ensure this Node.js and npm are first in the PATH
3+
rem Ensure this io.js and npm are first in the PATH
44
set PATH=%APPDATA%\npm;%~dp0;%PATH%
55

66
setlocal enabledelayedexpansion
77
pushd "%~dp0"
88

9-
rem Figure out the node version.
9+
rem Figure out the io.js version.
1010
set print_version=.\iojs.exe -p -e "process.versions.node + ' (' + process.arch + ')'"
1111
for /F "usebackq delims=" %%v in (`%print_version%`) do set version=%%v
1212

1313
rem Print message.
1414
if exist npm.cmd (
15-
echo Your environment has been set up for using Node.js !version! and npm.
15+
echo Your environment has been set up for using io.js !version! and npm.
1616
) else (
17-
echo Your environment has been set up for using Node.js !version!.
17+
echo Your environment has been set up for using io.js !version!.
1818
)
1919

2020
popd
2121
endlocal
2222

23-
rem If we're in the node.js directory, change to the user's home dir.
23+
rem If we're in the io.js directory, change to the user's home dir.
2424
if "%CD%\"=="%~dp0" cd /d "%HOMEDRIVE%%HOMEPATH%"

‎vcbuild.bat

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ if errorlevel 1 goto exit
130130
@rem Skip signing if the `nosign` option was specified.
131131
if defined nosign goto licensertf
132132

133-
signtool sign /a /d "Node.js" /t http://timestamp.globalsign.com/scripts/timestamp.dll Release\iojs.exe
133+
signtool sign /a /d "io.js" /t http://timestamp.globalsign.com/scripts/timestamp.dll Release\iojs.exe
134134
if errorlevel 1 echo Failed to sign exe&goto exit
135135

136136
:licensertf
@@ -149,12 +149,12 @@ if not defined NIGHTLY goto msibuild
149149
set NODE_VERSION=%NODE_VERSION%.%NIGHTLY%
150150

151151
:msibuild
152-
echo Building node-%NODE_VERSION%
152+
echo Building iojs-%NODE_VERSION%
153153
msbuild "%~dp0tools\msvs\msi\nodemsi.sln" /m /t:Clean,Build /p:Configuration=%config% /p:Platform=%msiplatform% /p:NodeVersion=%NODE_VERSION% %noetw_msi_arg% %noperfctr_msi_arg% /clp:NoSummary;NoItemAndPropertyList;Verbosity=minimal /nologo
154154
if errorlevel 1 goto exit
155155

156156
if defined nosign goto run
157-
signtool sign /a /d "Node.js" /t http://timestamp.globalsign.com/scripts/timestamp.dll Release\node-v%NODE_VERSION%-%msiplatform%.msi
157+
signtool sign /a /d "io.js" /t http://timestamp.globalsign.com/scripts/timestamp.dll Release\iojs-v%NODE_VERSION%-%msiplatform%.msi
158158
if errorlevel 1 echo Failed to sign msi&goto exit
159159

160160
:run
@@ -218,5 +218,5 @@ rem ***************
218218
:getnodeversion
219219
set NODE_VERSION=
220220
for /F "usebackq tokens=*" %%i in (`python "%~dp0tools\getnodeversion.py"`) do set NODE_VERSION=%%i
221-
if not defined NODE_VERSION echo Cannot determine current version of node.js & exit /b 1
221+
if not defined NODE_VERSION echo Cannot determine current version of io.js & exit /b 1
222222
goto :EOF

0 commit comments

Comments
 (0)