Skip to content

Commit 3b5773f

Browse files
committed
build,deps: move gypfiles out 2/2 - moving
* move all used files to `tools/v8_gypfiles` directory * fix references in node configuration PR-URL: #26685 Reviewed-By: Anna Henningsen <[email protected]> Reviewed-By: MichaΓ«l Zasso <[email protected]> Reviewed-By: Refael Ackermann <[email protected]>
1 parent 3d8b844 commit 3b5773f

31 files changed

+67
-96
lines changed

β€Ž.flake8

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[flake8]
2+
exclude=.git,deps,lib,src,test/fixtures,tools/*_macros.py,tools/gyp,tools/inspector_protocol,tools/jinja2,tools/markupsafe,tools/pip,tools/v8_gypfiles/broken
3+
select=E901,E999,F821,F822,F823

β€Ž.gitignore

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
!.editorconfig
99
!.eslintignore
1010
!.eslintrc.js
11+
!.flake8
1112
!.gitattributes
1213
!.github
1314
!.gitignore
@@ -123,8 +124,6 @@ deps/uv/docs/src/guide/
123124
# do not override V8's .gitignore
124125
!deps/v8/**
125126
# ignore VS compiler output unhandled by V8's .gitignore
126-
deps/v8/gypfiles/Debug/
127-
deps/v8/gypfiles/Release/
128127
deps/v8/third_party/eu-strip/
129128

130129
.DS_Store

β€ŽMakefile

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -123,10 +123,10 @@ with-code-cache:
123123
test-code-cache: with-code-cache
124124
$(PYTHON) tools/test.py $(PARALLEL_ARGS) --mode=$(BUILDTYPE_LOWER) code-cache
125125

126-
out/Makefile: common.gypi deps/uv/uv.gyp deps/http_parser/http_parser.gyp \
127-
deps/zlib/zlib.gyp deps/v8/gypfiles/toolchain.gypi \
128-
deps/v8/gypfiles/features.gypi deps/v8/gypfiles/v8.gyp node.gyp \
129-
config.gypi
126+
out/Makefile: config.gypi common.gypi node.gyp \
127+
deps/uv/uv.gyp deps/http_parser/http_parser.gyp deps/zlib/zlib.gyp \
128+
tools/v8_gypfiles/toolchain.gypi tools/v8_gypfiles/features.gypi \
129+
tools/v8_gypfiles/inspector.gypi tools/v8_gypfiles/v8.gyp
130130
$(PYTHON) tools/gyp_node.py -f make
131131

132132
config.gypi: configure configure.py
@@ -1305,9 +1305,7 @@ ifneq ("","$(wildcard tools/pip/site-packages)")
13051305
# Lints the Python code with flake8.
13061306
# Flag the build if there are Python syntax errors or undefined names
13071307
lint-py:
1308-
PYTHONPATH=tools/pip $(PYTHON) -m flake8 . \
1309-
--count --show-source --statistics --select=E901,E999,F821,F822,F823 \
1310-
--exclude=.git,deps,lib,src,test/fixtures,tools/*_macros.py,tools/gyp,tools/inspector_protocol,tools/jinja2,tools/markupsafe,tools/pip
1308+
PYTHONPATH=tools/pip $(PYTHON) -m flake8 --count --show-source --statistics .
13111309
else
13121310
lint-py:
13131311
@echo "Python linting with flake8 is not avalible"

β€Žcommon.gypi

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -80,16 +80,10 @@
8080
}],
8181
['GENERATOR=="ninja"', {
8282
'obj_dir': '<(PRODUCT_DIR)/obj',
83-
'conditions': [
84-
[ 'build_v8_with_gn=="true"', {
85-
'v8_base': '<(PRODUCT_DIR)/obj/deps/v8/gypfiles/v8_monolith.gen/gn/obj/libv8_monolith.a',
86-
}, {
87-
'v8_base': '<(PRODUCT_DIR)/obj/deps/v8/gypfiles/libv8_base.a',
88-
}],
89-
]
83+
'v8_base': '<(PRODUCT_DIR)/obj/tools/v8_gypfiles/libv8_base.a',
9084
}, {
9185
'obj_dir%': '<(PRODUCT_DIR)/obj.target',
92-
'v8_base': '<(PRODUCT_DIR)/obj.target/deps/v8/gypfiles/libv8_base.a',
86+
'v8_base': '<(PRODUCT_DIR)/obj.target/tools/v8_gypfiles/libv8_base.a',
9387
}],
9488
['OS == "win"', {
9589
'os_posix': 0,
@@ -104,15 +98,6 @@
10498
'obj_dir%': '<(PRODUCT_DIR)/obj.target',
10599
'v8_base': '<(PRODUCT_DIR)/libv8_base.a',
106100
}],
107-
['build_v8_with_gn == "true"', {
108-
'conditions': [
109-
['GENERATOR == "ninja"', {
110-
'v8_base': '<(PRODUCT_DIR)/obj/deps/v8/gypfiles/v8_monolith.gen/gn/obj/libv8_monolith.a',
111-
}, {
112-
'v8_base': '<(PRODUCT_DIR)/obj.target/v8_monolith/geni/gn/obj/libv8_monolith.a',
113-
}],
114-
],
115-
}],
116101
['openssl_fips != ""', {
117102
'openssl_product': '<(STATIC_LIB_PREFIX)crypto<(STATIC_LIB_SUFFIX)',
118103
}, {

β€Ždeps/v8/gypfiles/OWNERS

Lines changed: 0 additions & 1 deletion
This file was deleted.

β€Ždeps/v8/gypfiles/README.txt

Lines changed: 0 additions & 9 deletions
This file was deleted.

β€Žnode.gypi

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -85,15 +85,9 @@
8585
'dependencies': [ 'deps/v8/gypfiles/d8.gyp:d8' ],
8686
}],
8787
[ 'node_use_bundled_v8=="true"', {
88-
'conditions': [
89-
[ 'build_v8_with_gn=="true"', {
90-
'dependencies': ['deps/v8/gypfiles/v8-monolithic.gyp:v8_monolith'],
91-
}, {
92-
'dependencies': [
93-
'deps/v8/gypfiles/v8.gyp:v8',
94-
'deps/v8/gypfiles/v8.gyp:v8_libplatform',
95-
],
96-
}],
88+
'dependencies': [
89+
'tools/v8_gypfiles/v8.gyp:v8',
90+
'tools/v8_gypfiles/v8.gyp:v8_libplatform',
9791
],
9892
}],
9993
[ 'node_use_v8_platform=="true"', {
@@ -132,7 +126,7 @@
132126
target_arch=="ia32" or target_arch=="x32")', {
133127
'defines': [ 'NODE_ENABLE_VTUNE_PROFILING' ],
134128
'dependencies': [
135-
'deps/v8/gypfiles/v8vtune.gyp:v8_vtune'
129+
'tools/v8_gypfiles/v8vtune.gyp:v8_vtune'
136130
],
137131
}],
138132
[ 'node_no_browser_globals=="true"', {
File renamed without changes.

0 commit comments

Comments
Β (0)