Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-16 13:56:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1166538 - Use zip py_action in a few places. r=gps

Browse Source
This commit is contained in:
Mike Hommey 2015-05-20 07:52:55 +09:00
parent 4a4cc01c62
commit 622e7d63a3
4 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/rules.mk
View File

@ -1305,7 +1305,7 @@ ifndef MOZ_DEBUG
endif endif
endif endif
@echo 'Packaging $(XPI_PKGNAME).xpi...' @echo 'Packaging $(XPI_PKGNAME).xpi...'
cd $(FINAL_TARGET) && $(ZIP) -qr ../$(XPI_PKGNAME).xpi * $(call py_action,zip,-C $(FINAL_TARGET) ../$(XPI_PKGNAME).xpi '*')
endif endif
# See comment above about moving this out of the tools tier. # See comment above about moving this out of the tools tier.

3
mobile/android/geckoview_library/Makefile.in
View File

@ -36,8 +36,7 @@ package: local.properties project.properties AndroidManifest.xml FORCE
$(MKDIR) -p $(_ABS_DIST)/geckoview_library $(MKDIR) -p $(_ABS_DIST)/geckoview_library
# Zip the assets into $(DIST)/geckoview_library/geckoview_assets.zip # Zip the assets into $(DIST)/geckoview_library/geckoview_assets.zip
cd $(_ABS_DIST)/$(MOZ_APP_NAME) && \ $(call py_action,zip,-C $(_ABS_DIST)/$(MOZ_APP_NAME) $(_ABS_DIST)/geckoview_library/geckoview_assets.zip assets)
$(ZIP) -q -r $(_ABS_DIST)/geckoview_library/geckoview_assets.zip assets
# Make empty directories to fit an Android project structure # Make empty directories to fit an Android project structure
$(MKDIR) -p bin gen libs/$(ANDROID_CPU_ARCH) src $(MKDIR) -p bin gen libs/$(ANDROID_CPU_ARCH) src

3
toolkit/locales/l10n.mk
View File

@ -170,8 +170,7 @@ langpack-%: libs-%
$(NSINSTALL) -D $(DIST)/$(PKG_LANGPACK_PATH) $(NSINSTALL) -D $(DIST)/$(PKG_LANGPACK_PATH)
$(call py_action,preprocessor,$(DEFINES) $(ACDEFINES) \ $(call py_action,preprocessor,$(DEFINES) $(ACDEFINES) \
-I$(TK_DEFINES) -I$(APP_DEFINES) $(srcdir)/generic/install.rdf -o $(DIST)/xpi-stage/$(XPI_NAME)/install.rdf) -I$(TK_DEFINES) -I$(APP_DEFINES) $(srcdir)/generic/install.rdf -o $(DIST)/xpi-stage/$(XPI_NAME)/install.rdf)
cd $(DIST)/xpi-stage/locale-$(AB_CD) && \ $(call py_action,zip,-C $(DIST)/xpi-stage/locale-$(AB_CD) $(LANGPACK_FILE) install.rdf $(PKG_ZIP_DIRS) chrome.manifest)
$(ZIP) -r9D $(LANGPACK_FILE) install.rdf $(PKG_ZIP_DIRS) chrome.manifest
# This variable is to allow the wget-en-US target to know which ftp server to download from # This variable is to allow the wget-en-US target to know which ftp server to download from
ifndef EN_US_BINARY_URL ifndef EN_US_BINARY_URL

2
toolkit/mozapps/installer/upload-files.mk
View File

@ -158,7 +158,7 @@ PKG_SUFFIX = .zip
INNER_MAKE_PACKAGE = $(ZIP) -r9D $(PACKAGE) $(MOZ_PKG_DIR) \ INNER_MAKE_PACKAGE = $(ZIP) -r9D $(PACKAGE) $(MOZ_PKG_DIR) \
-x \*/.mkdir.done -x \*/.mkdir.done
INNER_UNMAKE_PACKAGE = $(UNZIP) $(UNPACKAGE) INNER_UNMAKE_PACKAGE = $(UNZIP) $(UNPACKAGE)
MAKE_SDK = $(ZIP) -r9D $(SDK) $(MOZ_APP_NAME)-sdk MAKE_SDK = $(call py_action,zip,$(SDK) $(MOZ_APP_NAME)-sdk)
endif endif
ifeq ($(MOZ_PKG_FORMAT),SFX7Z) ifeq ($(MOZ_PKG_FORMAT),SFX7Z)
PKG_SUFFIX = .exe PKG_SUFFIX = .exe