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
* make sure .bat files are crlf

PR-URL: https://github.com/iojs/io.js/pull/291
Reviewed-By: Bert Belder <bertbelder@gmail.com>
Reviewed-By: Nikolai Vavilov <vvnicholas@gmail.com>
This commit is contained in:
Rod Vagg 2015-01-11 05:49:45 +00:00
parent dd260d2152
commit 43e4c906e2
6 changed files with 43 additions and 42 deletions

1
.gitattributes vendored
View File

@ -1 +1,2 @@
test/fixtures/* -text test/fixtures/* -text
*.bat text eol=crlf

View File

@ -50,14 +50,14 @@ BEGIN
BEGIN BEGIN
BLOCK "040904b0" BLOCK "040904b0"
BEGIN BEGIN
VALUE "CompanyName", "Joyent, Inc" VALUE "CompanyName", "io.js"
VALUE "ProductName", "Node.js" VALUE "ProductName", "io.js"
VALUE "FileDescription", "Node.js: Evented I/O for V8 JavaScript" VALUE "FileDescription", "io.js: Server-side JavaScript"
VALUE "FileVersion", NODE_VERSION_STRING VALUE "FileVersion", "NODE_VERSION_STRING"
VALUE "ProductVersion", NODE_VERSION_STRING VALUE "ProductVersion", "NODE_VERSION_STRING"
VALUE "OriginalFilename", "iojs.exe" VALUE "OriginalFilename", "iojs.exe"
VALUE "InternalName", "node" VALUE "InternalName", "iojs"
VALUE "LegalCopyright", "Copyright Joyent, Inc. and other Node contributors. MIT license." VALUE "LegalCopyright", "Copyright io.js contributors. MIT license."
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"

View File

@ -6,7 +6,7 @@
<ProductVersion>3.5</ProductVersion> <ProductVersion>3.5</ProductVersion>
<ProjectGuid>{1d808ff0-b5a9-4be9-859d-b334b6f48be2}</ProjectGuid> <ProjectGuid>{1d808ff0-b5a9-4be9-859d-b334b6f48be2}</ProjectGuid>
<SchemaVersion>2.0</SchemaVersion> <SchemaVersion>2.0</SchemaVersion>
<OutputName>node-v$(NodeVersion)-$(Platform)</OutputName> <OutputName>iojs-v$(NodeVersion)-$(Platform)</OutputName>
<OutputType>Package</OutputType> <OutputType>Package</OutputType>
<EnableProjectHarvesting>True</EnableProjectHarvesting> <EnableProjectHarvesting>True</EnableProjectHarvesting>
<WixTargetsPath Condition=" '$(WixTargetsPath)' == '' AND '$(MSBuildExtensionsPath32)' != '' ">$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath> <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' AND '$(MSBuildExtensionsPath32)' != '' ">$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>

View File

@ -2,11 +2,11 @@
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
xmlns:util="http://schemas.microsoft.com/wix/UtilExtension"> xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
<?define ProductName = "Node.js" ?> <?define ProductName = "io.js" ?>
<?define ProductDescription = "Node.js" ?> <?define ProductDescription = "io.js" ?>
<?define ProductAuthor = "Joyent, Inc. and other Node contributors" ?> <?define ProductAuthor = "io.js contributors" ?>
<?define RegistryKeyPath = "SOFTWARE\Node.js" ?> <?define RegistryKeyPath = "SOFTWARE\io.js" ?>
<?define RepoDir="$(var.ProjectDir)..\..\..\" ?> <?define RepoDir="$(var.ProjectDir)..\..\..\" ?>
<?define SourceDir="$(var.RepoDir)\$(var.Configuration)\" ?> <?define SourceDir="$(var.RepoDir)\$(var.Configuration)\" ?>
@ -23,11 +23,11 @@
<Media Id="1" Cabinet="media1.cab" EmbedCab="yes"/> <Media Id="1" Cabinet="media1.cab" EmbedCab="yes"/>
<MajorUpgrade AllowSameVersionUpgrades="yes" <MajorUpgrade AllowSameVersionUpgrades="yes"
DowngradeErrorMessage="A later version of node.js is already installed. Setup will now exit."/> DowngradeErrorMessage="A later version of io.js is already installed. Setup will now exit."/>
<Icon Id="NodeIcon" SourceFile="$(var.RepoDir)\src\res\node.ico"/> <Icon Id="NodeIcon" SourceFile="$(var.RepoDir)\src\res\node.ico"/>
<Property Id="ARPPRODUCTICON" Value="NodeIcon"/> <Property Id="ARPPRODUCTICON" Value="NodeIcon"/>
<Property Id="ApplicationFolderName" Value="nodejs"/> <Property Id="ApplicationFolderName" Value="iojs"/>
<Property Id="WIXUI_INSTALLDIR" Value="INSTALLDIR"/> <Property Id="WIXUI_INSTALLDIR" Value="INSTALLDIR"/>
<Property Id="INSTALLDIR"> <Property Id="INSTALLDIR">
@ -40,8 +40,8 @@
<Feature Id="NodeRuntime" <Feature Id="NodeRuntime"
Level="1" Level="1"
Title="Node.js runtime" Title="io.js runtime"
Description="Install the core Node.js runtime (node.exe)." Description="Install the core io.js runtime (iojs.exe)."
Absent="disallow"> Absent="disallow">
<ComponentRef Id="NodeExecutable"/> <ComponentRef Id="NodeExecutable"/>
<ComponentRef Id="NodeVarsScript"/> <ComponentRef Id="NodeVarsScript"/>
@ -52,14 +52,14 @@
<Feature Id="NodePerfCtrSupport" <Feature Id="NodePerfCtrSupport"
Level="1" Level="1"
Title="Performance counters" Title="Performance counters"
Description="Installs support for Node.js-specific performance counters."> Description="Installs support for io.js-specific performance counters.">
<ComponentRef Id="NodePerfCtrSupport"/> <ComponentRef Id="NodePerfCtrSupport"/>
</Feature> </Feature>
<Feature Id="NodeEtwSupport" <Feature Id="NodeEtwSupport"
Level="1" Level="1"
Title="Event tracing (ETW)" Title="Event tracing (ETW)"
Description="Installs support for event tracing (ETW) events generated by Node.js."> Description="Installs support for event tracing (ETW) events generated by io.js.">
<ComponentRef Id="NodeEtwSupport"/> <ComponentRef Id="NodeEtwSupport"/>
</Feature> </Feature>
</Feature> </Feature>
@ -67,7 +67,7 @@
<Feature Id="npm" <Feature Id="npm"
Level="1" Level="1"
Title="npm package manager" Title="npm package manager"
Description="Install npm, the recommended package manager for Node.js."> Description="Install npm, the recommended package manager for io.js.">
<ComponentRef Id="NpmCmdScript"/> <ComponentRef Id="NpmCmdScript"/>
<ComponentRef Id="NpmBashScript"/> <ComponentRef Id="NpmBashScript"/>
<ComponentRef Id="NpmConfigurationFile"/> <ComponentRef Id="NpmConfigurationFile"/>
@ -78,18 +78,18 @@
<Feature Level="1" <Feature Level="1"
Id="DocumentationShortcuts" Id="DocumentationShortcuts"
Title="Online documentation shortcuts" Title="Online documentation shortcuts"
Description="Add start menu entries that link the the online documentation for Node.js $(var.ProductVersion) and the Node.js website."> Description="Add start menu entries that link the the online documentation for io.js $(var.ProductVersion) and the io.js website.">
<ComponentRef Id="DocumentationShortcuts"/> <ComponentRef Id="DocumentationShortcuts"/>
</Feature> </Feature>
<Feature Id="EnvironmentPath" <Feature Id="EnvironmentPath"
Level="1" Level="1"
Title="Add to PATH" Title="Add to PATH"
Description="Add Node, npm, and modules that were globally installed by npm to the PATH environment variable."> Description="Add io.js, npm, and modules that were globally installed by npm to the PATH environment variable.">
<Feature Id="EnvironmentPathNode" <Feature Id="EnvironmentPathNode"
Level="1" Level="1"
Title="Node and npm" Title="io.js and npm"
Description="Add Node and npm (if installed) to the PATH environment variable."> Description="Add io.js and npm (if installed) to the PATH environment variable.">
<ComponentRef Id="EnvironmentPathNode"/> <ComponentRef Id="EnvironmentPathNode"/>
</Feature> </Feature>
@ -103,11 +103,11 @@
<Directory Id="TARGETDIR" Name="SourceDir"> <Directory Id="TARGETDIR" Name="SourceDir">
<Directory Id="ProgramMenuFolder"> <Directory Id="ProgramMenuFolder">
<Directory Id="ApplicationProgramsFolder" Name="Node.js"/> <Directory Id="ApplicationProgramsFolder" Name="io.js"/>
</Directory> </Directory>
<Directory Id="$(var.ProgramFilesFolderId)"> <Directory Id="$(var.ProgramFilesFolderId)">
<Directory Id="INSTALLDIR" Name="nodejs"> <Directory Id="INSTALLDIR" Name="iojs">
</Directory> </Directory>
</Directory> </Directory>
</Directory> </Directory>
@ -152,17 +152,17 @@
Type="string" Type="string"
Value="$(var.ProductVersion)"/> Value="$(var.ProductVersion)"/>
<Shortcut Id="NodeVarsScriptShortcut" <Shortcut Id="NodeVarsScriptShortcut"
Name="Node.js command prompt" Name="io.js command prompt"
Target="[%ComSpec]" Target="[%ComSpec]"
Arguments='/k "[INSTALLDIR]nodevars.bat"' Arguments='/k "[INSTALLDIR]nodevars.bat"'
Show="normal" Show="normal"
WorkingDirectory="INSTALLDIR"/> WorkingDirectory="INSTALLDIR"/>
<Shortcut Id="NodeExecutableShortcut" <Shortcut Id="NodeExecutableShortcut"
Name="Node.js" Name="io.js"
Target="[INSTALLDIR]iojs.exe" Target="[INSTALLDIR]iojs.exe"
WorkingDirectory="INSTALLDIR"/> WorkingDirectory="INSTALLDIR"/>
<Shortcut Id="UninstallProduct" <Shortcut Id="UninstallProduct"
Name="Uninstall Node.js" Name="Uninstall io.js"
Target="[SystemFolder]msiexec.exe" Target="[SystemFolder]msiexec.exe"
Arguments="/x [ProductCode]"/> Arguments="/x [ProductCode]"/>
<RemoveFolder Id="RemoveApplicationProgramsFolder" <RemoveFolder Id="RemoveApplicationProgramsFolder"
@ -207,12 +207,12 @@
Value="1" Value="1"
KeyPath="yes"/> KeyPath="yes"/>
<util:InternetShortcut Id="WebsiteShortcut" <util:InternetShortcut Id="WebsiteShortcut"
Name="Node.js website" Name="io.js website"
Target="http://nodejs.org" Target="http://iojs.org"
Type="url"/> Type="url"/>
<util:InternetShortcut Id="DocsShortcut" <util:InternetShortcut Id="DocsShortcut"
Name="Node.js documentation" Name="io.js documentation"
Target="http://nodejs.org/dist/v$(var.ProductVersion)/docs/api/" Target="https://iojs.org/dist/v$(var.ProductVersion)/docs/api/"
Type="url"/> Type="url"/>
</Component> </Component>
</DirectoryRef> </DirectoryRef>
@ -293,7 +293,7 @@
<Publish Dialog="CustomizeDlg" Control="Back" Event="NewDialog" Value="InstallDirDlg" Order="2">NOT Installed</Publish> <Publish Dialog="CustomizeDlg" Control="Back" Event="NewDialog" Value="InstallDirDlg" Order="2">NOT Installed</Publish>
<Publish Dialog="CustomizeDlg" Control="Next" Event="NewDialog" Value="VerifyReadyDlg">1</Publish> <Publish Dialog="CustomizeDlg" Control="Next" Event="NewDialog" Value="VerifyReadyDlg">1</Publish>
<Property Id="WIXUI_EXITDIALOGOPTIONALTEXT" Value="Node.js has been successfully installed."/> <Property Id="WIXUI_EXITDIALOGOPTIONALTEXT" Value="io.js has been successfully installed."/>
</UI> </UI>
<UIRef Id="WixUI_Common"/> <UIRef Id="WixUI_Common"/>

View File

@ -1,24 +1,24 @@
@echo off @echo off
rem Ensure this Node.js and npm are first in the PATH rem Ensure this io.js and npm are first in the PATH
set PATH=%APPDATA%\npm;%~dp0;%PATH% set PATH=%APPDATA%\npm;%~dp0;%PATH%
setlocal enabledelayedexpansion setlocal enabledelayedexpansion
pushd "%~dp0" pushd "%~dp0"
rem Figure out the node version. rem Figure out the io.js version.
set print_version=.\iojs.exe -p -e "process.versions.node + ' (' + process.arch + ')'" set print_version=.\iojs.exe -p -e "process.versions.node + ' (' + process.arch + ')'"
for /F "usebackq delims=" %%v in (`%print_version%`) do set version=%%v for /F "usebackq delims=" %%v in (`%print_version%`) do set version=%%v
rem Print message. rem Print message.
if exist npm.cmd ( if exist npm.cmd (
echo Your environment has been set up for using Node.js !version! and npm. echo Your environment has been set up for using io.js !version! and npm.
) else ( ) else (
echo Your environment has been set up for using Node.js !version!. echo Your environment has been set up for using io.js !version!.
) )
popd popd
endlocal endlocal
rem If we're in the node.js directory, change to the user's home dir. rem If we're in the io.js directory, change to the user's home dir.
if "%CD%\"=="%~dp0" cd /d "%HOMEDRIVE%%HOMEPATH%" if "%CD%\"=="%~dp0" cd /d "%HOMEDRIVE%%HOMEPATH%"

View File

@ -130,7 +130,7 @@ if errorlevel 1 goto exit
@rem Skip signing if the `nosign` option was specified. @rem Skip signing if the `nosign` option was specified.
if defined nosign goto licensertf if defined nosign goto licensertf
signtool sign /a /d "Node.js" /t http://timestamp.globalsign.com/scripts/timestamp.dll Release\iojs.exe signtool sign /a /d "io.js" /t http://timestamp.globalsign.com/scripts/timestamp.dll Release\iojs.exe
if errorlevel 1 echo Failed to sign exe&goto exit if errorlevel 1 echo Failed to sign exe&goto exit
:licensertf :licensertf
@ -149,12 +149,12 @@ if not defined NIGHTLY goto msibuild
set NODE_VERSION=%NODE_VERSION%.%NIGHTLY% set NODE_VERSION=%NODE_VERSION%.%NIGHTLY%
:msibuild :msibuild
echo Building node-%NODE_VERSION% echo Building iojs-%NODE_VERSION%
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 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
if errorlevel 1 goto exit if errorlevel 1 goto exit
if defined nosign goto run if defined nosign goto run
signtool sign /a /d "Node.js" /t http://timestamp.globalsign.com/scripts/timestamp.dll Release\node-v%NODE_VERSION%-%msiplatform%.msi signtool sign /a /d "io.js" /t http://timestamp.globalsign.com/scripts/timestamp.dll Release\iojs-v%NODE_VERSION%-%msiplatform%.msi
if errorlevel 1 echo Failed to sign msi&goto exit if errorlevel 1 echo Failed to sign msi&goto exit
:run :run
@ -218,5 +218,5 @@ rem ***************
:getnodeversion :getnodeversion
set NODE_VERSION= set NODE_VERSION=
for /F "usebackq tokens=*" %%i in (`python "%~dp0tools\getnodeversion.py"`) do set NODE_VERSION=%%i for /F "usebackq tokens=*" %%i in (`python "%~dp0tools\getnodeversion.py"`) do set NODE_VERSION=%%i
if not defined NODE_VERSION echo Cannot determine current version of node.js & exit /b 1 if not defined NODE_VERSION echo Cannot determine current version of io.js & exit /b 1
goto :EOF goto :EOF