From 07fbe157c54c04ee13d3dac9f37df02a63f74731 Mon Sep 17 00:00:00 2001 From: Sam Roberts Date: Fri, 14 Feb 2020 11:47:20 -0800 Subject: [PATCH 1/3] deps: move zlib maintenance info to guides deps/zlib/README.md is not part of the upstream zlib, it is a Node.js specific addition describing how to maintain zlib and should be in doc/guides/. --- deps/zlib/README.md => doc/guides/maintaining-zlib.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename deps/zlib/README.md => doc/guides/maintaining-zlib.md (100%) diff --git a/deps/zlib/README.md b/doc/guides/maintaining-zlib.md similarity index 100% rename from deps/zlib/README.md rename to doc/guides/maintaining-zlib.md From fb7cccb683c167b41ad6bcdc2c277429a57df4cc Mon Sep 17 00:00:00 2001 From: Sam Roberts Date: Fri, 14 Feb 2020 13:00:14 -0800 Subject: [PATCH 2/3] doc: describe how to update zlib See: - https://github.com/nodejs/node/pull/31201 --- doc/guides/maintaining-zlib.md | 36 ++++++++++++++++++++++++++++++---- 1 file changed, 32 insertions(+), 4 deletions(-) diff --git a/doc/guides/maintaining-zlib.md b/doc/guides/maintaining-zlib.md index a12f0a7876a168..c293fdf5d40fc6 100644 --- a/doc/guides/maintaining-zlib.md +++ b/doc/guides/maintaining-zlib.md @@ -1,6 +1,34 @@ -This copy of zlib comes from the Chromium team's zlib fork which incorporated performance improvements not currently available in standard zlib. +# Maintaining zlib -To update this code: +This copy of zlib comes from the Chromium team's zlib fork which incorporated +performance improvements not currently available in standard zlib. -* Clone https://chromium.googlesource.com/chromium/src/third_party/zlib -* Comment out the `#include "chromeconf.h"` in zconf.h to maintain full compatibility with node addons +## Updating zlib + +Update zlib: +```shell +git clone https://chromium.googlesource.com/chromium/src/third_party/zlib +cp deps/zlib/zlib.gyp deps/zlib/win32/zlib.def deps +rm -rf deps/zlib zlib/.git +mv zlib deps/ +mv deps/zlib.gyp deps/zlib/ +mkdir deps/zlib/win32 +mv deps/zlib.def deps/zlib/win32 +sed -i -- 's_^#include "chromeconf.h"_//#include "chromeconf.h"_' deps/zlib/zconf.h +``` + +Check that Node.js still builds and tests. + +It may be necessary to update deps/zlib/zlib.gyp if any significant changes have +occurred upstream. + +## Commiting zlib + +Add zlib: `git add --all deps/zlib` + +Commit the changes with a message like +```text +deps: update zlib to upstream d7f3ca9 + +Updated as described in doc/guides/maintaining-zlib.md. +``` From f70ebe6066829f0ba8f9c682adbbbf2f52d7229a Mon Sep 17 00:00:00 2001 From: Sam Roberts Date: Fri, 14 Feb 2020 13:10:57 -0800 Subject: [PATCH 3/3] deps: update zlib to upstream d7f3ca9 Updated as described in doc/guides/maintaining-zlib.md. --- deps/zlib/google/test/data/create_test_zip.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 deps/zlib/google/test/data/create_test_zip.sh diff --git a/deps/zlib/google/test/data/create_test_zip.sh b/deps/zlib/google/test/data/create_test_zip.sh old mode 100644 new mode 100755