bug 464154: l10n-for-releases fixes, l10n-upload-% target. r=pike,ted (ab629e5d) · Commits · Tommy Webb / Tor Browser

browser/locales/Makefile.in

+16 −6

Original line number	Diff line number	Diff line
		@@ -84,11 +84,12 @@ APP_VERSION := $(shell cat $(srcdir)/../config/version.txt)
		PWD := $(shell pwd)
		core_abspath = $(if $(findstring :,$(1)),$(1),$(if $(filter /%,$(1)),$(1),$(PWD)/$(1)))

		# ZIP_IN is defaulted to be compatible with the files the wget-en-US target
		# pulls. You may override ZIP_IN if you provide your own files. You also _must_
		# override ZIP_IN when MOZ_PKG_PRETTYNAMES is defined - the default will not
		# These are defaulted to be compatible with the files the wget-en-US target
		# pulls. You may override them if you provide your own files. You _must_
		# override them when MOZ_PKG_PRETTYNAMES is defined - the defaults will not
		# work in that case.
		ZIP_IN ?= $(_ABS_DIST)/$(PACKAGE)
		WIN32_INSTALLER_IN ?= $(_ABS_DIST)/$(PKG_INST_PATH)$(PKG_INST_BASENAME).exe

		DEFINES += \
		-DAB_CD=$(AB_CD) \
		@@ -240,7 +241,6 @@ endif
		chmod 0755 $(WIN32_INSTALLER_OUT)

		ifeq (WINNT,$(OS_ARCH))
		repackage-win32-installer-%: WIN32_INSTALLER_IN=$(_ABS_DIST)/$(PKG_INST_PATH)$(PKG_INST_BASENAME).exe
		repackage-win32-installer-%: $(WIN32_INSTALLER_IN) libs-%
		@$(MAKE) repackage-win32-installer AB_CD=$* WIN32_INSTALLER_IN=$(WIN32_INSTALLER_IN)
		else
		@@ -250,7 +250,7 @@ endif
		ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
		STAGEDIST = $(_ABS_DIST)/l10n-stage/$(MOZ_PKG_APPNAME)/$(_APPNAME)/Contents/MacOS
		else
		STAGEDIST = $(_ABS_DIST)/l10n-stage/$(MOZ_PKG_APPNAME)
		STAGEDIST = $(_ABS_DIST)/l10n-stage/$(MOZ_PKG_DIR)
		endif

		$(STAGEDIST): AB_CD:=en-US
		@@ -318,7 +318,6 @@ endif
		$(NSINSTALL) -D $(DIST)/$(PKG_PATH)
		mv -f "$(DIST)/l10n-stage/$(PACKAGE)" "$(DIST)/$(PACKAGE)"

		repackage-zip-%: ZIP_IN=$(_ABS_DIST)/$(PACKAGE)
		repackage-zip-%: $(ZIP_IN) $(STAGEDIST) libs-%
		@$(MAKE) repackage-zip AB_CD=$* ZIP_IN=$(ZIP_IN)

		@@ -425,6 +424,17 @@ endif
		# Set the permissions that the folders will have in ftp once uploaded
		chmod -vR 775 $(UPLOAD_DIR)

		l10n-upload-%: AB_CD=$*
		l10n-upload-%:
		$(PYTHON) $(topsrcdir)/build/upload.py --base-path $(DIST) "$(DIST)/$(PACKAGE)" $(DIST)/$(LANGPACK)
		ifdef MOZ_MAKE_COMPLETE_MAR
		$(PYTHON) $(topsrcdir)/build/upload.py --base-path $(DIST) $(DIST)/$(COMPLETE_MAR); \
		endif
		ifeq (WINNT, $(OS_ARCH))
		$(PYTHON) $(topsrcdir)/build/upload.py --base-path $(DIST) "$(INSTALLER_PACKAGE)"
		endif


		merge-%:
		ifdef LOCALE_MERGEDIR
		$(RM) -rf $(LOCALE_MERGEDIR)

toolkit/mozapps/installer/package-name.mk

+6 −1

Original line number	Diff line number	Diff line
		@@ -87,6 +87,7 @@ ifdef MOZ_PKG_SPECIAL
		MOZ_PKG_PLATFORM := $(MOZ_PKG_PLATFORM)-$(MOZ_PKG_SPECIAL)
		endif

		MOZ_PKG_DIR = $(MOZ_APP_NAME)

		ifndef MOZ_PKG_PRETTYNAMES # standard package names

		@@ -100,8 +101,10 @@ PKG_INST_BASENAME = $(PKG_BASENAME).installer
		PKG_INST_PATH = install/sea/
		PKG_UPDATE_BASENAME = $(PKG_BASENAME)
		PKG_UPDATE_PATH = update/
		COMPLETE_MAR = $(PKG_UPDATE_PATH)$(PKG_UPDATE_BASENAME).complete.mar
		PKG_LANGPACK_BASENAME = $(MOZ_PKG_APPNAME)-$(MOZ_PKG_VERSION).$(AB_CD).langpack
		PKG_LANGPACK_PATH = install/
		LANGPACK = $(PKG_LANGPACK_PATH)$(PKG_LANGPACK_BASENAME).xpi
		PKG_SRCPACK_BASENAME = $(MOZ_PKG_APPNAME)-$(MOZ_PKG_VERSION).source
		PKG_SRCPACK_PATH =

		@@ -136,8 +139,10 @@ PKG_PATH = $(MOZ_PKG_PLATFORM)/$(AB_CD)/
		PKG_INST_PATH = $(PKG_PATH)
		PKG_UPDATE_BASENAME = $(MOZ_PKG_APPNAME_LC)-$(MOZ_PKG_VERSION)
		PKG_UPDATE_PATH = update/$(PKG_PATH)
		COMPLETE_MAR = $(PKG_UPDATE_PATH)$(PKG_UPDATE_BASENAME).complete.mar
		PKG_LANGPACK_BASENAME = $(AB_CD)
		PKG_LANGPACK_PATH = langpack/
		PKG_LANGPACK_PATH = $(MOZ_PKG_PLATFORM)/xpi/
		LANGPACK = $(PKG_LANGPACK_PATH)$(PKG_LANGPACK_BASENAME).xpi
		PKG_SRCPACK_BASENAME = $(MOZ_PKG_APPNAME_LC)-$(MOZ_PKG_VERSION).source
		PKG_SRCPACK_PATH = source/

toolkit/mozapps/installer/packager.mk

+0 −2

Original line number	Diff line number	Diff line
		@@ -74,8 +74,6 @@ endif # MOZ_PKG_FORMAT

		PACKAGE = $(PKG_PATH)$(PKG_BASENAME)$(PKG_SUFFIX)

		MOZ_PKG_DIR = $(MOZ_APP_NAME)

		# By default, the SDK uses the same packaging type as the main bundle,
		# but on mac it is a .tar.bz2
		SDK_SUFFIX = $(PKG_SUFFIX)

tools/update-packaging/Makefile.in

+1 −1

Original line number	Diff line number	Diff line
		@@ -64,7 +64,7 @@ else
		PACKAGE_DIR = $(PACKAGE_BASE_DIR)/$(MOZ_PKG_APPNAME)/$(MOZ_APP_DISPLAYNAME).app
		endif
		else
		PACKAGE_DIR = $(PACKAGE_BASE_DIR)/$(MOZ_PKG_APPNAME)
		PACKAGE_DIR = $(PACKAGE_BASE_DIR)/$(MOZ_PKG_DIR)
		endif

		MAR_BIN = $(DIST)/host/bin/mar$(HOST_BIN_SUFFIX)