Commit2c17e28

committed

tools: allow passing absolute path of config.gypi in js2c

1 parent4d624c3 commit2c17e28Copy full SHA for 2c17e28

File tree

-19

lines changed

-19

lines changed

Lines changed: 1 addition & 19 deletions

Original file line number	Diff line number	Diff line change
`@@ -2350,22 +2350,4 @@ index 11616e1bcac5308020eb68fdb811bfb86cb14dd5..845e6ce69d93983963a7a57117ecab3b`
`2350`	`2350`
`2351`	`2351`	`if 'false' == variables.get('node_shared_libuv'):`
`2352`	`2352`	`subdir_files('deps/uv/include', 'include/node/', action)`
`2353`		`-diff --git a/tools/js2c.py b/tools/js2c.py`
`2354`		`-index 54c7dfce3631001e108570b19d34966edafd624f..077bba1572f05f1aa16553894703b12abc19a985 100755`
`2355`		`---- a/tools/js2c.py`
`2356`		`-+++ b/tools/js2c.py`
`2357`		`-@@ -131,6 +131,14 @@ def NormalizeFileName(filename):`
`2358`		`- split = split[1:]`
`2359`		`- if len(split):`
`2360`		`- filename = '/'.join(split)`
`2361`		`-+`
`2362`		`-+ # Electron-specific: when driving the node build from Electron, we generate`
`2363`		`-+ # config.gypi in a separate directory and pass the absolute path to js2c.`
`2364`		`-+ # This overrides the absolute path so that the variable names in the`
`2365`		`-+ # generated C are as if it was in the root node directory.`
`2366`		`-+ if filename.endswith("/config.gypi"):`
`2367`		`-+ filename = "config.gypi"`
`2368`		`-+`
`2369`		`- return os.path.splitext(filename)[0]`
`2370`		`-`
`2371`		`-`
	`2353`	`+`

Comments

(0)