Skip to content
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
52 commits
Select commit Hold shift + click to select a range
92214cf
test: remove obsolete harmony flags
chrisdickinson May 5, 2015
dc94349
deps: update v8 to 4.3.61.21
chrisdickinson May 5, 2015
cba302f
doc: update v8 flags in man page
targos May 14, 2015
263b454
Revert "dns: remove AI_V4MAPPED hint flag on FreeBSD"
cjihrig Apr 29, 2015
d6a97eb
net: do not set V4MAPPED on FreeBSD
Mar 2, 2015
2a97fc8
deps: backport 7b24219346 from v8 upstream
rvagg May 27, 2015
804f3a0
buffer: allow ARGS_THIS to accept a name
trevnorris May 26, 2015
d6e8e37
buffer: implement Uint8Array backed Buffer
trevnorris May 26, 2015
f6d74da
buffer: finish implementing FreeCallback
trevnorris Jun 1, 2015
833377c
buffer: switch to using Maybe<T> API
trevnorris Jun 2, 2015
f41282f
buffer: switch API to return MaybeLocal<T>
trevnorris Jun 2, 2015
194f63e
buffer: make additional changes to native API
trevnorris Jun 2, 2015
c0d46a1
crypto: remove kMaxLength on randomBytes()
trevnorris Jun 2, 2015
450ba88
vm: fix property descriptors of sandbox properties
domenic May 22, 2015
5ca9579
vm: remove unnecessary access checks
domenic May 23, 2015
7767b9d
vm: fix symbol access
domenic Jun 1, 2015
5537c01
dgram: make send cb act as "error" event handler
chrisdickinson Jun 5, 2014
cb80141
dgram: make send cb act as "error" event handler
mcollina May 26, 2015
9f3946a
http_server: `prefinish` vs `finish`
indutny Apr 13, 2015
72b7f9d
buffer: fix case of one buffer passed to concat
thefourtheye Jun 10, 2015
093eae3
cluster: do not unconditionally set --debug-port
cjihrig Jun 11, 2015
271b706
buffer: fix usage of kMaxLength
trevnorris Jun 17, 2015
1baca79
buffer: minor cleanup from rebase
trevnorris Jun 17, 2015
d57350c
buffer: allow ArrayBuffer as Buffer argument
trevnorris Jun 17, 2015
d11d40f
deps: update v8 to 4.4.63.9
bnoordhuis Jun 19, 2015
84cef46
test: don't use arguments.callee
bnoordhuis Jun 19, 2015
b1570c5
test: remove two obsolete pummel tests
bnoordhuis Jun 19, 2015
2e53e03
buffer: rename internal/buffer_new.js to buffer.js
bnoordhuis Jun 19, 2015
31faa1b
node-gyp: make aware of nightly, next-nightly & rc
rvagg Jun 26, 2015
27cf131
node-gyp: download header tarball for compile
rvagg Jun 26, 2015
8f65dbb
Working on v3.0.0
rvagg Jun 30, 2015
bd51bc7
deps: upgrade v8 to 4.4.63.12
bnoordhuis Jul 1, 2015
35c7938
src: increment NODE_MODULE_VERSION to 45
rvagg Jul 2, 2015
df9cdd8
node: do not override `message`/`stack` of error
indutny Jul 5, 2015
fa5b871
http: use official IANA Status Codes
jomo Jul 11, 2015
b096278
src: introduce process.release object
rvagg Jan 18, 2015
6c97138
node-gyp: detect RC build with x.y.z-rc.n format
rvagg Jul 13, 2015
8d13222
buffer: fix not return on error
trevnorris Jul 22, 2015
be68537
build: first set of updates to enable PPC support
mhdawson Jul 7, 2015
606fdfa
build: add 'x86' option back in to configure
rvagg Jul 24, 2015
2f54e45
buffer: fix missing null/undefined check
trevnorris Jul 16, 2015
050ab42
node: remove redundant --use-old-buffer
rvagg Jul 30, 2015
c04c190
build: prepare Windows installer for i18n support
fhemberger Jul 25, 2015
fd8da09
readline: allow tabs in input
Trott May 21, 2015
d390a6f
http: fix agent.getName() and add tests
brendanashworth May 5, 2015
181c3bc
deps: update V8 to 4.4.63.26
targos Jul 27, 2015
fe22685
src: disable vector ICs on arm
targos Jul 30, 2015
40a9cae
doc: document repl persistent history changes
Fishrock123 Aug 4, 2015
8e5eae9
test: add tests for persistent repl history
Fishrock123 Aug 2, 2015
17c4108
repl: default persistence to ~/.node_repl_history
Fishrock123 Aug 4, 2015
f00e11b
repl: persist history in plain text
Fishrock123 Aug 3, 2015
966c977
2015-08-01 io.js v3.0.0 Release
rvagg Aug 1, 2015
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
build: prepare Windows installer for i18n support
PR-URL: #2247
Reviewed-By: Rod Vagg <rod@vagg.org>
  • Loading branch information
fhemberger authored and rvagg committed Aug 4, 2015
commit c04c1907bcaed31d1d4bfcd95ac5f4f77ab44e5e
5 changes: 0 additions & 5 deletions tools/msvs/msi/WixUI_en-us.wxl

This file was deleted.

41 changes: 41 additions & 0 deletions tools/msvs/msi/i18n/de-de.wxl
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
<?xml version="1.0" encoding="utf-8"?>
<WixLocalization Culture="de-de" xmlns="http://schemas.microsoft.com/wix/2006/localization">
<!-- See https://msdn.microsoft.com/en-us/goglobal/bb964664.aspx -->
<String Id="LocaleId">1031</String>

<String Id="WelcomeDlgDescription">Dieser Installationsassistent wird [ProductName] auf Ihrem Computer installieren.&#xD;&#xA;&#xD;&#xA;WARNUNG: Wenn Sie von [ProductName] v1.0.0 oder v1.0.1 aus updaten wollen, müssen Sie diese Versionen zuerst manuell deinstallieren.</String>
<String Id="InstallDirDlgDescription">Wählen Sie einen anderen Installationsort oder klicken Sie auf Weiter zum installieren.</String>

<String Id="MajorUpgrade_DowngradeErrorMessage">Eine neuere Version von [ProductName] ist bereits installiert. Der Installationsassistent wird jetzt geschlossen.</String>

<!-- References like [ProductName] or $(var.ProductName) don't seem to work in Title attributes -->
<String Id="NodeRuntime_Title">io.js-Laufzeitumgebung</String>
<String Id="NodeRuntime_Description">Installation der [ProductName]-Laufzeitumgebung (iojs.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>

<String Id="NodeEtwSupport_Title">Event Tracing (ETW)</String>
<String Id="NodeEtwSupport_Description">Installiert Unterstützung für Event Tracing (ETW)-Events, generiert von [ProductName].</String>

<String Id="npm_Title">npm-Paketmanager</String>
<String Id="npm_Description">Installiert npm, den empfohlenen Paketmanager für [ProductName].</String>

<String Id="DocumentationShortcuts_Title">Link zur Online-Dokumentation</String>
<String Id="DocumentationShortcuts_Description">Fügt Startmenü-Einträge zur Online-Dokumentation von [ProductName] [FullVersion] und zur [ProductName]-Website hinzu.</String>

<String Id="EnvironmentPath_Title">Hinzufügen zu PATH</String>
<String Id="EnvironmentPath_Description">Fügt [ProductName], npm und globale durch npm installierte Module zur PATH-Umgebungsvariable hinzu.</String>

<String Id="EnvironmentPathNode_Title">io.js und npm</String>
<String Id="EnvironmentPathNode_Description">Fügt [ProductName] und npm (falls installiert) zur PATH-Umgebungsvariable hinzu.</String>

<String Id="EnvironmentPathNpmModules_Title">npm-Module</String>
<String Id="EnvironmentPathNpmModules_Description">Fügt globale durch npm installierte Module zur PATH-Umgebungsvariable hinzu. Diese Option funktioniert nur für den aktuellen Benutzer, andere Benutzer müssen ihre PATH-Umgebungsvariable selbst manuell aktualisieren.</String>

<!-- References like [ProductName] are not resolved for Property tags -->
<String Id="WIXUI_EXITDIALOGOPTIONALTEXT">io.js wurde erfolgreich installiert.</String>
</WixLocalization>
41 changes: 41 additions & 0 deletions tools/msvs/msi/i18n/en-us.wxl
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
<?xml version="1.0" encoding="utf-8"?>
<WixLocalization Culture="en-us" xmlns="http://schemas.microsoft.com/wix/2006/localization">
<!-- See https://msdn.microsoft.com/en-us/goglobal/bb964664.aspx -->
<String Id="LocaleId">1033</String>

<String Id="WelcomeDlgDescription">The Setup Wizard will install [ProductName] on your computer.&#xD;&#xA;&#xD;&#xA;WARNING: if you're upgrading from [ProductName] v1.0.0 or v1.0.1, you must first uninstall these versions manually.</String>
<String Id="InstallDirDlgDescription">Choose a custom location or click Next to install.</String>

<String Id="MajorUpgrade_DowngradeErrorMessage">A later version of [ProductName] is already installed. Setup will now exit.</String>

<!-- References like [ProductName] or $(var.ProductName) don't seem to work in Title attributes -->
<String Id="NodeRuntime_Title">io.js runtime</String>
<String Id="NodeRuntime_Description">Install the core [ProductName] runtime (iojs.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>

<String Id="NodeEtwSupport_Title">Event tracing (ETW)</String>
<String Id="NodeEtwSupport_Description">Installs support for event tracing (ETW) events generated by [ProductName].</String>

<String Id="npm_Title">npm package manager</String>
<String Id="npm_Description">Install npm, the recommended package manager for [ProductName].</String>

<String Id="DocumentationShortcuts_Title">Online documentation shortcuts</String>
<String Id="DocumentationShortcuts_Description">Add start menu entries that link the the online documentation for [ProductName] [FullVersion] and the [ProductName] website.</String>

<String Id="EnvironmentPath_Title">Add to PATH</String>
<String Id="EnvironmentPath_Description">Add [ProductName], npm, and modules that were globally installed by npm to the PATH environment variable.</String>

<String Id="EnvironmentPathNode_Title">io.js and npm</String>
<String Id="EnvironmentPathNode_Description">Add [ProductName] and npm (if installed) to the PATH environment variable.</String>

<String Id="EnvironmentPathNpmModules_Title">npm modules</String>
<String Id="EnvironmentPathNpmModules_Description">Add modules that are installed globally by npm to the PATH environment variable. This option works for the current user only; other users need to update their PATH manually.</String>

<!-- References like [ProductName] are not resolved for Property tags -->
<String Id="WIXUI_EXITDIALOGOPTIONALTEXT">io.js has been successfully installed.</String>
</WixLocalization>
12 changes: 10 additions & 2 deletions tools/msvs/msi/nodemsi.wixproj
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,8 @@
</WixExtension>
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="WixUI_en-us.wxl" />
<!-- <EmbeddedResource Include="i18n\de-de.wxl" /> -->
<EmbeddedResource Include="i18n\en-us.wxl" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="custom_actions.vcxproj">
Expand All @@ -73,6 +74,13 @@
</Target>
<PropertyGroup>
<PostBuildEvent>move "!(TargetPath)" "$(TargetDir)\$(TargetFileName)"
move "!(TargetPdbPath)" "$(TargetDir)\$(TargetPdbName)"</PostBuildEvent>
move "!(TargetPdbPath)" "$(TargetDir)\$(TargetPdbName)"</PostBuildEvent>
<!--
<PostBuildEvent>
"$(WixToolPath)\torch.exe" -t language "$(TargetDir)en-US\$(TargetFileName)" "$(TargetDir)de-de\$(TargetFileName)" -out "$(TargetDir)transforms\de-de.mst"
cscript.exe "$(WindowsSDK80Path)bin\$(Platform)\WiSubStg.vbs" "$(TargetDir)en-US\$(TargetFileName)" "$(TargetDir)transforms\de-de.mst" 1031
cscript.exe "$(WindowsSDK80Path)bin\$(Platform)\WiLangId.vbs" "$(TargetDir)en-US\$(TargetFileName)" Package 1033,1031
</PostBuildEvent>
-->
</PropertyGroup>
</Project>
44 changes: 22 additions & 22 deletions tools/msvs/msi/product.wxs
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,17 @@

<Product Id="*"
Name="$(var.ProductName)"
Language="1033"
Language="!(loc.LocaleId)"
Version="$(var.ProductVersion)"
Manufacturer="$(var.ProductAuthor)"
UpgradeCode="47c07a3a-42ef-4213-a85d-8f5a59077c28">

<Package InstallerVersion="200" Compressed="yes"/>
<Package Languages="!(loc.LocaleId)" InstallerVersion="200" Compressed="yes"/>

<Media Id="1" Cabinet="media1.cab" EmbedCab="yes"/>

<MajorUpgrade AllowSameVersionUpgrades="yes"
DowngradeErrorMessage="A later version of io.js is already installed. Setup will now exit."/>
DowngradeErrorMessage="!(loc.MajorUpgrade_DowngradeErrorMessage)"/>

<Icon Id="NodeIcon" SourceFile="$(var.RepoDir)\src\res\iojs.ico"/>
<Property Id="ARPPRODUCTICON" Value="NodeIcon"/>
Expand All @@ -40,8 +40,8 @@

<Feature Id="NodeRuntime"
Level="1"
Title="io.js runtime"
Description="Install the core io.js runtime (iojs.exe)."
Title="!(loc.NodeRuntime_Title)"
Description="!(loc.NodeRuntime_Description)"
Absent="disallow">
<ComponentRef Id="NodeExecutable"/>
<ComponentRef Id="NodeVarsScript"/>
Expand All @@ -51,30 +51,30 @@

<Feature Id="NodeAlias"
Level="1"
Title="Alias node to iojs"
Description="Create node.exe as an alias for iojs.exe.">
Title="!(loc.NodeAlias_Title)"
Description="!(loc.NodeAlias_Description)">
<ComponentRef Id="NodeAlias"/>
</Feature>

<Feature Id="NodePerfCtrSupport"
Level="1"
Title="Performance counters"
Description="Installs support for io.js-specific performance counters.">
Title="!(loc.NodePerfCtrSupport_Title)"
Description="!(loc.NodePerfCtrSupport_Description)">
<ComponentRef Id="NodePerfCtrSupport"/>
</Feature>

<Feature Id="NodeEtwSupport"
Level="1"
Title="Event tracing (ETW)"
Description="Installs support for event tracing (ETW) events generated by io.js.">
Title="!(loc.NodeEtwSupport_Title)"
Description="!(loc.NodeEtwSupport_Description)">
<ComponentRef Id="NodeEtwSupport"/>
</Feature>
</Feature>

<Feature Id="npm"
Level="1"
Title="npm package manager"
Description="Install npm, the recommended package manager for io.js.">
Title="!(loc.npm_Title)"
Description="!(loc.npm_Description)">
<ComponentRef Id="NpmCmdScript"/>
<ComponentRef Id="NpmBashScript"/>
<ComponentRef Id="NpmConfigurationFile"/>
Expand All @@ -84,26 +84,26 @@

<Feature Level="1"
Id="DocumentationShortcuts"
Title="Online documentation shortcuts"
Description="Add start menu entries that link the the online documentation for io.js v$(var.FullVersion) and the io.js website.">
Title="!(loc.DocumentationShortcuts_Title)"
Description="!(loc.DocumentationShortcuts_Description)">
<ComponentRef Id="DocumentationShortcuts"/>
</Feature>

<Feature Id="EnvironmentPath"
Level="1"
Title="Add to PATH"
Description="Add io.js, npm, and modules that were globally installed by npm to the PATH environment variable.">
Title="!(loc.EnvironmentPath_Title)"
Description="!(loc.EnvironmentPath_Description)">
<Feature Id="EnvironmentPathNode"
Level="1"
Title="io.js and npm"
Description="Add io.js and npm (if installed) to the PATH environment variable.">
Title="!(loc.EnvironmentPathNode_Title)"
Description="!(loc.EnvironmentPathNode_Description)">
<ComponentRef Id="EnvironmentPathNode"/>
</Feature>

<Feature Id="EnvironmentPathNpmModules"
Level="1"
Title="npm modules"
Description="Add modules that are installed globally by npm to the PATH environment variable. This option works for the current user only; other users need to update their PATH manually.">
Title="!(loc.EnvironmentPathNpmModules_Title)"
Description="!(loc.EnvironmentPathNpmModules_Description)">
<ComponentRef Id="EnvironmentPathNpmModules"/>
</Feature>
</Feature>
Expand Down Expand Up @@ -329,7 +329,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="io.js has been successfully installed."/>
<Property Id="WIXUI_EXITDIALOGOPTIONALTEXT" Value="!(loc.WIXUI_EXITDIALOGOPTIONALTEXT)"/>
</UI>

<UIRef Id="WixUI_Common"/>
Expand Down