Skip to content

Revert "build,test: make building addon tests less fragile" - broken source tarballs #18287

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
rvagg wants to merge 4 commits into from
Closed

Revert "build,test: make building addon tests less fragile" - broken source tarballs #18287

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4d705e6
Revert "build,tools: check freshness of doc addons"
rvagg Jan 23, 2018
a6051eb
Revert "build,test: make building addon tests less fragile"
rvagg Jan 23, 2018
9134772
Revert "tools: simplify tools/doc/addon-verify.js"
rvagg Jan 23, 2018
cd9fd23
Revert "tools: teach gyp to write an 'all deps' rule"
rvagg Jan 23, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Revert "tools: teach gyp to write an 'all deps' rule" 
This reverts commit 920c132.

Reverted along with d9b59de as this breaks compilation from
downloadable source tarballs.
  • Loading branch information
@rvagg
rvagg committed Jan 24, 2018
commit cd9fd235a9a18717f8515b7451217a29f554ed40
14 changes: 0 additions & 14 deletions tools/gyp/pylib/gyp/generator/make.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2136,7 +2136,6 @@ def CalculateMakefilePath(build_file, base_name):
for target in gyp.common.AllTargets(target_list, target_dicts, build_file):
needed_targets.add(target)

all_deps = set()
build_files = set()
include_list = set()
for qualified_target in target_list:
Expand Down Expand Up @@ -2185,12 +2184,6 @@ def CalculateMakefilePath(build_file, base_name):
os.path.dirname(makefile_path))
include_list.add(mkfile_rel_path)

if 'actions' in spec:
for action in spec['actions']:
all_deps.update(map(writer.Absolutify, action['inputs']))
if 'sources' in spec:
all_deps.update(map(writer.Absolutify, spec['sources']))

# Write out per-gyp (sub-project) Makefiles.
depth_rel_path = gyp.common.RelativePath(options.depth, os.getcwd())
for build_file in build_files:
Expand Down Expand Up @@ -2234,10 +2227,3 @@ def CalculateMakefilePath(build_file, base_name):
root_makefile.write(SHARED_FOOTER)

root_makefile.close()

# Hack to get rid of $(obj)/path/to/foo.o deps that node.gyp adds manually.
all_deps = [s for s in all_deps if not '$' in s]
all_deps_path = os.path.join(options.toplevel_dir, '.deps')
with open(all_deps_path, 'w') as f:
f.write('ALL_DEPS := \\\n\t')
f.write(' \\\n\t'.join(sorted(all_deps)))