Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-08 10:44:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge backout

Browse Source
This commit is contained in:
Chris Jones 2011-03-31 21:32:46 -05:00
commit 4b23030234
3 changed files with 6 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
toolkit/locales/l10n.mk
View File

@ -63,6 +63,8 @@
run_for_effects := $(shell if test ! -d $(DIST); then $(NSINSTALL) -D $(DIST); fi)
_ABS_DIST := $(shell cd $(DIST) && pwd)
# This makefile uses variable overrides from the libs-% target to
# build non-default locales to non-default dist/ locations. Be aware!
@ -128,14 +130,6 @@ unpack: $(STAGEDIST)
# may be overridden if necessary.
MOZDEPTH ?= $(DEPTH)
ifdef MOZ_MAKE_COMPLETE_MAR
MAKE_COMPLETE_MAR = 1
ifeq ($(OS_ARCH), WINNT)
ifneq ($(MOZ_PKG_FORMAT), SFX7Z)
MAKE_COMPLETE_MAR =
endif
endif
endif
repackage-zip: UNPACKAGE="$(ZIP_IN)"
repackage-zip: libs-$(AB_CD)
# Adjust jar logs with the new locale (can't use sed -i because of bug 373784)
@ -159,7 +153,7 @@ ifeq (WINCE,$(OS_ARCH))
cd $(DIST)/l10n-stage; \
$(MAKE_CAB)
endif
ifdef MAKE_COMPLETE_MAR
ifdef MOZ_MAKE_COMPLETE_MAR
$(MAKE) -C $(MOZDEPTH)/tools/update-packaging full-update AB_CD=$(AB_CD) \
MOZ_PKG_PRETTYNAMES=$(MOZ_PKG_PRETTYNAMES) \
PACKAGE_BASE_DIR="$(_ABS_DIST)/l10n-stage" \

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

@ -148,7 +148,7 @@ INNER_MAKE_PACKAGE = rm -f app.7z && \
mv core $(MOZ_PKG_DIR) && \
cat $(SFX_HEADER) app.7z > $(PACKAGE) && \
chmod 0755 $(PACKAGE)
INNER_UNMAKE_PACKAGE = $(CYGWIN_WRAPPER) 7z x $(UNPACKAGE) core && \
INNER_UNMAKE_PACKAGE = $(CYGWIN_WRAPPER) 7z x $(UNPACKAGE) && \
mv core $(MOZ_PKG_DIR)
endif

18
tools/update-packaging/Makefile.in
View File

@ -44,6 +44,8 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
include $(topsrcdir)/toolkit/mozapps/installer/package-name.mk
# input location for the build, usually $(DIST)
# set this to $(DIST)/l10n-stage per override for L10n builds
PACKAGE_BASE_DIR = $(DIST)
@ -70,22 +72,7 @@ MBSDIFF_BIN = $(LIBXUL_DIST)/host/bin/mbsdiff$(HOST_BIN_SUFFIX)
full-update:: complete-patch
ifeq ($(OS_TARGET), WINNT)
MOZ_PKG_FORMAT := SFX7Z
UNPACKAGE = "$(subst $(DIST),$(_ABS_DIST),$(INSTALLER_PACKAGE))"
ifdef AB_CD
ifdef MOZ_PKG_PRETTYNAMES
UNPACKAGE = "$(PACKAGE_BASE_DIR)/$(PACKAGE)"
endif
endif
endif
complete-patch::
ifeq ($(OS_TARGET), WINNT)
test -f $(UNPACKAGE)
$(RM) -rf "$(PACKAGE_DIR)"
cd $(PACKAGE_BASE_DIR) && $(INNER_UNMAKE_PACKAGE)
endif
mkdir -p $(STAGE_DIR)
MAR=$(MAR_BIN) \
$(srcdir)/make_full_update.sh \
@ -102,4 +89,3 @@ partial-patch::
"$(DST_BUILD)"
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/toolkit/mozapps/installer/packager.mk