summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorRod Vagg <rod@vagg.org>2015-01-11 05:49:45 +0000
committerRod Vagg <rod@vagg.org>2015-01-13 09:44:34 +1100
commit43e4c906e2272e2eee94ebb4c36d0ada0ae75f2a (patch)
tree86737610172185006e3188795775104abdc607a6 /tools
parentdd260d21521082fdc6d70da851e826b440b46b44 (diff)
downloadandroid-node-v8-43e4c906e2272e2eee94ebb4c36d0ada0ae75f2a.tar.gz
android-node-v8-43e4c906e2272e2eee94ebb4c36d0ada0ae75f2a.tar.bz2
android-node-v8-43e4c906e2272e2eee94ebb4c36d0ada0ae75f2a.zip
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>
Diffstat (limited to 'tools')
-rw-r--r--tools/msvs/msi/nodemsi.wixproj2
-rwxr-xr-xtools/msvs/msi/product.wxs50
-rw-r--r--tools/msvs/nodevars.bat10
3 files changed, 31 insertions, 31 deletions
diff --git a/tools/msvs/msi/nodemsi.wixproj b/tools/msvs/msi/nodemsi.wixproj
index 1059bccb22..f2caa1bb91 100644
--- a/tools/msvs/msi/nodemsi.wixproj
+++ b/tools/msvs/msi/nodemsi.wixproj
@@ -6,7 +6,7 @@
<ProductVersion>3.5</ProductVersion>
<ProjectGuid>{1d808ff0-b5a9-4be9-859d-b334b6f48be2}</ProjectGuid>
<SchemaVersion>2.0</SchemaVersion>
- <OutputName>node-v$(NodeVersion)-$(Platform)</OutputName>
+ <OutputName>iojs-v$(NodeVersion)-$(Platform)</OutputName>
<OutputType>Package</OutputType>
<EnableProjectHarvesting>True</EnableProjectHarvesting>
<WixTargetsPath Condition=" '$(WixTargetsPath)' == '' AND '$(MSBuildExtensionsPath32)' != '' ">$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
diff --git a/tools/msvs/msi/product.wxs b/tools/msvs/msi/product.wxs
index ea14943772..b05b04c845 100755
--- a/tools/msvs/msi/product.wxs
+++ b/tools/msvs/msi/product.wxs
@@ -2,11 +2,11 @@
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
- <?define ProductName = "Node.js" ?>
- <?define ProductDescription = "Node.js" ?>
- <?define ProductAuthor = "Joyent, Inc. and other Node contributors" ?>
+ <?define ProductName = "io.js" ?>
+ <?define ProductDescription = "io.js" ?>
+ <?define ProductAuthor = "io.js contributors" ?>
- <?define RegistryKeyPath = "SOFTWARE\Node.js" ?>
+ <?define RegistryKeyPath = "SOFTWARE\io.js" ?>
<?define RepoDir="$(var.ProjectDir)..\..\..\" ?>
<?define SourceDir="$(var.RepoDir)\$(var.Configuration)\" ?>
@@ -23,11 +23,11 @@
<Media Id="1" Cabinet="media1.cab" EmbedCab="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"/>
<Property Id="ARPPRODUCTICON" Value="NodeIcon"/>
- <Property Id="ApplicationFolderName" Value="nodejs"/>
+ <Property Id="ApplicationFolderName" Value="iojs"/>
<Property Id="WIXUI_INSTALLDIR" Value="INSTALLDIR"/>
<Property Id="INSTALLDIR">
@@ -40,8 +40,8 @@
<Feature Id="NodeRuntime"
Level="1"
- Title="Node.js runtime"
- Description="Install the core Node.js runtime (node.exe)."
+ Title="io.js runtime"
+ Description="Install the core io.js runtime (iojs.exe)."
Absent="disallow">
<ComponentRef Id="NodeExecutable"/>
<ComponentRef Id="NodeVarsScript"/>
@@ -52,14 +52,14 @@
<Feature Id="NodePerfCtrSupport"
Level="1"
Title="Performance counters"
- Description="Installs support for Node.js-specific performance counters.">
+ Description="Installs support for io.js-specific performance counters.">
<ComponentRef Id="NodePerfCtrSupport"/>
</Feature>
<Feature Id="NodeEtwSupport"
Level="1"
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"/>
</Feature>
</Feature>
@@ -67,7 +67,7 @@
<Feature Id="npm"
Level="1"
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="NpmBashScript"/>
<ComponentRef Id="NpmConfigurationFile"/>
@@ -78,18 +78,18 @@
<Feature Level="1"
Id="DocumentationShortcuts"
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"/>
</Feature>
<Feature Id="EnvironmentPath"
Level="1"
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"
Level="1"
- Title="Node and npm"
- Description="Add Node and npm (if installed) to the PATH environment variable.">
+ Title="io.js and npm"
+ Description="Add io.js and npm (if installed) to the PATH environment variable.">
<ComponentRef Id="EnvironmentPathNode"/>
</Feature>
@@ -103,11 +103,11 @@
<Directory Id="TARGETDIR" Name="SourceDir">
<Directory Id="ProgramMenuFolder">
- <Directory Id="ApplicationProgramsFolder" Name="Node.js"/>
+ <Directory Id="ApplicationProgramsFolder" Name="io.js"/>
</Directory>
<Directory Id="$(var.ProgramFilesFolderId)">
- <Directory Id="INSTALLDIR" Name="nodejs">
+ <Directory Id="INSTALLDIR" Name="iojs">
</Directory>
</Directory>
</Directory>
@@ -152,17 +152,17 @@
Type="string"
Value="$(var.ProductVersion)"/>
<Shortcut Id="NodeVarsScriptShortcut"
- Name="Node.js command prompt"
+ Name="io.js command prompt"
Target="[%ComSpec]"
Arguments='/k "[INSTALLDIR]nodevars.bat"'
Show="normal"
WorkingDirectory="INSTALLDIR"/>
<Shortcut Id="NodeExecutableShortcut"
- Name="Node.js"
+ Name="io.js"
Target="[INSTALLDIR]iojs.exe"
WorkingDirectory="INSTALLDIR"/>
<Shortcut Id="UninstallProduct"
- Name="Uninstall Node.js"
+ Name="Uninstall io.js"
Target="[SystemFolder]msiexec.exe"
Arguments="/x [ProductCode]"/>
<RemoveFolder Id="RemoveApplicationProgramsFolder"
@@ -207,12 +207,12 @@
Value="1"
KeyPath="yes"/>
<util:InternetShortcut Id="WebsiteShortcut"
- Name="Node.js website"
- Target="http://nodejs.org"
+ Name="io.js website"
+ Target="http://iojs.org"
Type="url"/>
<util:InternetShortcut Id="DocsShortcut"
- Name="Node.js documentation"
- Target="http://nodejs.org/dist/v$(var.ProductVersion)/docs/api/"
+ Name="io.js documentation"
+ Target="https://iojs.org/dist/v$(var.ProductVersion)/docs/api/"
Type="url"/>
</Component>
</DirectoryRef>
@@ -293,7 +293,7 @@
<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>
- <Property Id="WIXUI_EXITDIALOGOPTIONALTEXT" Value="Node.js has been successfully installed."/>
+ <Property Id="WIXUI_EXITDIALOGOPTIONALTEXT" Value="io.js has been successfully installed."/>
</UI>
<UIRef Id="WixUI_Common"/>
diff --git a/tools/msvs/nodevars.bat b/tools/msvs/nodevars.bat
index 2941b81be4..2b7915662e 100644
--- a/tools/msvs/nodevars.bat
+++ b/tools/msvs/nodevars.bat
@@ -1,24 +1,24 @@
@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%
setlocal enabledelayedexpansion
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 + ')'"
for /F "usebackq delims=" %%v in (`%print_version%`) do set version=%%v
rem Print message.
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 (
- 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
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%"