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

Bug 748467: Fix some dependencies for android fast packaging. r=ted

Browse Source
This commit is contained in:
Kyle Huey 2012-05-15 15:06:52 -07:00
parent 3f4c70aee7
commit c162315386
3 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mobile/android/installer/Makefile.in
View File

@ -96,7 +96,7 @@ endif
DEFINES += -DBINPATH=$(BINPATH)
ifdef MOZ_PKG_MANIFEST_P
$(MOZ_PKG_MANIFEST): $(MOZ_PKG_MANIFEST_P) FORCE
$(MOZ_PKG_MANIFEST): $(MOZ_PKG_MANIFEST_P) $(GLOBAL_DEPS)
$(PYTHON) $(topsrcdir)/config/Preprocessor.py $(DEFINES) $(ACDEFINES) $< > $@
ifdef MOZ_CHROME_MULTILOCALE
printf "\n[multilocale]\n" >> $@

9
toolkit/mozapps/installer/packager-deps.py Normal file
View File

@ -0,0 +1,9 @@
import os, sys
filename = sys.argv[1]
with open(filename, 'r') as f:
for l in f.readlines():
l = l.strip()
if not l.startswith("bin/"):
continue
print l[4:]

14
toolkit/mozapps/installer/packager.mk
View File

@ -883,10 +883,22 @@ ifdef MOZ_PACKAGE_JSSHELL
endif # MOZ_PACKAGE_JSSHELL
endif # LIBXUL_SDK
make-package: stage-package $(PACKAGE_XULRUNNER) make-sourcestamp-file
make-package-internal: stage-package $(PACKAGE_XULRUNNER) make-sourcestamp-file
@echo "Compressing..."
cd $(DIST) && $(MAKE_PACKAGE)
ifdef MOZ_FAST_PACKAGE
MAKE_PACKAGE_DEPS = $(wildcard $(subst * , ,$(addprefix $(DIST)/bin/,$(shell $(PYTHON) $(topsrcdir)/toolkit/mozapps/installer/packager-deps.py $(MOZ_PKG_MANIFEST)))))
else
MAKE_PACKAGE_DEPS = FORCE
endif
make-package: $(MAKE_PACKAGE_DEPS)
$(MAKE) make-package-internal
$(TOUCH) $@
GARBAGE += make-package
make-sourcestamp-file::
$(NSINSTALL) -D $(DIST)/$(PKG_PATH)
@echo "$(BUILDID)" > $(MOZ_SOURCESTAMP_FILE)