diff --git a/CHANGELOG.md b/CHANGELOG.md index 28fab58bf5b439..ffc341d69a8820 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -31,7 +31,8 @@ release. -10.14.0
+10.14.1
+10.14.0
10.13.0
10.12.0
10.11.0
diff --git a/doc/changelogs/CHANGELOG_V10.md b/doc/changelogs/CHANGELOG_V10.md index 333638e5c5ad90..9c18c773fbbc47 100644 --- a/doc/changelogs/CHANGELOG_V10.md +++ b/doc/changelogs/CHANGELOG_V10.md @@ -10,6 +10,7 @@ +10.14.1
10.14.0
10.13.0
@@ -45,6 +46,19 @@ * [io.js](CHANGELOG_IOJS.md) * [Archive](CHANGELOG_ARCHIVE.md) + +## 2018-11-29, Version 10.14.1 'Dubnium' (LTS), @MylesBorins + +### Notable Changes + +* **win/msi**: Revert changes to installer causing issues on Windows systems. + +### Commits + +* [[`5d17bf1e13`](https://github.com/nodejs/node/commit/5d17bf1e13)] - **win**: add prompt to tools installation script (João Reis) [#23987](https://github.com/nodejs/node/pull/23987) +* [[`589f0d2192`](https://github.com/nodejs/node/commit/589f0d2192)] - **win**: clarify Boxstarter behavior on install tools (Rob Reynolds) [#23987](https://github.com/nodejs/node/pull/23987) +* [[`9e293c1328`](https://github.com/nodejs/node/commit/9e293c1328)] - ***Revert*** "**win,msi**: install tools for native modules" (Refael Ackermann) [#24344](https://github.com/nodejs/node/pull/24344) + ## 2018-11-27, Version 10.14.0 'Dubnium' (LTS), @rvagg diff --git a/src/node_version.h b/src/node_version.h index 32d81de78639e9..1a0b988a4a2003 100644 --- a/src/node_version.h +++ b/src/node_version.h @@ -29,7 +29,7 @@ #define NODE_VERSION_IS_LTS 1 #define NODE_VERSION_LTS_CODENAME "Dubnium" -#define NODE_VERSION_IS_RELEASE 0 +#define NODE_VERSION_IS_RELEASE 1 #ifndef NODE_STRINGIFY #define NODE_STRINGIFY(n) NODE_STRINGIFY_HELPER(n) diff --git a/tools/msvs/install_tools/install_tools.bat b/tools/msvs/install_tools/install_tools.bat deleted file mode 100644 index db10cf1f46049e..00000000000000 --- a/tools/msvs/install_tools/install_tools.bat +++ /dev/null @@ -1,53 +0,0 @@ -@echo off - -cls -echo ==================================================== -echo Tools for Node.js Native Modules Installation Script -echo ==================================================== -echo. -echo This Boxstarter script will install Python and the Visual Studio Build Tools, -echo necessary to compile Node.js native modules. Note that Boxstarter, -echo Chocolatey and required Windows updates will also be installed. -echo. -echo This will require about 3 Gb of free disk space, plus any space necessary to -echo install Windows updates. -echo. -echo This will take a while to run. Your computer may reboot during the -echo installation, and will resume automatically. -echo. -echo Please close all open programs for the duration of the installation. -echo. -echo You can close this window to stop now. This script can be invoked from the -echo Start menu. Detailed instructions to install these tools manually are -echo available at https://github.com/nodejs/node-gyp#on-windows -echo. -pause - -cls -REM Adapted from https://github.com/Microsoft/windows-dev-box-setup-scripts/blob/79bbe5bdc4867088b3e074f9610932f8e4e192c2/README.md#legal -echo Using this script downloads third party software -echo ------------------------------------------------ -echo This script will direct to Chocolatey to install packages. By using -echo Chocolatey to install a package, you are accepting the license for the -echo application, executable(s), or other artifacts delivered to your machine as a -echo result of a Chocolatey install. This acceptance occurs whether you know the -echo license terms or not. Read and understand the license terms of the packages -echo being installed and their dependencies prior to installation: -echo - https://chocolatey.org/packages/chocolatey -echo - https://chocolatey.org/packages/boxstarter -echo - https://chocolatey.org/packages/python2 -echo - https://chocolatey.org/packages/visualstudio2017buildtools -echo - https://chocolatey.org/packages/visualstudio2017-workload-vctools -echo. -echo This script is provided AS-IS without any warranties of any kind -echo ---------------------------------------------------------------- -echo Chocolatey has implemented security safeguards in their process to help -echo protect the community from malicious or pirated software, but any use of this -echo script is at your own risk. Please read the Chocolatey's legal terms of use -echo and the Boxstarter project license as well as how the community repository -echo for Chocolatey.org is maintained. -echo. -echo You can close this window to stop now. -pause - -"%SystemRoot%\System32\WindowsPowerShell\v1.0\powershell.exe" -NoProfile -InputFormat None -ExecutionPolicy Bypass -Command Start-Process '%SystemRoot%\System32\WindowsPowerShell\v1.0\powershell.exe' -ArgumentList '-NoProfile -InputFormat None -ExecutionPolicy Bypass -Command iex ((New-Object System.Net.WebClient).DownloadString(''https://boxstarter.org/bootstrapper.ps1'')); get-boxstarter -Force; Install-BoxstarterPackage -PackageName ''%~dp0\install_tools.txt''; Read-Host ''Type ENTER to exit'' ' -Verb RunAs diff --git a/tools/msvs/install_tools/install_tools.txt b/tools/msvs/install_tools/install_tools.txt deleted file mode 100644 index baf530a774759b..00000000000000 --- a/tools/msvs/install_tools/install_tools.txt +++ /dev/null @@ -1,3 +0,0 @@ -choco upgrade -y python2 -choco upgrade -y visualstudio2017buildtools -choco upgrade -y visualstudio2017-workload-vctools diff --git a/tools/msvs/msi/i18n/en-us.wxl b/tools/msvs/msi/i18n/en-us.wxl index 9b948156a5481d..86da6ecc40ecaf 100644 --- a/tools/msvs/msi/i18n/en-us.wxl +++ b/tools/msvs/msi/i18n/en-us.wxl @@ -8,14 +8,6 @@ A later version of [ProductName] is already installed. Setup will now exit. - [ProductName] Setup - {\WixUI_Font_Title}Tools for Native Modules - Optionally install the tools necessary to compile native modules. - WixUI_Bmp_Banner - Some npm modules need to be compiled from C/C++ when installing. If you want to be able to install such modules, some tools (Python 2 and Visual Studio Build Tools) need to be installed. - Automatically install the necessary tools. Note that this will also install Boxstarter and Chocolatey. The script will pop-up in a new window after the installation completes. - Alternatively, follow the instructions at https://github.com/nodejs/node-gyp#on-windows]]> to install the dependencies yourself. - Node.js runtime Install the core [ProductName] runtime (node.exe). diff --git a/tools/msvs/msi/product.wxs b/tools/msvs/msi/product.wxs index ad48fedafd9ea0..e9e4e33751d254 100755 --- a/tools/msvs/msi/product.wxs +++ b/tools/msvs/msi/product.wxs @@ -72,8 +72,6 @@ - - - - - - - - - - @@ -205,12 +195,6 @@ Arguments='/k "[INSTALLDIR]nodevars.bat"' Show="normal" WorkingDirectory="INSTALLDIR"/> - - - - @@ -359,23 +340,6 @@ - - - - - - - - - - - - - - - 1 - - NOT Installed Installed AND PATCH @@ -386,6 +350,7 @@ 1 1 1 + 1 NOT Installed OR WixUI_InstallMode = "Change" Installed AND NOT PATCH Installed AND PATCH @@ -396,11 +361,7 @@ 1 Installed NOT Installed - 1 - 1 - 1 - NATIVETOOLSCHECKBOX = 1 - 1 + 1