Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-27 06:43:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1200311 - Move dependentlibs.list.gtest generation to GENERATED_FILES. r=mshal

Browse Source 
MozReview-Commit-ID: B4cuUg9TjX4

--HG--
extra : rebase_source : 0e9f971184732b76eed6c1db9fb662ce76110e0c
This commit is contained in:
Chris Manchester 2017-02-06 14:34:06 -08:00
parent fa71c479fc
commit eb8151510d
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
toolkit/library/dependentlibs.py
View File

@ -126,6 +126,12 @@ def gen_list(output, lib):
deps = dependentlibs(lib, libpaths, func)
deps[lib] = mozpath.join(libpaths[0], lib)
output.write('\n'.join(deps.keys()) + '\n')
with open(output.name + ".gtest", 'w') as gtest_out:
libs = deps.keys()
libs[-1] = 'gtest/' + libs[-1]
gtest_out.write('\n'.join(libs) + '\n')
return set(deps.values())
def main():

7
toolkit/library/gtest/Makefile.in
View File

@ -23,13 +23,6 @@ include $(topsrcdir)/config/config.mk
# process from getting killed
EXPAND_LIBS_EXEC := $(PYTHON) $(topsrcdir)/config/link.py
ifdef COMPILE_ENVIRONMENT
target:: $(DIST)/bin/dependentlibs.list.gtest
endif
$(DIST)/bin/dependentlibs.list.gtest: $(DIST)/bin/dependentlibs.list
sed -e 's|$(SHARED_LIBRARY)|gtest/$(SHARED_LIBRARY)|' $< > $@
LINK_PDBFILE = xul-gtest.pdb
endif

9
toolkit/library/moz.build
View File

@ -378,12 +378,13 @@ if CONFIG['COMPILE_ENVIRONMENT']:
LIBRARY_NAME,
CONFIG['DLL_SUFFIX']
)
GENERATED_FILES += ['dependentlibs.list']
GENERATED_FILES['dependentlibs.list'].script = 'dependentlibs.py:gen_list'
GENERATED_FILES['dependentlibs.list'].inputs = [
GENERATED_FILES += [('dependentlibs.list', 'dependentlibs.list.gtest')]
dep_libs_list = GENERATED_FILES[('dependentlibs.list', 'dependentlibs.list.gtest')]
dep_libs_list.script = 'dependentlibs.py:gen_list'
dep_libs_list.inputs = [
'!%s' % full_libname,
]
FINAL_TARGET_FILES += ['!dependentlibs.list']
FINAL_TARGET_FILES += ['!dependentlibs.list', '!dependentlibs.list.gtest']
# WebRender dependencies
if CONFIG['MOZ_ENABLE_WEBRENDER']: