From 77db7e168e77a964f5767d644f4667841937a793 Mon Sep 17 00:00:00 2001 From: Chris Dickinson Date: Fri, 17 Apr 2015 14:53:22 -0700 Subject: [PATCH 1/4] Working on v1.8.1 --- src/node_version.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/node_version.h b/src/node_version.h index f629c697fdde03..1a717412d9bd01 100644 --- a/src/node_version.h +++ b/src/node_version.h @@ -3,9 +3,9 @@ #define NODE_MAJOR_VERSION 1 #define NODE_MINOR_VERSION 8 -#define NODE_PATCH_VERSION 0 +#define NODE_PATCH_VERSION 1 -#define NODE_VERSION_IS_RELEASE 1 +#define NODE_VERSION_IS_RELEASE 0 #ifndef NODE_STRINGIFY #define NODE_STRINGIFY(n) NODE_STRINGIFY_HELPER(n) From 53ed89d927ff884a03b260201a4435896712562a Mon Sep 17 00:00:00 2001 From: Rod Vagg Date: Mon, 20 Apr 2015 18:48:51 +1000 Subject: [PATCH 2/4] Revert "build: use %PYTHON% instead of python" This reverts commit 91943a99d534e67f6b7a7a3be45206afdb3fbf75. Old commit cherry-picked in but found to cause problems with .msi creation on Windows. Original change is mostly pointless because V8 hard-wires `python` anyway. PR-URL: https://github.com/iojs/io.js/pull/1475 Reviewed-By: Ben Noordhuis --- vcbuild.bat | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/vcbuild.bat b/vcbuild.bat index 2de38fea9660cb..44d149d32241b4 100644 --- a/vcbuild.bat +++ b/vcbuild.bat @@ -89,12 +89,10 @@ if defined noprojgen goto msbuild if defined NIGHTLY set TAG=nightly-%NIGHTLY% -if not defined PYTHON set PYTHON=python - @rem Generate the VS project. SETLOCAL if defined VS100COMNTOOLS call "%VS100COMNTOOLS%\VCVarsQueryRegistry.bat" - "%PYTHON%" configure %download_arg% %i18n_arg% %debug_arg% %snapshot_arg% %noetw_arg% %noperfctr_arg% --dest-cpu=%target_arch% --tag=%TAG% + python configure %download_arg% %i18n_arg% %debug_arg% %snapshot_arg% %noetw_arg% %noperfctr_arg% --dest-cpu=%target_arch% --tag=%TAG% if errorlevel 1 goto create-msvs-files-failed if not exist node.sln goto create-msvs-files-failed echo Project files generated. @@ -176,14 +174,14 @@ if "%config%"=="Release" set test_args=--mode=release %test_args% echo running 'cctest' "%config%\cctest" echo running 'python tools/test.py %test_args%' -"%PYTHON%" tools/test.py %test_args% +python tools/test.py %test_args% goto jslint :jslint if not defined jslint goto exit echo running jslint set PYTHONPATH=tools/closure_linter/;tools/gflags/ -"%PYTHON%" tools/closure_linter/closure_linter/gjslint.py --unix_mode --strict --nojsdoc -r lib/ -r src/ --exclude_files lib/punycode.js +python tools/closure_linter/closure_linter/gjslint.py --unix_mode --strict --nojsdoc -r lib/ -r src/ --exclude_files lib/punycode.js goto exit :create-msvs-files-failed @@ -208,6 +206,6 @@ rem *************** :getnodeversion 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 io.js & exit /b 1 goto :EOF From f23b96352b24e48e8200161ec1b7e4095f672ab6 Mon Sep 17 00:00:00 2001 From: Chris Dickinson Date: Fri, 17 Apr 2015 21:27:15 -0700 Subject: [PATCH 3/4] src: revert NODE_MODULE_VERSION to 43 PR-URL: https://github.com/iojs/io.js/pull/1460 Reviewed-By: Jeremiah Senkpiel --- src/node_version.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/node_version.h b/src/node_version.h index 1a717412d9bd01..9798a7937a44ce 100644 --- a/src/node_version.h +++ b/src/node_version.h @@ -45,6 +45,6 @@ * an API is broken in the C++ side, including in v8 or * other dependencies. */ -#define NODE_MODULE_VERSION 44 /* io.js v1.1.0 */ +#define NODE_MODULE_VERSION 43 /* io.js v1.1.0 */ #endif /* SRC_NODE_VERSION_H_ */ From 7b7da2edf79a95aa9ab2b7ff6dc74557d4cd0d64 Mon Sep 17 00:00:00 2001 From: Chris Dickinson Date: Fri, 17 Apr 2015 21:33:30 -0700 Subject: [PATCH 4/4] 2015-04-20 io.js v1.8.1 Release Notable Changes: * build: revert vcbuild.bat changes * changes inherited from v1.8.0: * build: Support for building io.js as a static library (Marat Abdullin) #1341 * npm: Upgrade npm to 2.8.3. (Forrest L Norvell) #1448 * deps: upgrade openssl to 1.0.2a (Shigeki Ohtsu) #1389 * src: allow multiple arguments to be passed to process.nextTick (Trevor Norris) #1077 * module: the interaction of require('.') with NODE_PATH has been restored and deprecated. This functionality will be removed at a later point. (Roman Reiss) #1363 --- CHANGELOG.md | 11 +++++++++-- src/node_version.h | 2 +- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 86a833c13de161..7eee2e8ba128b0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,11 +1,16 @@ # io.js ChangeLog -## 2015-04-17, Version 1.8.0, @chrisdickinson +## 2015-04-20, Version 1.8.1, @chrisdickinson ### Notable changes +* **NOTICE**: Skipped v1.8.0 due to problems with release tooling. + See [#1436](https://github.com/iojs/io.js/issues/1436) for details. * **build**: Support for building io.js as a static library (Marat Abdullin) [#1341](https://github.com/iojs/io.js/pull/1341) * **deps**: Upgrade openssl to 1.0.2a (Shigeki Ohtsu) [#1389](https://github.com/iojs/io.js/pull/1389) + * Users should see performance improvements when using the crypto API. + See [here](https://github.com/iojs/io.js/wiki/Crypto-Performance-Notes-for-OpenSSL-1.0.2a-on-iojs-v1.8.0) + for details. * **npm**: Upgrade npm to 2.8.3. See the [release notes](https://github.com/npm/npm/releases/tag/v2.8.3) for details. Includes improved git support. Summary: * [`387f889`](https://github.com/npm/npm/commit/387f889c0e8fb617d9cc9a42ed0a3ec49424ab5d) [#7961](https://github.com/npm/npm/issues/7961) Ensure that hosted git SSH @@ -49,6 +54,8 @@ will be removed at a later point. (Roman Reiss) [#1363](https://github.com/iojs/ ### Commits +* [[`53ed89d927`](https://github.com/iojs/io.js/commit/53ed89d927)] - ***Revert*** "**build**: use %PYTHON% instead of python" (Rod Vagg) [#1475](https://github.com/iojs/io.js/pull/1475) +* [[`2b744b0ab7`](https://github.com/iojs/io.js/commit/2b744b0ab7)] - **src**: revert NODE_MODULE_VERSION to 43 (Chris Dickinson) [#1460](https://github.com/iojs/io.js/pull/1460) * [[`431673ebd1`](https://github.com/iojs/io.js/commit/431673ebd1)] - **buffer**: fast-case for empty string in byteLength (Jackson Tian) [#1441](https://github.com/iojs/io.js/pull/1441) * [[`1b22bad35f`](https://github.com/iojs/io.js/commit/1b22bad35f)] - **build**: fix logic for shared library flags (Jeremiah Senkpiel) [#1454](https://github.com/iojs/io.js/pull/1454) * [[`91943a99d5`](https://github.com/iojs/io.js/commit/91943a99d5)] - **build**: use %PYTHON% instead of python (Rod Vagg) [#1444](https://github.com/iojs/io.js/pull/1444) @@ -56,7 +63,7 @@ will be removed at a later point. (Roman Reiss) [#1363](https://github.com/iojs/ * [[`a530b2baf1`](https://github.com/iojs/io.js/commit/a530b2baf1)] - **build**: fix error message in configure (Shigeki Ohtsu) [#1389](https://github.com/iojs/io.js/pull/1389) * [[`92dfb794f9`](https://github.com/iojs/io.js/commit/92dfb794f9)] - **build**: enable ssl support on arm64 (Shigeki Ohtsu) [#1389](https://github.com/iojs/io.js/pull/1389) * [[`7de0dcde83`](https://github.com/iojs/io.js/commit/7de0dcde83)] - **deps**: make node-gyp work with io.js (cjihrig) [#990](https://github.com/iojs/io.js/pull/990) -* [[`4870213f9e`](https://github.com/iojs/io.js/commit/4870213f9e)] - **deps**: upgrade npm to 2.8.3 (Forrest L Norvell) +* [[`4870213f9e`](https://github.com/iojs/io.js/commit/4870213f9e)] - **deps**: upgrade npm to 2.8.3 (Forrest L Norvell) * [[`49bb7ded2c`](https://github.com/iojs/io.js/commit/49bb7ded2c)] - **deps**: fix git case sensitivity issue in npm (Chris Dickinson) [#1456](https://github.com/iojs/io.js/pull/1456) * [[`4830b4bce8`](https://github.com/iojs/io.js/commit/4830b4bce8)] - **deps**: add docs to upgrade openssl (Shigeki Ohtsu) [#1389](https://github.com/iojs/io.js/pull/1389) * [[`11bec72c87`](https://github.com/iojs/io.js/commit/11bec72c87)] - **deps**: update asm files for openssl-1.0.2a (Shigeki Ohtsu) [#1389](https://github.com/iojs/io.js/pull/1389) diff --git a/src/node_version.h b/src/node_version.h index 9798a7937a44ce..ad48f98a36923f 100644 --- a/src/node_version.h +++ b/src/node_version.h @@ -5,7 +5,7 @@ #define NODE_MINOR_VERSION 8 #define NODE_PATCH_VERSION 1 -#define NODE_VERSION_IS_RELEASE 0 +#define NODE_VERSION_IS_RELEASE 1 #ifndef NODE_STRINGIFY #define NODE_STRINGIFY(n) NODE_STRINGIFY_HELPER(n)