[doc] merge History.md and CHANGELOG.md

nodejs · Jan 10, 2017 · 762d19a · 762d19a
1 parent 80fc5c3
commit 762d19a
Show file tree

Hide file tree

Showing 2 changed files with 51 additions and 41 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,5 @@
 v3.4.0 2016-06-28
+=================
 
 * [[`ce5fd04e94`](https://github.com/nodejs/node-gyp/commit/ce5fd04e94)] - **deps**: update minimatch version (delphiactual) [#961](https://github.com/nodejs/node-gyp/pull/961)
 * [[`77383ddd85`](https://github.com/nodejs/node-gyp/commit/77383ddd85)] - Replace fs.accessSync call to fs.statSync (Richard Lau) [#955](https://github.com/nodejs/node-gyp/pull/955)
@@ -19,10 +20,12 @@ v3.4.0 2016-06-28
 * [[`3bcb1720e4`](https://github.com/nodejs/node-gyp/commit/3bcb1720e4)] - Add support for the Python launcher on Windows (Patrick Westerhoff) [#894](https://github.com/nodejs/node-gyp/pull/894
 
 v3.3.1 2016-03-04
+=================
 
 * [[`a981ef847a`](https://github.com/nodejs/node-gyp/commit/a981ef847a)] - **gyp**: fix android generator (Robert Chiras) [#889](https://github.com/nodejs/node-gyp/pull/889)
 
 v3.3.0 2016-02-16
+=================
 
 * [[`818d854a4d`](https://github.com/nodejs/node-gyp/commit/818d854a4d)] - Introduce NODEJS_ORG_MIRROR and IOJS_ORG_MIRROR (Rod Vagg) [#878](https://github.com/nodejs/node-gyp/pull/878)
 * [[`d1e4cc4b62`](https://github.com/nodejs/node-gyp/commit/d1e4cc4b62)] - **(SEMVER-MINOR)** Download headers tarball for ~0.12.10 || ~0.10.42 (Rod Vagg) [#877](https://github.com/nodejs/node-gyp/pull/877)
@@ -32,11 +35,13 @@ v3.3.0 2016-02-16
 * [[`b3ad43498e`](https://github.com/nodejs/node-gyp/commit/b3ad43498e)] - **(SEMVER-MINOR)** Make download() function testable. (Ben Noordhuis) [#837](https://github.com/nodejs/node-gyp/pull/837)
 
 v3.2.1 2015-12-03
+=================
 
 * [[`ab89b477c4`](https://github.com/nodejs/node-gyp/commit/ab89b477c4)] - Upgrade gyp to b3cef02. (Ben Noordhuis) [#831](https://github.com/nodejs/node-gyp/pull/831)
 * [[`90078ecb17`](https://github.com/nodejs/node-gyp/commit/90078ecb17)] - Define WIN32_LEAN_AND_MEAN conditionally. (Ben Noordhuis) [#824](https://github.com/nodejs/node-gyp/pull/824)
 
 v3.2.0 2015-11-25
+=================
 
 * [[`268f1ca4c7`](https://github.com/nodejs/node-gyp/commit/268f1ca4c7)] - Use result of `which` when searching for python. (Refael Ackermann) [#668](https://github.com/nodejs/node-gyp/pull/668)
 * [[`817ed9bd78`](https://github.com/nodejs/node-gyp/commit/817ed9bd78)] - Add test for python executable search logic. (Ben Noordhuis) [#756](https://github.com/nodejs/node-gyp/pull/756)
@@ -46,6 +51,7 @@ v3.2.0 2015-11-25
 * [[`d1d6015276`](https://github.com/nodejs/node-gyp/commit/d1d6015276)] - Update broken links and switch to HTTPS. (andrew morton) 
 
 v3.1.0 2015-11-14
+=================
 
 * [[`9049241f91`](https://github.com/nodejs/node-gyp/commit/9049241f91)] - **gyp**: don't use links at all, just copy the files instead (Nathan Zadoks)
 * [[`8ef90348d1`](https://github.com/nodejs/node-gyp/commit/8ef90348d1)] - **gyp**: apply https://codereview.chromium.org/11361103/ (Nathan Rajlich)
@@ -56,19 +62,23 @@ v3.1.0 2015-11-14
 * [[`101bed639b`](https://github.com/nodejs/node-gyp/commit/101bed639b)] - This platform value came from debian package, and now the value (Jérémy Lal) [#738](https://github.com/nodejs/node-gyp/pull/738)
 
 v3.0.3 2015-09-14
+=================
 
 * [[`ad827cda30`](https://github.com/nodejs/node-gyp/commit/ad827cda30)] - tarballUrl global and && when checking for iojs (Lars-Magnus Skog) [#729](https://github.com/nodejs/node-gyp/pull/729)
 
 v3.0.2 2015-09-12
+=================
 
 * [[`6e8c3bf3c6`](https://github.com/nodejs/node-gyp/commit/6e8c3bf3c6)] - add back support for passing additional cmdline args (Rod Vagg) [#723](https://github.com/nodejs/node-gyp/pull/723)
 * [[`ff82f2f3b9`](https://github.com/nodejs/node-gyp/commit/ff82f2f3b9)] - fixed broken link in docs to Visual Studio 2013 download (simon-p-r) [#722](https://github.com/nodejs/node-gyp/pull/722)
 
 v3.0.1 2015-09-08
+=================
 
 * [[`846337e36b`](https://github.com/nodejs/node-gyp/commit/846337e36b)] - normalise versions for target == this comparison (Rod Vagg) [#716](https://github.com/nodejs/node-gyp/pull/716)
 
 v3.0.0 2015-09-08
+=================
 
 * [[`9720d0373c`](https://github.com/nodejs/node-gyp/commit/9720d0373c)] - remove node_modules from tree (Rod Vagg) [#711](https://github.com/nodejs/node-gyp/pull/711)
 * [[`6dcf220db7`](https://github.com/nodejs/node-gyp/commit/6dcf220db7)] - test version major directly, don't use semver.satisfies() (Rod Vagg) [#711](https://github.com/nodejs/node-gyp/pull/711)
@@ -79,3 +89,44 @@ v3.0.0 2015-09-08
 * [[`bbedb8868b`](https://github.com/nodejs/node-gyp/commit/bbedb8868b)] - **(SEMVER-MAJOR)** **win**: enable delay-load hook by default (Jeremiah Senkpiel) [#708](https://github.com/nodejs/node-gyp/pull/708)
 * [[`85ed107565`](https://github.com/nodejs/node-gyp/commit/85ed107565)] - Merge pull request #664 from othiym23/othiym23/allow-semver-5 (Nathan Rajlich)
 * [[`0c720d234c`](https://github.com/nodejs/node-gyp/commit/0c720d234c)] - allow semver@5 (Forrest L Norvell)
+
+2.0.2 / 2015-07-14
+==================
+
+  * Use HTTPS for dist url (#656, @SonicHedgehog)
+  * Merge pull request #648 from nevosegal/master
+  * Merge pull request #650 from magic890/patch-1
+  * Updated Installation section on README
+  * Updated link to gyp user documentation
+  * Fix download error message spelling (#643, @tomxtobin)
+  * Merge pull request #637 from lygstate/master
+  * Set NODE_GYP_DIR for addon.gypi to setting absolute path for
+    src/win_delay_load_hook.c, and fixes of the long relative path issue on Win32.
+    Fixes #636 (#637, @lygstate).
+
+2.0.1 / 2015-05-28
+==================
+
+  * configure: try/catch the semver range.test() call
+  * README: update for visual studio 2013 (#510, @samccone)
+
+2.0.0 / 2015-05-24
+==================
+
+  * configure: check for python2 executable by default, fallback to python
+  * configure: don't clobber existing $PYTHONPATH
+  * configure: use "path-array" for PYTHONPATH
+  * gyp: fix for non-acsii userprofile name on Windows
+  * gyp: always install into $PRODUCT_DIR
+  * gyp: apply https://codereview.chromium.org/11361103/
+  * gyp: don't use links at all, just copy the files instead
+  * gyp: update gyp to e1c8fcf7
+  * Updated README.md with updated Windows build info
+  * Show URL when a download fails
+  * package: add a "license" field
+  * move HMODULE m declaration to top
+  * Only add "-undefined dynamic_lookup" to loadable_module targets
+  * win: optionally allow node.exe/iojs.exe to be renamed
+  * Avoid downloading shasums if using tarPath
+  * Add target name preprocessor define: `NODE_GYP_MODULE_NAME`
+  * Show better error message in case of bad network settings
diff --git a/History.md b/History.md