From a84f58d28f705e30cd07dff890a9fe82389fa986 Mon Sep 17 00:00:00 2001 From: Refael Ackermann Date: Tue, 28 Nov 2017 18:49:22 -0500 Subject: [PATCH 1/3] tools,build: .gitignore tweaks --- .gitignore | 71 ++++++++++++++++++++++++++++++------------------------ 1 file changed, 40 insertions(+), 31 deletions(-) diff --git a/.gitignore b/.gitignore index efbdc824d29289..121504e353cf9e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,12 +1,10 @@ # Whitelist dotfiles .* -!deps/**/.* -!test/fixtures/**/.* -!tools/eslint/**/.* -!tools/doc/node_modules/**/.* +!deps/** !.editorconfig !.eslintignore !.eslintrc.yaml +!.eslintrc.yml !.gitattributes !.github !.gitignore @@ -24,9 +22,8 @@ perf.data.old tags .lock-wscript *.pyc -doc/api.xml +/doc/api.xml tmp/ -test/tmp*/ iojs iojs_g node @@ -36,15 +33,19 @@ node_g icu_config.gypi .eslintcache node_trace.*.log -coverage/ - +/coverage/ /out # various stuff that VC++ produces/uses Debug/ -!**/node_modules/debug/ -!deps/v8/src/debug/ +!/deps/v8/test/debugger/debug/ +!/deps/v8/src/base/debug +!/deps/v8/src/debug +/deps/v8/src/debug/obj +deps/v8/src/inspector/Debug/ Release/ +!deps/v8/tools/release +!deps/npm/node_modules/bluebird/js/release !doc/blog/** *.sln !nodemsi.sln @@ -62,7 +63,6 @@ ipch/ *.VC.opendb .vs/ .vscode/ -/deps/v8/src/debug/obj /*.exe /config.mk @@ -75,28 +75,24 @@ ipch/ /tools/msvs/genfiles/ /test/addons/??_*/ email.md -deps/v8-* -deps/icu -deps/icu*.zip -deps/icu*.tgz -deps/icu-tmp -./node_modules +/deps/v8-* +/deps/icu +/deps/icu*.zip +/deps/icu*.tgz +/deps/icu-tmp android-toolchain/ .svn/ # generated by gyp on Windows -deps/openssl/openssl.props -deps/openssl/openssl.targets -deps/openssl/openssl.xml +/deps/openssl/openssl.props +/deps/openssl/openssl.targets +/deps/openssl/openssl.xml # generated by gyp on android /*.target.mk /*.host.mk -deps/openssl/openssl.target.mk -deps/zlib/zlib.target.mk - -# not needed and causes issues for distro packagers -deps/npm/node_modules/.bin/ +/deps/openssl/openssl.target.mk +/deps/zlib/zlib.target.mk # build/release artifacts /*.tar.* @@ -104,9 +100,7 @@ deps/npm/node_modules/.bin/ /SHASUMS*.txt* # test artifacts -tools/faketime -tools/remark-cli/node_modules -tools/remark-preset-lint-node/node_modules +/tools/faketime icu_config.gypi *.tap @@ -114,7 +108,22 @@ icu_config.gypi *.xcodeproj *.xcworkspace +# npm stuff +node_modules +package-lock.json +!/deps/npm/node_modules** +/deps/npm/node_modules/node-gyp/gyp/**/*.pyc +!/tools/eslint/node_modules** +!/tools/doc/node_modules** +!/test/fixtures/** +# not needed and causes issues for distro packagers +/deps/npm/node_modules/.bin/ + # libuv book and GitHub template -deps/uv/.github/ -deps/uv/docs/code/ -deps/uv/docs/src/guide/ +/deps/uv/.github/ +/deps/uv/docs/code/ +/deps/uv/docs/src/guide/ + +!/deps/v8/test/mjsunit/tools/profviz-test.log +!/deps/v8/test/mjsunit/tools/tickprocessor-test-func-info.log +!/deps/v8/test/mjsunit/tools/tickprocessor-test.log From e7cde42f0d3a9a62cb3a129e8a49610172bb5177 Mon Sep 17 00:00:00 2001 From: Refael Ackermann Date: Wed, 29 Nov 2017 20:20:06 -0500 Subject: [PATCH 2/3] [fixup] refactor sub patterns to deps --- .gitignore | 51 +++++++++---------------------------------------- deps/.gitignore | 32 +++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 42 deletions(-) create mode 100644 deps/.gitignore diff --git a/.gitignore b/.gitignore index 121504e353cf9e..42a65c26a98167 100644 --- a/.gitignore +++ b/.gitignore @@ -35,18 +35,11 @@ icu_config.gypi node_trace.*.log /coverage/ /out +*.tap # various stuff that VC++ produces/uses Debug/ -!/deps/v8/test/debugger/debug/ -!/deps/v8/src/base/debug -!/deps/v8/src/debug -/deps/v8/src/debug/obj -deps/v8/src/inspector/Debug/ Release/ -!deps/v8/tools/release -!deps/npm/node_modules/bluebird/js/release -!doc/blog/** *.sln !nodemsi.sln *.suo @@ -65,34 +58,22 @@ ipch/ .vscode/ /*.exe -/config.mk -/config.gypi -/config_fips.gypi +config.mk +config.gypi +config_fips.gypi +icu_config.gypi *-nodegyp* /gyp-mac-tool /npm.wxs /tools/msvs/npm.wixobj /tools/msvs/genfiles/ -/test/addons/??_*/ email.md -/deps/v8-* -/deps/icu -/deps/icu*.zip -/deps/icu*.tgz -/deps/icu-tmp android-toolchain/ .svn/ +*.target.mk +*.host.mk -# generated by gyp on Windows -/deps/openssl/openssl.props -/deps/openssl/openssl.targets -/deps/openssl/openssl.xml - -# generated by gyp on android -/*.target.mk -/*.host.mk -/deps/openssl/openssl.target.mk -/deps/zlib/zlib.target.mk +!doc/blog/** # build/release artifacts /*.tar.* @@ -101,8 +82,7 @@ android-toolchain/ # test artifacts /tools/faketime -icu_config.gypi -*.tap +/test/addons/??_*/ # Xcode workspaces and project folders *.xcodeproj @@ -111,19 +91,6 @@ icu_config.gypi # npm stuff node_modules package-lock.json -!/deps/npm/node_modules** -/deps/npm/node_modules/node-gyp/gyp/**/*.pyc !/tools/eslint/node_modules** !/tools/doc/node_modules** !/test/fixtures/** -# not needed and causes issues for distro packagers -/deps/npm/node_modules/.bin/ - -# libuv book and GitHub template -/deps/uv/.github/ -/deps/uv/docs/code/ -/deps/uv/docs/src/guide/ - -!/deps/v8/test/mjsunit/tools/profviz-test.log -!/deps/v8/test/mjsunit/tools/tickprocessor-test-func-info.log -!/deps/v8/test/mjsunit/tools/tickprocessor-test.log diff --git a/deps/.gitignore b/deps/.gitignore new file mode 100644 index 00000000000000..bc0768281abb03 --- /dev/null +++ b/deps/.gitignore @@ -0,0 +1,32 @@ +!/v8/test/debugger/debug/ +!/v8/src/base/debug +!/v8/src/debug +/v8/src/debug/obj + +!/v8/tools/release + +/v8-* +/icu +/icu*.zip +/icu*.tgz +/icu-tmp + +# generated by gyp on Windows +/openssl/openssl.props +/openssl/openssl.targets +/openssl/openssl.xml + +#openssl/openssl.target.mk +#zlib/zlib.target.mk + +!/npm/node_modules** +/npm/node_modules/node-gyp/gyp/**/*.pyc +# not needed and causes issues for distro packagers +/npm/node_modules/.bin/ + +# libuv book and GitHub template +/uv/.github/ +/uv/docs/code/ +/uv/docs/src/guide/ + +!/v8/test/**log From 869b20429175d0e9ee8da13c9ae97a7e4db2c130 Mon Sep 17 00:00:00 2001 From: Refael Ackermann Date: Wed, 29 Nov 2017 20:22:57 -0500 Subject: [PATCH 3/3] [fixup] moar tweaks --- .gitignore | 2 ++ deps/.gitignore | 3 --- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 42a65c26a98167..33e03ba7f2c30b 100644 --- a/.gitignore +++ b/.gitignore @@ -94,3 +94,5 @@ package-lock.json !/tools/eslint/node_modules** !/tools/doc/node_modules** !/test/fixtures/** + +# more patterns in /deps/.gitignore \ No newline at end of file diff --git a/deps/.gitignore b/deps/.gitignore index bc0768281abb03..a73be45b710f2b 100644 --- a/deps/.gitignore +++ b/deps/.gitignore @@ -16,9 +16,6 @@ /openssl/openssl.targets /openssl/openssl.xml -#openssl/openssl.target.mk -#zlib/zlib.target.mk - !/npm/node_modules** /npm/node_modules/node-gyp/gyp/**/*.pyc # not needed and causes issues for distro packagers