KotJohansson/palemoon27
1
0
Fork 0
mirror of https://github.com/roytam1/palemoon27.git synced 2026-05-26 14:30:27 +00:00
Code Issues Projects Releases Wiki Activity

import changes from `dev' branch of rmottola/Arctic-Fox:

Browse Source 
- add back some crash and webapprt stuff (f72c4c2afc)
- Bug 1228289 - Avoid l10n-check overwriting final package when MOZ_SIMPLE_PACKAGE_NAME is set. r=ted (de6b1ea792)
- Bug 1233314 - beta repacks are failing trying to find checksums file. r=mshal (a9c0abded7)
- Bug 1144695 - Fix make installers errors in mozharness desktop repacks. r=gps, r=mgerva (8856c0934d)
- missing bit of 817723 (31827b055b)
- Bug 1235676 - Add a global ABS_DIST variable for a non-relative version of DIST, based on topobjdir. r=mshal (978323541c)
- Bug 1235676 - Replace _ABS_DIST with ABS_DIST. r=mshal (b3d4afb23f)
- Bug 1235676 - Replace $(abspath $(DEPTH)) with $(topobjdir). r=mshal (c841b0d0dd)
- Bug 1235676 - Add a topobjdir variable to all Makefiles. r=mshal (4d0fa1d713)
- Bug 1180461 - Part 1: Build gaia during b2gdroid build. r=glandium (e62543fc94)
- Bug 1199714 - Add gaia build options r=nalexander (c6bcf744d2)
- Bug 1202037 - Create a Gaia distribution for b2gdroid r=nalexander (621ea75fa3)
- Bug 1219075 - Enable Android lockscreen for b2gdroid r=fabrice (b63bee53c7)
- Bug 1193224 - Remove --tests-root-dir option: followup to remove it from testsuite-targets.mk. r=ahal (91f99d1166)
- Bug 1193257 - Make xpcshell harness command line arguments path filters for tests: followup to fix 'make xpcshell-tests'. r=ahal (ad2a4d80ec)
- Bug 1210162 - Add --suite reftest to REMOTE_REFTEST in testsuite-targets.mk. r=jgraham (67d8965908)
- bug 1201224 - stop unifying test package during mac universal builds. r=gps (ef060aebd8)
- Bug 1208320 - Produce mozharness test archive via mozpack; r=glandium (ca00c255a6)
- Bug 1208320 - Produce xpcshell archive without staging test files; r=glandium (722bcb774a)
- Bug 1208320 - Produce mochitest test archive without staging test files; r=glandium (af03691082)
- Bug 1208320 - Produce web-platform test archive without staging; r=glandium (57150c766c)
- Bug 1208320 - Produce talos test archive without staging files; r=glandium (351c8241e5)
- Bug 1208320 - Produce common tests archive via Python; r=glandium (f4f7eb1e69)
- Bug 1208320 - Produce cppunittest and reftest packages via Python; r=glandium (9844181ea2)
- Bug 1208320 - Do not stage JIT test files before archiving; r=glandium (34fff39980)
- Bug 1208320 - Do not stage TPS files before archiving; r=glandium (f59c2d60cb)
- Bug 1208320 - Do not stage JS test modules before archiving; r=glandium (98693daec5)
- Bug 1208320 - Do not stage mozbase files before archiving; r=glandium (2525f71fa1)
- Bug 1209628 - Package mozharness alongside other build artifacts instead of 'package-tests', r=gps (d550f2a75a)
- Bug 1221356 - Don't package mozharness for Thunderbird builds. r=gps (ba3f880b29)
- Bug 1235676 - Replace $(abspath $(DIST)) with $(ABS_DIST). r=mshal (2bf61abf38)
- Bug 1231379 - Disable omni.ja compression on desktop platforms r=catlee,glandium (8df98d00ec)
- bit of 844785 (761458c7e0)
- Bug 1208320 - Do not stage some C++ unit test support files before archiving; r=glandium (76ece8bf19)
- Bug 992983 - Build and upload the gtest libxul during test packaging. r=ted (256dc5a4de)
- bug 1203573 - add a MOZ_SIMPLE_PACKAGE_NAME variable to simplify package naming for taskcluster's benefit. r=gps (0756055df4)
- Bug 1243750 - Install all SDKs into sdk/; r=glandium (af52ad9429)
- Bug 1235107 - Move bookmarks.html to a chrome localized location. r=dolske (7e2d65c85c)
- Bug 1235108 - Stop using vpaths for bookmarks.inc. r=gps (185924667d)
- Bug 1235108 - Stop using the -I option to force-include bookmarks.inc in bookmarks.html.in. r=gps (b162510c1c)
- Bug 1235108 - For ja-JP-mac locale, reassign AB_CD in bookmarks.html.in instead of in the Makefile. r=gps (d35a8f17aa)
- Bug 1235108 - Install bookmarks.html from jar.mn instead of a custom Makefile rule. r=gps (f8a134e132)
- Bug 1207882 - Use source searchplugin files directly for en-US locale. r=gps (d8a2cb5c77)
- Bug 1209606 - Limit using source searchplugin files directly to `mach build faster` until bug 1105092 is fixed. r=gps (fd52cb321c)
- Bug 1239217 - Skip empty install manifests, apart a few exceptions. r=gps (a7ec6d1102)
This commit is contained in:
roytam1
2023-09-26 16:00:20 +08:00
parent 38f8c72609
commit 24b33c472d
42 changed files with 533 additions and 335 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile.in
+3 -6
View File
@@ -128,16 +128,13 @@ ifdef JS_STANDALONE
NO_REMOVE=1
endif
.PHONY: $(addprefix install-,$(install_manifests))
$(addprefix install-,$(filter dist/%,$(install_manifests))): install-dist/%: $(install_manifest_depends)
$(call py_action,process_install_manifest,$(if $(NO_REMOVE),--no-remove )$(DIST)/$* _build_manifests/install/dist_$*)
.PHONY: $(addprefix install-,$(subst /,_,$(install_manifests)))
$(addprefix install-,$(install_manifests)): install-%: $(install_manifest_depends)
$(addprefix $(call py_action,process_install_manifest,$(if $(NO_REMOVE),--no-remove )$*) ,$(wildcard _build_manifests/install/$(subst /,_,$*)))
# Dummy wrapper rule to allow the faster backend to piggy back
install-dist_%: install-dist/% ;
install-_tests: $(install_manifest_depends)
$(call py_action,process_install_manifest,$(if $(NO_REMOVE),--no-remove )_tests _build_manifests/install/_tests)
# For compatibility
.PHONY: install-tests
install-tests: install-_tests
b2g/gaia/Makefile.in
+11 -3
View File
@@ -2,7 +2,15 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
GAIA_PATH := gaia/profile
# For b2gdroid, gaia ends up in the assets/gaia folder in the APK.
GAIA_PATH := $(if MOZ_B2GDROID,gaia/assets/gaia,gaia/profile)
# For b2gdroid, we disable the screen timeout since this is managed by android.
# We also limit the app set to the production ones.
GAIA_OPTIONS := $(if MOZ_B2GDROID, \
GAIA_DISTRIBUTION_DIR=distros/b2gdroid \
NO_LOCK_SCREEN=1 \
)
GENERATED_DIRS += $(DIST)/bin/$(GAIA_PATH)
@@ -10,5 +18,5 @@ include $(topsrcdir)/config/rules.mk
libs::
+$(MAKE) -j1 -C $(GAIADIR) clean
+$(MAKE) -j1 -C $(GAIADIR) profile
(cd $(GAIADIR)/profile && tar $(TAR_CREATE_FLAGS) - .) | (cd $(abspath $(DIST))/bin/$(GAIA_PATH) && tar -xf -)
+$(GAIA_OPTIONS) $(MAKE) -j1 -C $(GAIADIR) profile
(cd $(GAIADIR)/profile && tar $(TAR_CREATE_FLAGS) - .) | (cd $(ABS_DIST)/bin/$(GAIA_PATH) && tar -xf -)
b2g/gaia/moz.build
+15 -13
View File
@@ -4,17 +4,19 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
Program(CONFIG['MOZ_APP_NAME'])
if not CONFIG['MOZ_B2GDROID']:
# b2gdroid does not build a runner executable, but it does build gaia; see Makefile.in.
Program(CONFIG['MOZ_APP_NAME'])
if CONFIG['OS_ARCH'] == 'WINNT':
SOURCES += [
'run-b2g.cpp',
]
DEFINES['B2G_NAME'] = 'L"%s-bin%s"' % (PROGRAM, CONFIG['BIN_SUFFIX'])
DEFINES['GAIA_PATH'] = 'L"gaia\\\\profile"'
else:
SOURCES += [
'run-b2g.c',
]
DEFINES['B2G_NAME'] = '"%s-bin%s"' % (PROGRAM, CONFIG['BIN_SUFFIX'])
DEFINES['GAIA_PATH'] = '"gaia/profile"'
if CONFIG['OS_ARCH'] == 'WINNT':
SOURCES += [
'run-b2g.cpp',
]
DEFINES['B2G_NAME'] = 'L"%s-bin%s"' % (PROGRAM, CONFIG['BIN_SUFFIX'])
DEFINES['GAIA_PATH'] = 'L"gaia\\\\profile"'
else:
SOURCES += [
'run-b2g.c',
]
DEFINES['B2G_NAME'] = '"%s-bin%s"' % (PROGRAM, CONFIG['BIN_SUFFIX'])
DEFINES['GAIA_PATH'] = '"gaia/profile"'
b2g/locales/Makefile.in
+8 -8
View File
@@ -19,8 +19,8 @@ PWD := $(CURDIR)
# 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
ZIP_IN ?= $(ABS_DIST)/$(PACKAGE)
WIN32_INSTALLER_IN ?= $(ABS_DIST)/$(PKG_INST_PATH)$(PKG_INST_BASENAME).exe
RETRIEVE_WINDOWS_INSTALLER = 1
MOZ_LANGPACK_EID=langpack-$(AB_CD)@b2g.mozilla.org
@@ -31,9 +31,9 @@ L10N_PREF_JS_EXPORTS_FLAGS = $(PREF_PPFLAGS) --silence-missing-directive-warning
PP_TARGETS += L10N_PREF_JS_EXPORTS
ifneq (,$(filter cocoa,$(MOZ_WIDGET_TOOLKIT)))
MOZ_PKG_MAC_DSSTORE=$(_ABS_DIST)/branding/dsstore
MOZ_PKG_MAC_BACKGROUND=$(_ABS_DIST)/branding/background.png
MOZ_PKG_MAC_ICON=$(_ABS_DIST)/branding/disk.icns
MOZ_PKG_MAC_DSSTORE=$(ABS_DIST)/branding/dsstore
MOZ_PKG_MAC_BACKGROUND=$(ABS_DIST)/branding/background.png
MOZ_PKG_MAC_ICON=$(ABS_DIST)/branding/disk.icns
MOZ_PKG_MAC_EXTRA=--symlink '/Applications:/ '
endif
@@ -41,8 +41,8 @@ ifeq (WINNT,$(OS_ARCH))
UNINSTALLER_PACKAGE_HOOK = $(RM) -r $(STAGEDIST)/uninstall; \
$(NSINSTALL) -D $(STAGEDIST)/uninstall; \
cp ../installer/windows/l10ngen/helper.exe $(STAGEDIST)/uninstall; \
$(RM) $(_ABS_DIST)/l10n-stage/setup.exe; \
cp ../installer/windows/l10ngen/setup.exe $(_ABS_DIST)/l10n-stage; \
$(RM) $(ABS_DIST)/l10n-stage/setup.exe; \
cp ../installer/windows/l10ngen/setup.exe $(ABS_DIST)/l10n-stage; \
$(NULL)
endif
@@ -75,7 +75,7 @@ chrome-%:
@$(MAKE) chrome AB_CD=$*
@$(MAKE) -C $(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales chrome AB_CD=$*
repackage-win32-installer: WIN32_INSTALLER_OUT=$(_ABS_DIST)/$(PKG_INST_PATH)$(PKG_INST_BASENAME).exe
repackage-win32-installer: WIN32_INSTALLER_OUT=$(ABS_DIST)/$(PKG_INST_PATH)$(PKG_INST_BASENAME).exe
repackage-win32-installer: $(call ESCAPE_SPACE,$(WIN32_INSTALLER_IN)) $(SUBMAKEFILES) libs-$(AB_CD)
@echo 'Repackaging $(WIN32_INSTALLER_IN) into $(WIN32_INSTALLER_OUT).'
$(MAKE) -C $(DEPTH)/$(MOZ_BRANDING_DIRECTORY) export
browser/components/migration/MigrationUtils.jsm
+1 -1
View File
@@ -290,7 +290,7 @@ this.MigratorPrototype = {
doMigrate();
};
BookmarkHTMLUtils.importFromURL(
"resource:///defaults/profile/bookmarks.html", true).then(
"chrome://browser/locale/bookmarks.html", true).then(
onImportComplete, onImportComplete);
return;
}
browser/components/nsBrowserGlue.js
+1 -1
View File
@@ -1425,7 +1425,7 @@ BrowserGlue.prototype = {
let bookmarksUrl = null;
if (restoreDefaultBookmarks) {
// User wants to restore bookmarks.html file from default profile folder
bookmarksUrl = "resource:///defaults/profile/bookmarks.html";
bookmarksUrl = "chrome://browser/locale/bookmarks.html";
}
else if (yield OS.File.exists(BookmarkHTMLUtils.defaultPath)) {
bookmarksUrl = OS.Path.toFileURI(BookmarkHTMLUtils.defaultPath);
browser/installer/package-manifest.in
-1
View File
@@ -46,7 +46,6 @@
@RESPATH@/browser/chrome/@AB_CD@.manifest
@RESPATH@/chrome/@AB_CD@@JAREXT@
@RESPATH@/chrome/@AB_CD@.manifest
@RESPATH@/browser/defaults/profile/bookmarks.html
@RESPATH@/browser/defaults/profile/chrome/*
@RESPATH@/browser/defaults/profile/localstore.rdf
@RESPATH@/browser/defaults/profile/mimeTypes.rdf
browser/locales/Makefile.in
+29 -28
View File
@@ -6,11 +6,11 @@
include $(topsrcdir)/config/config.mk
ifdef LOCALE_MERGEDIR
vpath book%.inc $(LOCALE_MERGEDIR)/browser/profile
vpath crashreporter%.ini $(LOCALE_MERGEDIR)/browser/crashreporter
endif
vpath book%.inc $(LOCALE_SRCDIR)/profile
vpath crashreporter%.ini $(LOCALE_SRCDIR)/crashreporter
ifdef LOCALE_MERGEDIR
vpath book%.inc @srcdir@/en-US/profile
vpath crashreporter%.ini @srcdir@/en-US/crashreporter
endif
@@ -28,8 +28,8 @@ PWD := $(CURDIR)
# 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
ZIP_IN ?= $(ABS_DIST)/$(PACKAGE)
WIN32_INSTALLER_IN ?= $(ABS_DIST)/$(PKG_INST_PATH)$(PKG_INST_BASENAME).exe
RETRIEVE_WINDOWS_INSTALLER = 1
MOZ_LANGPACK_EID=langpack-$(AB_CD)@palemoon.org
@@ -40,9 +40,9 @@ L10N_PREF_JS_EXPORTS_FLAGS = $(PREF_PPFLAGS) --silence-missing-directive-warning
PP_TARGETS += L10N_PREF_JS_EXPORTS
ifneq (,$(filter cocoa,$(MOZ_WIDGET_TOOLKIT)))
MOZ_PKG_MAC_DSSTORE=$(_ABS_DIST)/branding/dsstore
MOZ_PKG_MAC_BACKGROUND=$(_ABS_DIST)/branding/background.png
MOZ_PKG_MAC_ICON=$(_ABS_DIST)/branding/disk.icns
MOZ_PKG_MAC_DSSTORE=$(ABS_DIST)/branding/dsstore
MOZ_PKG_MAC_BACKGROUND=$(ABS_DIST)/branding/background.png
MOZ_PKG_MAC_ICON=$(ABS_DIST)/branding/disk.icns
MOZ_PKG_MAC_EXTRA=--symlink '/Applications:/ '
endif
@@ -50,14 +50,14 @@ ifeq (WINNT,$(OS_ARCH))
UNINSTALLER_PACKAGE_HOOK = $(RM) -r $(STAGEDIST)/uninstall; \
$(NSINSTALL) -D $(STAGEDIST)/uninstall; \
cp ../installer/windows/l10ngen/helper.exe $(STAGEDIST)/uninstall; \
$(RM) $(_ABS_DIST)/l10n-stage/setup.exe; \
cp ../installer/windows/l10ngen/setup.exe $(_ABS_DIST)/l10n-stage; \
$(RM) $(ABS_DIST)/l10n-stage/setup.exe; \
cp ../installer/windows/l10ngen/setup.exe $(ABS_DIST)/l10n-stage; \
$(NULL)
STUB_HOOK = $(NSINSTALL) -D '$(_ABS_DIST)/$(PKG_INST_PATH)'; \
$(RM) '$(_ABS_DIST)/$(PKG_INST_PATH)$(PKG_STUB_BASENAME).exe'; \
cp ../installer/windows/l10ngen/stub.exe '$(_ABS_DIST)/$(PKG_INST_PATH)$(PKG_STUB_BASENAME).exe'; \
chmod 0755 '$(_ABS_DIST)/$(PKG_INST_PATH)$(PKG_STUB_BASENAME).exe'; \
STUB_HOOK = $(NSINSTALL) -D '$(ABS_DIST)/$(PKG_INST_PATH)'; \
$(RM) '$(ABS_DIST)/$(PKG_INST_PATH)$(PKG_STUB_BASENAME).exe'; \
cp ../installer/windows/l10ngen/stub.exe '$(ABS_DIST)/$(PKG_INST_PATH)$(PKG_STUB_BASENAME).exe'; \
chmod 0755 '$(ABS_DIST)/$(PKG_INST_PATH)$(PKG_STUB_BASENAME).exe'; \
$(NULL)
endif
@@ -65,7 +65,7 @@ SEARCHPLUGINS_NAMES = $(shell cat $(call MERGE_FILE,/searchplugins/list.txt))
SEARCHPLUGINS_FILENAMES = $(subst :hidden,,$(SEARCHPLUGINS_NAMES))
SEARCHPLUGINS_PATH := .deps/generated_$(AB_CD)
SEARCHPLUGINS_TARGET := libs searchplugins
SEARCHPLUGINS := $(foreach plugin,$(addsuffix .xml,$(SEARCHPLUGINS_FILENAMES)),$(or $(wildcard $(call EN_US_OR_L10N_FILE,searchplugins/$(plugin))),$(info Missing searchplugin: $(plugin))))
SEARCHPLUGINS := $(foreach plugin,$(addsuffix .xml,$(SEARCHPLUGINS_FILENAMES)),$(or $(wildcard $(call EN_US_OR_L10N_FILE,searchplugins/$(plugin))),$(warning Missing searchplugin: $(plugin))))
# Some locale-specific search plugins may have preprocessor directives, but the
# default en-US ones do not.
SEARCHPLUGINS_FLAGS := --silence-missing-directive-warnings
@@ -101,17 +101,7 @@ PROFILE_FILES = \
PROFILE_CHROME = userChrome-example.css userContent-example.css
NO_JA_JP_MAC_AB_CD := $(if $(filter ja-JP-mac, $(AB_CD)),ja,$(AB_CD))
%/defaults/profile/bookmarks.html: bookmarks.inc generic/profile/bookmarks.html.in
$(SYSINSTALL) -D $(dir $@)
$(call py_action,preprocessor, \
-I $< \
-DAB_CD=$(NO_JA_JP_MAC_AB_CD) \
$(srcdir)/generic/profile/bookmarks.html.in \
-o $@)
libs:: $(FINAL_TARGET)/defaults/profile/bookmarks.html ;
DEFINES += -DBOOKMARKS_INCLUDE_DIR=$(dir $(call MERGE_FILE,profile/bookmarks.inc))
libs:: $(addprefix generic/profile/,$(PROFILE_FILES))
$(SYSINSTALL) $(IFLAGS1) $^ $(FINAL_TARGET)/defaults/profile
@@ -131,6 +121,9 @@ libs-%:
$(NSINSTALL) -D $(DIST)/install
@$(MAKE) -C ../../toolkit/locales libs-$* XPI_ROOT_APPID='$(XPI_ROOT_APPID)'
@$(MAKE) -C ../../services/sync/locales AB_CD=$* XPI_NAME=locale-$*
ifdef MOZ_WEBAPP_RUNTIME
@$(MAKE) -C ../../webapprt/locales AB_CD=$* XPI_NAME=locale-$*
endif
@$(MAKE) -C ../../extensions/spellcheck/locales AB_CD=$* XPI_NAME=locale-$*
@$(MAKE) -C ../../intl/locales AB_CD=$* XPI_NAME=locale-$*
@$(MAKE) -C ../../devtools/client/locales AB_CD=$* XPI_NAME=locale-$* XPI_ROOT_APPID='$(XPI_ROOT_APPID)'
@@ -138,7 +131,7 @@ libs-%:
@$(MAKE) libs AB_CD=$* XPI_NAME=locale-$* PREF_DIR=$(PREF_DIR)
@$(MAKE) -C $(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales AB_CD=$* XPI_NAME=locale-$*
repackage-win32-installer: WIN32_INSTALLER_OUT=$(_ABS_DIST)/$(PKG_INST_PATH)$(PKG_INST_BASENAME).exe
repackage-win32-installer: WIN32_INSTALLER_OUT=$(ABS_DIST)/$(PKG_INST_PATH)$(PKG_INST_BASENAME).exe
repackage-win32-installer: $(call ESCAPE_WILDCARD,$(WIN32_INSTALLER_IN)) $(SUBMAKEFILES) libs-$(AB_CD)
@echo 'Repackaging $(WIN32_INSTALLER_IN) into $(WIN32_INSTALLER_OUT).'
$(MAKE) -C $(DEPTH)/$(MOZ_BRANDING_DIRECTORY) export
@@ -200,6 +193,11 @@ else
endif
endif
ifdef MOZ_CRASHREPORTER
libs:: crashreporter-override.ini
$(SYSINSTALL) $(IFLAGS1) $^ $(FINAL_TARGET)
endif
ident:
@printf 'fx_revision '
@$(PYTHON) $(topsrcdir)/config/printconfigsetting.py \
@@ -222,6 +220,9 @@ l10n-check::
$(RM) -rf x-test
$(NSINSTALL) -D x-test/toolkit
echo '#define MOZ_LANG_TITLE Just testing' > x-test/toolkit/defines.inc
$(MAKE) installers-x-test L10NBASEDIR='$(PWD)' LOCALE_MERGEDIR='$(PWD)/mergedir'
@# ZIP_IN='$(ZIP_IN)' will pass down the *current* value of ZIP_IN, based
@# on MOZ_SIMPLE_PACKAGE_NAME not being reset, overwriting the value it
@# would get with MOZ_SIMPLE_PACKAGE_NAME reset.
$(MAKE) installers-x-test L10NBASEDIR='$(PWD)' LOCALE_MERGEDIR='$(PWD)/mergedir' ZIP_IN='$(ZIP_IN)' MOZ_SIMPLE_PACKAGE_NAME=
$(PYTHON) $(topsrcdir)/toolkit/mozapps/installer/unpack.py $(DIST)/l10n-stage/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)
cd $(DIST)/l10n-stage && test $$(cat $(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/update.locale) = x-test
browser/locales/generic/profile/bookmarks.html.in
+8
View File
@@ -1,4 +1,12 @@
#filter substitution
#include @BOOKMARKS_INCLUDE_DIR@/bookmarks.inc
#define ja_jp_mac ja-JP-mac
#if AB_CD == ja_jp_mac
#define AB_CD ja
#endif
<!-- This Source Code Form is subject to the terms of the Mozilla Public
- License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<!DOCTYPE NETSCAPE-Bookmark-file-1>
<!-- This is an automatically generated file.
It will be read and overwritten.
browser/locales/jar.mn
+6
View File
@@ -6,6 +6,7 @@
@AB_CD@.jar:
% locale browser @AB_CD@ %locale/browser/
* locale/browser/bookmarks.html (generic/profile/bookmarks.html.in)
locale/browser/aboutCertError.dtd (%chrome/browser/aboutCertError.dtd)
locale/browser/aboutDialog.dtd (%chrome/browser/aboutDialog.dtd)
locale/browser/aboutPrivateBrowsing.dtd (%chrome/browser/aboutPrivateBrowsing.dtd)
@@ -95,8 +96,13 @@
locale/browser/syncQuota.properties (%chrome/browser/syncQuota.properties)
#endif
% resource search-plugins chrome://browser/locale/searchplugins/
#if BUILD_FASTER
locale/browser/searchplugins/list.txt (%searchplugins/list.txt)
locale/browser/searchplugins/ (%searchplugins/*.xml)
#else
locale/browser/searchplugins/list.txt (.deps/generated_@AB_CD@/list.txt)
locale/browser/searchplugins/ (.deps/generated_@AB_CD@/*.xml)
#endif
% locale browser-region @AB_CD@ %locale/browser-region/
locale/browser-region/region.properties (%chrome/browser-region/region.properties)
# the following files are browser-specific overrides
build/Makefile.in
+2 -2
View File
@@ -33,7 +33,7 @@ endif
# NOTE: Keep .gdbinit in the topsrcdir for people who run gdb from the topsrcdir.
# needs to be absolute to be distinct from $(topsrcdir)/.gdbinit
GDBINIT_OBJDIR_FILES = $(topsrcdir)/.gdbinit
GDBINIT_OBJDIR_DEST = $(abspath $(DEPTH))
GDBINIT_OBJDIR_DEST = $(topobjdir)
INSTALL_TARGETS += GDBINIT_OBJDIR
# Put a .lldbinit in the bin directory and the objdir, to be picked up
@@ -52,7 +52,7 @@ INSTALL_TARGETS += LLDBINIT_FINAL_TARGET
# Put the .ycm_extra_conf.py file at the root of the objdir. It is used by
# the vim plugin YouCompleteMe.
YCM_FILES := $(topsrcdir)/.ycm_extra_conf.py
YCM_DEST := $(abspath $(DEPTH))
YCM_DEST := $(topobjdir)
YCM_TARGET := export
INSTALL_TARGETS += YCM
build/gen_test_packages_manifest.py
+14 -2
View File
@@ -19,6 +19,7 @@ ALL_HARNESSES = [
'mozbase',
'web-platform',
'talos',
'gtest',
]
PACKAGE_SPECIFIED_HARNESSES = [
@@ -30,6 +31,11 @@ PACKAGE_SPECIFIED_HARNESSES = [
'talos',
]
# These packages are not present for every build configuration.
OPTIONAL_PACKAGES = [
'gtest',
]
def parse_args():
parser = ArgumentParser(description='Generate a test_packages.json file to tell automation which harnesses require which test packages.')
@@ -46,6 +52,10 @@ def parse_args():
parser.add_argument("--%s" % harness, required=True,
action="store", dest=harness,
help="Name of the %s zip." % harness)
for harness in OPTIONAL_PACKAGES:
parser.add_argument("--%s" % harness, required=False,
action="store", dest=harness,
help="Name of the %s zip." % harness)
parser.add_argument("--dest-file", required=True,
action="store", dest="destfile",
help="Path to the output file to be written.")
@@ -66,8 +76,10 @@ def generate_package_data(args):
harness_requirements = dict([(k, [tests_common]) for k in ALL_HARNESSES])
harness_requirements['jittest'].append(jsshell)
for harness in PACKAGE_SPECIFIED_HARNESSES:
pkg_name = getattr(args, harness)
for harness in PACKAGE_SPECIFIED_HARNESSES + OPTIONAL_PACKAGES:
pkg_name = getattr(args, harness, None)
if pkg_name is None:
continue
if args.use_short_names:
pkg_name = 'target.%s.tests.zip' % harness
harness_requirements[harness].append(pkg_name)
build/macosx/universal/flight.mk
-26
View File
@@ -29,29 +29,3 @@ postflight_all:
# actually does a universal staging with both OBJDIR_ARCH_1 and OBJDIR_ARCH_2.
$(MAKE) -C $(OBJDIR_ARCH_1)/$(MOZ_BUILD_APP)/installer \
PKG_SKIP_STRIP=1 stage-package
ifdef ENABLE_TESTS
# Now, repeat the process for the test package.
$(MAKE) -C $(OBJDIR_ARCH_1) UNIVERSAL_BINARY= CHROME_JAR= package-tests
$(MAKE) -C $(OBJDIR_ARCH_2) UNIVERSAL_BINARY= CHROME_JAR= package-tests
rm -rf $(DIST_UNI)/test-stage
# automation.py differs because it hardcodes a path to
# dist/bin. It doesn't matter which one we use.
if test -d $(DIST_ARCH_1)/test-stage -a \
-d $(DIST_ARCH_2)/test-stage; then \
cp $(DIST_ARCH_1)/test-stage/mochitest/automation.py \
$(DIST_ARCH_2)/test-stage/mochitest/; \
cp -RL $(DIST_ARCH_1)/test-stage/mochitest/extensions/specialpowers \
$(DIST_ARCH_2)/test-stage/mochitest/extensions/; \
cp $(DIST_ARCH_1)/test-stage/xpcshell/automation.py \
$(DIST_ARCH_2)/test-stage/xpcshell/; \
cp $(DIST_ARCH_1)/test-stage/reftest/automation.py \
$(DIST_ARCH_2)/test-stage/reftest/; \
cp -RL $(DIST_ARCH_1)/test-stage/reftest/specialpowers \
$(DIST_ARCH_2)/test-stage/reftest/; \
$(TOPSRCDIR)/build/macosx/universal/unify \
--unify-with-sort "\.manifest$$" \
--unify-with-sort "all-test-dirs\.list$$" \
$(DIST_ARCH_1)/test-stage \
$(DIST_ARCH_2)/test-stage \
$(DIST_UNI)/test-stage; fi
endif
build/macosx/universal/mozconfig
+1 -1
View File
@@ -6,6 +6,6 @@
# As used here, arguments in $MOZ_BUILD_PROJECTS are suitable as arguments
# to gcc's -arch parameter.
mk_add_options MOZ_BUILD_PROJECTS="i386 x86_64"
mk_add_options MOZ_BUILD_PROJECTS="x86_64 i386"
. $topsrcdir/build/macosx/universal/mozconfig.common
build/upload.py
+4
View File
@@ -112,6 +112,10 @@ def GetRemotePath(path, local_file, base_path):
full remote path to place the file in. If base_path is not None, include
the relative path from base_path to file."""
if base_path is None or not local_file.startswith(base_path):
# Hack to work around OSX uploading the i386 SDK from i386/dist. Both
# the i386 SDK and x86-64 SDK end up in the same directory this way.
if base_path.endswith('/x86_64/dist'):
return GetBaseRelativePath(path, local_file, base_path.replace('/x86_64/', '/i386/'))
return path
dir = os.path.dirname(local_file)
# strip base_path + extra slash and make it unixy
config/baseconfig.mk
+1
View File
@@ -11,6 +11,7 @@ DIST = dist
else
DIST = $(DEPTH)/dist
endif
ABS_DIST = $(topobjdir)/dist
# We do magic with OBJ_SUFFIX in config.mk, the following ensures we don't
# manually use it before config.mk inclusion
config/external/nspr/Makefile.in
Vendored
-1
View File
@@ -8,7 +8,6 @@ include $(topsrcdir)/config/rules.mk
ifdef MOZ_BUILD_NSPR
# Copy NSPR to the SDK
ABS_DIST = $(abspath $(DIST))
ifdef MOZ_FOLD_LIBS
# Trick the nspr build system into not building shared libraries.
config/external/nss/Makefile.in
Vendored
-9
View File
@@ -94,15 +94,6 @@ NSS_EXTRA_DLLS += freebl_64int_3
NSS_EXTRA_DLLS += freebl_64fpu_3
endif
ABS_DIST := $(abspath $(DIST))
ifeq ($(HOST_OS_ARCH),WINNT)
ifdef CYGDRIVE_MOUNT
ABS_DIST := $(shell cygpath -w $(ABS_DIST) | sed -e 's|\\|/|g')
endif
ifneq (,$(filter mingw%,$(host_os)))
ABS_DIST := $(shell cd $(DIST) && pwd -W)
endif
endif
# For all variables such as DLLFLAGS, that may contain $(DIST)
DIST := $(ABS_DIST)
NSPR_INCLUDE_DIR = $(firstword $(filter -I%,$(NSPR_CFLAGS)))
config/faster/rules.mk
+2
View File
@@ -101,10 +101,12 @@ $(addprefix install-,$(INSTALL_MANIFESTS)): install-%: $(TOPOBJDIR)/config/build
@# The overhead is not that big, and this avoids waiting for proper
@# support for defines tracking in process_install_manifest.
@touch install_$(subst /,_,$*)
@# BOOKMARKS_INCLUDE_DIR is for bookmarks.html only.
$(PYTHON) -m mozbuild.action.process_install_manifest \
--track install_$(subst /,_,$*).track \
$(TOPOBJDIR)/$* \
-DAB_CD=en-US \
-DBOOKMARKS_INCLUDE_DIR=$(TOPSRCDIR)/browser/locales/en-US/profile \
-DMOZ_APP_BUILDID=$(shell cat $(TOPOBJDIR)/config/buildid) \
$(ACDEFINES) \
install_$(subst /,_,$*)
configure.in
+1
View File
@@ -8604,6 +8604,7 @@ AC_SUBST(MOZ_UA_BUILDID)
AC_SUBST(MOZ_APP_STATIC_INI)
AC_SUBST(MOZ_PKG_SPECIAL)
AC_SUBST(MOZ_SIMPLE_PACKAGE_NAME)
AC_SUBST(MOZILLA_OFFICIAL)
if test "$MOZILLA_OFFICIAL"; then
dom/bindings/Makefile.in
-1
View File
@@ -2,7 +2,6 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
abs_dist := $(abspath $(DIST))
webidl_base := $(topsrcdir)/dom/webidl
# Generated by moz.build
dom/plugins/test/testaddon/Makefile.in
+1 -1
View File
@@ -13,7 +13,7 @@ addon_file_name = testaddon.xpi
endif
# This is so hacky. Waiting on bug 988938.
testdir = $(abspath $(DEPTH)/_tests/xpcshell/dom/plugins/test/unit/)
testdir = $(topobjdir)/_tests/xpcshell/dom/plugins/test/unit/
addonpath = $(testdir)/$(addon_file_name)
ifdef COMPILE_ENVIRONMENT
modules/libmar/tests/Makefile.in
+1 -1
View File
@@ -2,7 +2,7 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
TESTROOT = $(abspath $(DEPTH))/_tests/xpcshell/$(relativesrcdir)
TESTROOT = $(topobjdir)/_tests/xpcshell/$(relativesrcdir)
include $(topsrcdir)/config/rules.mk
python/mozbuild/mozbuild/action/test_archive.py
+266
View File
@@ -0,0 +1,266 @@
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
# This action is used to produce test archives.
#
# Ideally, the data in this file should be defined in moz.build files.
# It is defined inline because this was easiest to make test archive
# generation faster.
from __future__ import absolute_import, print_function, unicode_literals
import argparse
import itertools
import os
import sys
from mozpack.files import FileFinder
from mozpack.mozjar import JarWriter
import mozpack.path as mozpath
import buildconfig
STAGE = mozpath.join(buildconfig.topobjdir, 'dist', 'test-stage')
ARCHIVE_FILES = {
'common': [
{
'source': STAGE,
'base': '',
'pattern': '**',
'ignore': [
'cppunittest/**',
'gtest/**',
'mochitest/**',
'reftest/**',
'talos/**',
'web-platform/**',
'xpcshell/**',
],
},
{
'source': buildconfig.topobjdir,
'base': '_tests',
'pattern': 'modules/**',
},
{
'source': buildconfig.topobjdir,
'base': '_tests',
'pattern': 'mozbase/**',
},
{
'source': buildconfig.topsrcdir,
'base': 'js/src',
'pattern': 'jit-test/**',
'dest': 'jit-test',
},
{
'source': buildconfig.topsrcdir,
'base': 'js/src/tests',
'pattern': 'ecma_6/**',
'dest': 'jit-test/tests',
},
{
'source': buildconfig.topsrcdir,
'base': 'js/src/tests',
'pattern': 'js1_8_5/**',
'dest': 'jit-test/tests',
},
{
'source': buildconfig.topsrcdir,
'base': 'js/src/tests',
'pattern': 'lib/**',
'dest': 'jit-test/tests',
},
{
'source': buildconfig.topsrcdir,
'base': 'js/src',
'pattern': 'jsapi.h',
'dest': 'jit-test',
},
{
'source': buildconfig.topsrcdir,
'base': 'testing',
'pattern': 'tps/**',
},
{
'source': buildconfig.topsrcdir,
'base': 'services/sync/',
'pattern': 'tps/**',
},
{
'source': buildconfig.topsrcdir,
'base': 'services/sync/tests/tps',
'pattern': '**',
'dest': 'tps/tests',
},
],
'cppunittest': [
{
'source': STAGE,
'base': '',
'pattern': 'cppunittest/**',
},
# We don't ship these files if startup cache is disabled, which is
# rare. But it shouldn't matter for test archives.
{
'source': buildconfig.topsrcdir,
'base': 'startupcache/test',
'pattern': 'TestStartupCacheTelemetry.*',
'dest': 'cppunittest',
},
{
'source': buildconfig.topsrcdir,
'base': 'testing',
'pattern': 'runcppunittests.py',
'dest': 'cppunittest',
},
{
'source': buildconfig.topsrcdir,
'base': 'testing',
'pattern': 'remotecppunittests.py',
'dest': 'cppunittest',
},
{
'source': buildconfig.topsrcdir,
'base': 'testing',
'pattern': 'cppunittest.ini',
'dest': 'cppunittest',
},
{
'source': buildconfig.topobjdir,
'base': '',
'pattern': 'mozinfo.json',
'dest': 'cppunittest',
},
],
'gtest': [
{
'source': STAGE,
'base': '',
'pattern': 'gtest/**',
},
],
'mochitest': [
{
'source': buildconfig.topobjdir,
'base': '_tests/testing',
'pattern': 'mochitest/**',
},
{
'source': STAGE,
'base': '',
'pattern': 'mochitest/**',
},
],
'mozharness': [
{
'source': buildconfig.topsrcdir,
'base': 'testing',
'pattern': 'mozharness/**',
},
],
'reftest': [
{
'source': STAGE,
'base': '',
'pattern': 'reftest/**',
},
],
'talos': [
{
'source': buildconfig.topsrcdir,
'base': 'testing',
'pattern': 'talos/**',
},
],
'web-platform': [
{
'source': buildconfig.topobjdir,
'base': '_tests',
'pattern': 'web-platform/**',
},
{
'source': buildconfig.topobjdir,
'base': '',
'pattern': 'mozinfo.json',
'dest': 'web-platform',
},
],
'xpcshell': [
{
'source': buildconfig.topobjdir,
'base': '_tests/xpcshell',
'pattern': '**',
'dest': 'xpcshell/tests',
},
{
'source': STAGE,
'base': '',
'pattern': 'xpcshell/**',
},
],
}
# "common" is our catch all archive and it ignores things from other archives.
# Verify nothing sneaks into ARCHIVE_FILES without a corresponding exclusion
# rule in the "common" archive.
for k, v in ARCHIVE_FILES.items():
# Skip mozharness because it isn't staged.
if k in ('common', 'mozharness'):
continue
ignores = set(itertools.chain(*(e.get('ignore', [])
for e in ARCHIVE_FILES['common'])))
if not any(p.startswith('%s/' % k) for p in ignores):
raise Exception('"common" ignore list probably should contain %s' % k)
def find_files(archive):
for entry in ARCHIVE_FILES[archive]:
source = entry['source']
base = entry['base']
pattern = entry['pattern']
dest = entry.get('dest')
ignore = list(entry.get('ignore', []))
ignore.append('**/.mkdir.done')
ignore.append('**/*.pyc')
common_kwargs = {
'find_executables': False,
'find_dotfiles': True,
'ignore': ignore,
}
finder = FileFinder(os.path.join(source, base), **common_kwargs)
for p, f in finder.find(pattern):
if dest:
p = mozpath.join(dest, p)
yield p, f
def main(argv):
parser = argparse.ArgumentParser(
description='Produce test archives')
parser.add_argument('archive', help='Which archive to generate')
parser.add_argument('outputfile', help='File to write output to')
args = parser.parse_args(argv)
if not args.outputfile.endswith('.zip'):
raise Exception('expected zip output file')
with open(args.outputfile, 'wb') as fh:
with JarWriter(fileobj=fh, optimize=False) as writer:
res = find_files(args.archive)
for p, f in res:
writer.add(p.encode('utf-8'), f.read(), mode=f.mode)
if __name__ == '__main__':
sys.exit(main(sys.argv[1:]))
python/mozbuild/mozbuild/backend/base.py
+1
View File
@@ -218,6 +218,7 @@ class BuildBackend(LoggingMixin):
pp.context.update(obj.config.substs)
pp.context.update(
top_srcdir=obj.topsrcdir,
topobjdir=obj.topobjdir,
srcdir=srcdir,
relativesrcdir=mozpath.relpath(srcdir, obj.topsrcdir) or '.',
DEPTH=mozpath.relpath(obj.topobjdir, mozpath.dirname(obj.output_path)) or '.',
python/mozbuild/mozbuild/backend/recursivemake.py
+9 -13
View File
@@ -391,19 +391,14 @@ class RecursiveMakeBackend(CommonBackend):
self.backend_input_files.add(mozpath.join(self.environment.topobjdir,
'config', 'autoconf.mk'))
self._install_manifests = {
k: InstallManifest() for k in [
'dist_bin',
'dist_branding',
'dist_idl',
'dist_include',
'dist_public',
'dist_private',
'dist_sdk',
'dist_xpi-stage',
'_tests',
'xpidl',
]}
self._install_manifests = defaultdict(InstallManifest)
# The build system relies on some install manifests always existing
# even if they are empty, because the directories are still filled
# by the build system itself, and the install manifests are only
# used for a "magic" rm -rf.
self._install_manifests['dist_public']
self._install_manifests['dist_private']
self._install_manifests['dist_sdk']
self._traversal = RecursiveMakeTraversal()
self._compile_graph = defaultdict(set)
@@ -1383,6 +1378,7 @@ INSTALL_TARGETS += %(prefix)s
pp.context['autoconfmk'] = 'autoconf.mk'
pp.handleLine(b'# THIS FILE WAS AUTOMATICALLY GENERATED. DO NOT MODIFY BY HAND.\n');
pp.handleLine(b'DEPTH := @DEPTH@\n')
pp.handleLine(b'topobjdir := @topobjdir@\n')
pp.handleLine(b'topsrcdir := @top_srcdir@\n')
pp.handleLine(b'srcdir := @srcdir@\n')
pp.handleLine(b'VPATH := @srcdir@\n')
python/mozbuild/mozbuild/test/backend/test_recursivemake.py
+2 -1
View File
@@ -188,6 +188,7 @@ class TestRecursiveMakeBackend(BackendTester):
lines = [l.strip() for l in open(p, 'rt').readlines()[1:] if not l.startswith('#')]
self.assertEqual(lines, [
'DEPTH := .',
'topobjdir := %s' % env.topobjdir,
'topsrcdir := %s' % env.topsrcdir,
'srcdir := %s' % env.topsrcdir,
'VPATH := %s' % env.topsrcdir,
@@ -207,7 +208,7 @@ class TestRecursiveMakeBackend(BackendTester):
self.assertTrue(os.path.exists(p))
lines = [l.strip() for l in open(p, 'rt').readlines()]
self.assertEqual(len(lines), 9)
self.assertEqual(len(lines), 10)
self.assertTrue(lines[0].startswith('# THIS FILE WAS AUTOMATICALLY'))
testing/gtest/Makefile.in
-27
View File
@@ -7,12 +7,6 @@
include $(topsrcdir)/config/rules.mk
# Bug 1028035: Linking xul-gtest.dll takes too long, so we disable GTest on
# Windows PGO builds.
ifeq (1_WINNT,$(MOZ_PGO)_$(OS_ARCH))
SKIP_GTEST_DURING_MAKE_CHECK ?= 1
endif
ifeq (browser,$(MOZ_BUILD_APP))
ifdef COMPILE_ENVIRONMENT
gtest::
@@ -20,26 +14,5 @@ gtest::
ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
$(MAKE) -C $(DEPTH)/browser/app repackage
endif
ifneq (1,$(SKIP_GTEST_DURING_MAKE_CHECK))
check::
$(MAKE) -C $(DEPTH)/toolkit/library gtestxul
ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
$(MAKE) -C $(DEPTH)/browser/app repackage
$(PYTHON) $(topsrcdir)/testing/gtest/rungtests.py \
--cwd=$(DEPTH)/_tests/gtest \
--xre-path=$(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/Resources \
--symbols-path=$(DIST)/crashreporter-symbols \
$(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/MacOS/$(MOZ_APP_NAME)$(BIN_SUFFIX)
else
$(PYTHON) $(topsrcdir)/testing/gtest/rungtests.py \
--cwd=$(DEPTH)/_tests/gtest \
--xre-path=$(DIST)/bin \
--symbols-path=$(DIST)/crashreporter-symbols \
$(DIST)/bin/$(MOZ_APP_NAME)$(BIN_SUFFIX)
endif
else
check::
echo GTest skipped during make check
endif
endif
endif
testing/mochitest/Makefile.in
-1
View File
@@ -110,7 +110,6 @@ endif
stage-package:
$(NSINSTALL) -D $(PKG_STAGE)/mochitest && $(NSINSTALL) -D $(PKG_STAGE)/bin/plugins && $(NSINSTALL) -D $(DIST)/plugins
cp $(DEPTH)/mozinfo.json $(PKG_STAGE)/mochitest
(cd $(DEPTH)/_tests/testing && tar $(TAR_CREATE_FLAGS) - mochitest) | (cd $(PKG_STAGE) && tar -xf -)
@cp $(DEPTH)/mozinfo.json $(PKG_STAGE)/mochitest
@(cd $(DIST_BIN) && tar $(TAR_CREATE_FLAGS) - $(TEST_HARNESS_BINS)) | (cd $(PKG_STAGE)/bin && tar -xf -)
@(cd $(DIST_BIN)/components && tar $(TAR_CREATE_FLAGS) - $(TEST_HARNESS_COMPONENTS)) | (cd $(PKG_STAGE)/bin/components && tar -xf -)
testing/mozbase/Makefile.in
-10
View File
@@ -1,10 +0,0 @@
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
include $(topsrcdir)/config/rules.mk
stage-package: PKG_STAGE = $(DIST)/test-stage
stage-package:
$(NSINSTALL) -D $(PKG_STAGE)/mozbase
@(cd $(DEPTH)/_tests/ && tar $(TAR_CREATE_FLAGS) - mozbase) | (cd $(PKG_STAGE) && tar -xf -)
testing/mozharness/configs/builds/releng_base_mac_64_builds.py
+1 -1
View File
@@ -32,7 +32,7 @@ config = {
'purge_basedirs': [],
'enable_ccache': True,
'vcs_share_base': '/builds/hg-shared',
'objdir': 'obj-firefox/i386',
'objdir': 'obj-firefox/x86_64',
'tooltool_script': ["/builds/tooltool.py"],
'tooltool_bootstrap': "setup.sh",
'enable_count_ctors': False,
testing/testsuite-targets.mk
+36 -76
View File
@@ -26,6 +26,20 @@ ifndef TEST_PACKAGE_NAME
TEST_PACKAGE_NAME := $(ANDROID_PACKAGE_NAME)
endif
# Linking xul-gtest.dll takes too long, so we disable GTest on
# Windows PGO builds (bug 1028035).
ifneq (1_WINNT,$(MOZ_PGO)_$(OS_ARCH))
BUILD_GTEST=1
endif
ifdef MOZ_B2G
BUILD_GTEST=
endif
ifeq ($(MOZ_BUILD_APP),mobile/android)
BUILD_GTEST=
endif
RUN_MOCHITEST_B2G_DESKTOP = \
rm -f ./$@.log && \
$(PYTHON) _tests/testing/mochitest/runtestsb2g.py \
@@ -191,7 +205,7 @@ RUN_REFTEST = rm -f ./$@.log && $(PYTHON) _tests/reftest/runreftest.py \
REMOTE_REFTEST = rm -f ./$@.log && $(PYTHON) _tests/reftest/remotereftest.py \
--dm_trans=$(DM_TRANS) --ignore-window-size \
--app=$(TEST_PACKAGE_NAME) --deviceIP=${TEST_DEVICE} --xre-path=${MOZ_HOST_BIN} \
--httpd-path=_tests/modules \
--httpd-path=_tests/modules --suite reftest \
$(SYMBOLS_PATH) $(EXTRA_TEST_ARGS) $(1) | tee ./$@.log
RUN_REFTEST_B2G = rm -f ./$@.log && $(PYTHON) _tests/reftest/runreftestb2g.py \
@@ -305,11 +319,10 @@ xpcshell-tests:
--build-info-json=$(DEPTH)/mozinfo.json \
--no-logfiles \
--test-plugin-path='$(DIST)/plugins' \
--tests-root-dir=$(abspath _tests/xpcshell) \
--xpcshell=$(xpcshell_path) \
--testing-modules-dir=$(abspath _tests/modules) \
$(SYMBOLS_PATH) \
$(TEST_PATH_ARG) $(EXTRA_TEST_ARGS) \
$(xpcshell_path)
$(TEST_PATH_ARG) $(EXTRA_TEST_ARGS)
B2G_XPCSHELL = \
rm -f ./@.log && \
@@ -387,7 +400,6 @@ pgo-profile-run:
# Package up the tests and test harnesses
include $(topsrcdir)/toolkit/mozapps/installer/package-name.mk
ifndef UNIVERSAL_BINARY
PKG_STAGE = $(DIST)/test-stage
stage-all: \
@@ -395,18 +407,12 @@ stage-all: \
stage-mach \
stage-extensions \
stage-mochitest \
stage-talos \
stage-reftest \
stage-xpcshell \
stage-jstests \
stage-jetpack \
stage-mozbase \
stage-tps \
stage-modules \
stage-marionette \
stage-cppunittests \
stage-jittest \
stage-web-platform-tests \
stage-luciddream \
test-packages-manifest \
test-packages-manifest-tc \
@@ -414,20 +420,22 @@ stage-all: \
ifdef MOZ_WEBRTC
stage-all: stage-steeplechase
endif
else
# This staging area has been built for us by universal/flight.mk
PKG_STAGE = $(DIST)/universal/test-stage
endif
TEST_PKGS := \
common \
cppunittest \
mochitest \
reftest \
talos \
xpcshell \
web-platform \
xpcshell \
$(NULL)
ifdef BUILD_GTEST
stage-all: stage-gtest
TEST_PKGS += gtest
endif
PKG_ARG = --$(1) '$(PKG_BASENAME).$(1).tests.zip'
test-packages-manifest-tc:
@@ -440,9 +448,7 @@ test-packages-manifest-tc:
test-packages-manifest:
@rm -f $(MOZ_TEST_PACKAGES_FILE)
ifndef UNIVERSAL_BINARY
$(NSINSTALL) -D $(dir $(MOZ_TEST_PACKAGES_FILE))
endif
$(PYTHON) $(topsrcdir)/build/gen_test_packages_manifest.py \
--jsshell $(JSSHELL_NAME) \
--dest-file $(MOZ_TEST_PACKAGES_FILE) \
@@ -451,24 +457,13 @@ endif
package-tests-prepare-dest:
@rm -f '$(DIST)/$(PKG_PATH)$(TEST_PACKAGE)'
ifndef UNIVERSAL_BINARY
$(NSINSTALL) -D $(DIST)/$(PKG_PATH)
endif
cd $(PKG_STAGE) && \
zip -rq9D $(abspath $(DIST))/$(PKG_PATH)mozharness.zip mozharness
package-tests: package-tests-mozharness
package-tests-common: stage-all package-tests-prepare-dest
* -x \*/.mkdir.done \*.pyc $(foreach name,$(TEST_PKGS),$(name)\*)
package-tests: package-tests-common
define package_archive
package-tests-$(1): stage-all package-tests-prepare-dest
rm -f '$$(DIST)/$$(PKG_PATH)$$(PKG_BASENAME).$(1).tests.zip' && \
cd $$(abspath $(PKG_STAGE)) && \
zip -rq9D '$$(abspath $$(DIST))/$$(PKG_PATH)$$(PKG_BASENAME).$(1).tests.zip' \
$(1) -x \*/.mkdir.done \*.pyc ;
.PHONY += package-tests-$(1)
$$(call py_action,test_archive, \
$(1) \
$$(abspath $$(DIST))/$$(PKG_PATH)/$$(PKG_BASENAME).$(1).tests.zip)
package-tests: package-tests-$(1)
endef
@@ -495,7 +490,6 @@ make-stage-dir:
$(NSINSTALL) -D $(PKG_STAGE)/certs
$(NSINSTALL) -D $(PKG_STAGE)/config
$(NSINSTALL) -D $(PKG_STAGE)/jetpack
$(NSINSTALL) -D $(PKG_STAGE)/mozbase
$(NSINSTALL) -D $(PKG_STAGE)/modules
$(NSINSTALL) -D $(PKG_STAGE)/tools/mach
@@ -517,11 +511,6 @@ ifeq ($(MOZ_BUILD_APP),mobile/android)
$(NSINSTALL) $(DEPTH)/mobile/android/base/fennec_ids.txt $(PKG_STAGE)/mochitest
endif
TALOS_DIR=$(PKG_STAGE)/talos
stage-talos: make-stage-dir
$(NSINSTALL) -D $(TALOS_DIR)
@(cd $(topsrcdir)/testing/talos && tar $(TAR_CREATE_FLAGS) - *) | (cd $(TALOS_DIR)/ && tar -xf -)
stage-reftest: make-stage-dir
$(MAKE) -C $(DEPTH)/layout/tools/reftest stage-package
@@ -531,6 +520,15 @@ stage-xpcshell: make-stage-dir
stage-jstests: make-stage-dir
$(MAKE) -C $(DEPTH)/js/src/tests stage-package
stage-gtest: make-stage-dir
# FIXME: (bug 1200311) We should be generating the gtest xul as part of the build.
$(MAKE) -C $(DEPTH)/testing/gtest gtest
$(NSINSTALL) -D $(PKG_STAGE)/gtest/gtest_bin
cp -RL $(DIST)/bin/gtest $(PKG_STAGE)/gtest/gtest_bin
cp -RL $(DEPTH)/_tests/gtest $(PKG_STAGE)
cp $(topsrcdir)/testing/gtest/rungtests.py $(PKG_STAGE)/gtest
cp $(DIST)/bin/dependentlibs.list.gtest $(PKG_STAGE)/gtest
stage-android: make-stage-dir
ifdef MOZ_ENABLE_SZIP
# Tinderbox scripts are not unzipping everything, so the file needs to be in a directory it unzips
@@ -546,16 +544,6 @@ endif
stage-jetpack: make-stage-dir
$(MAKE) -C $(DEPTH)/addon-sdk stage-tests-package
stage-tps: make-stage-dir
$(NSINSTALL) -D $(PKG_STAGE)/tps/tests
@(cd $(topsrcdir)/testing/tps && tar $(TAR_CREATE_FLAGS) - *) | (cd $(PKG_STAGE)/tps && tar -xf -)
@(cd $(topsrcdir)/services/sync/tps && tar $(TAR_CREATE_FLAGS) - *) | (cd $(PKG_STAGE)/tps && tar -xf -)
(cd $(topsrcdir)/services/sync/tests/tps && tar $(TAR_CREATE_FLAGS) - *) | (cd $(PKG_STAGE)/tps/tests && tar -xf -)
stage-modules: make-stage-dir
$(NSINSTALL) -D $(PKG_STAGE)/modules
cp -RL $(DEPTH)/_tests/modules $(PKG_STAGE)
CPP_UNIT_TEST_BINS=$(wildcard $(DIST)/cppunittests/*)
ifdef OBJCOPY
@@ -570,14 +558,6 @@ ifdef STRIP_CPP_TESTS
$(foreach bin,$(CPP_UNIT_TEST_BINS),$(OBJCOPY) $(or $(STRIP_FLAGS),--strip-unneeded) $(bin) $(bin:$(DIST)/cppunittests/%=$(PKG_STAGE)/cppunittest/%);)
else
cp -RL $(CPP_UNIT_TEST_BINS) $(PKG_STAGE)/cppunittest
endif
cp $(topsrcdir)/testing/runcppunittests.py $(PKG_STAGE)/cppunittest
cp $(topsrcdir)/testing/remotecppunittests.py $(PKG_STAGE)/cppunittest
cp $(topsrcdir)/testing/cppunittest.ini $(PKG_STAGE)/cppunittest
cp $(DEPTH)/mozinfo.json $(PKG_STAGE)/cppunittest
ifeq ($(MOZ_DISABLE_STARTUPCACHE),)
cp $(topsrcdir)/startupcache/test/TestStartupCacheTelemetry.js $(PKG_STAGE)/cppunittest
cp $(topsrcdir)/startupcache/test/TestStartupCacheTelemetry.manifest $(PKG_STAGE)/cppunittest
endif
ifdef STRIP_CPP_TESTS
$(OBJCOPY) $(or $(STRIP_FLAGS),--strip-unneeded) $(DIST)/bin/jsapi-tests$(BIN_SUFFIX) $(PKG_STAGE)/cppunittest/jsapi-tests$(BIN_SUFFIX)
@@ -585,14 +565,6 @@ else
cp -RL $(DIST)/bin/jsapi-tests$(BIN_SUFFIX) $(PKG_STAGE)/cppunittest
endif
stage-jittest: make-stage-dir
$(NSINSTALL) -D $(PKG_STAGE)/jit-test/tests
cp -RL $(topsrcdir)/js/src/jsapi.h $(PKG_STAGE)/jit-test/
cp -RL $(topsrcdir)/js/src/jit-test $(PKG_STAGE)/jit-test/
cp -RL $(topsrcdir)/js/src/tests/ecma_6 $(PKG_STAGE)/jit-test/tests/
cp -RL $(topsrcdir)/js/src/tests/js1_8_5 $(PKG_STAGE)/jit-test/tests/
cp -RL $(topsrcdir)/js/src/tests/lib $(PKG_STAGE)/jit-test/tests/
stage-steeplechase: make-stage-dir
$(NSINSTALL) -D $(PKG_STAGE)/steeplechase/
cp -RL $(DEPTH)/_tests/steeplechase $(PKG_STAGE)/steeplechase/tests
@@ -623,12 +595,6 @@ stage-marionette: make-stage-dir
| (cd $(topsrcdir) && xargs tar $(TAR_CREATE_FLAGS) -) \
| (cd $(MARIONETTE_DIR)/tests && tar -xf -)
stage-mozbase: make-stage-dir
$(MAKE) -C $(DEPTH)/testing/mozbase stage-package
stage-web-platform-tests: make-stage-dir
$(MAKE) -C $(DEPTH)/testing/web-platform stage-package
stage-instrumentation-tests: make-stage-dir
$(MAKE) -C $(DEPTH)/testing/instrumentation stage-package
@@ -653,25 +619,19 @@ stage-extensions: make-stage-dir
jstestbrowser \
package-tests \
package-tests-prepare-dest \
package-tests-mozharness \
package-tests-common \
make-stage-dir \
stage-all \
stage-b2g \
stage-config \
stage-mochitest \
stage-talos \
stage-reftest \
stage-xpcshell \
stage-jstests \
stage-android \
stage-jetpack \
stage-mozbase \
stage-tps \
stage-modules \
stage-marionette \
stage-steeplechase \
stage-web-platform-tests \
stage-instrumentation-tests \
stage-luciddream \
test-packages-manifest \
testing/web-platform/Makefile.in
-9
View File
@@ -1,9 +0,0 @@
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
PKG_STAGE = $(DIST)/test-stage
stage-package:
$(NSINSTALL) -D $(PKG_STAGE)/web-platform
@cp $(DEPTH)/mozinfo.json $(PKG_STAGE)/web-platform
@(cd $(DEPTH)/_tests/ && tar $(TAR_CREATE_FLAGS) - web-platform) | (cd $(PKG_STAGE) && tar -xf -)
testing/xpcshell/Makefile.in
-1
View File
@@ -41,5 +41,4 @@ stage-package:
@(cd $(topsrcdir)/build && tar $(TAR_CREATE_FLAGS) - $(EXTRA_BUILD_FILES)) | (cd $(PKG_STAGE)/xpcshell && tar -xf -)
@cp $(DEPTH)/mozinfo.json $(PKG_STAGE)/xpcshell
@cp $(DEPTH)/build/automation.py $(PKG_STAGE)/xpcshell
(cd $(DEPTH)/_tests/xpcshell/ && tar $(TAR_CREATE_FLAGS) - *) | (cd $(PKG_STAGE)/xpcshell/tests && tar -xf -)
@(cd $(DIST)/bin/components && tar $(TAR_CREATE_FLAGS) - $(TEST_HARNESS_COMPONENTS)) | (cd $(PKG_STAGE)/bin/components && tar -xf -)
toolkit/locales/l10n.mk
+19 -16
View File
@@ -43,11 +43,11 @@ endif
# 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
ZIP_IN ?= $(ABS_DIST)/$(PACKAGE)
WIN32_INSTALLER_IN ?= $(ABS_DIST)/$(PKG_INST_PATH)$(PKG_INST_BASENAME).exe
# Allows overriding the final destination of the repackaged file
ZIP_OUT ?= $(_ABS_DIST)/$(PACKAGE)
ZIP_OUT ?= $(ABS_DIST)/$(PACKAGE)
ACDEFINES += \
-DAB_CD=$(AB_CD) \
@@ -68,15 +68,15 @@ clobber-%:
PACKAGER_NO_LIBS = 1
ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
STAGEDIST = $(_ABS_DIST)/l10n-stage/$(MOZ_PKG_DIR)/$(_APPNAME)/Contents/Resources
STAGEDIST = $(ABS_DIST)/l10n-stage/$(MOZ_PKG_DIR)/$(_APPNAME)/Contents/Resources
else
STAGEDIST = $(_ABS_DIST)/l10n-stage/$(MOZ_PKG_DIR)
STAGEDIST = $(ABS_DIST)/l10n-stage/$(MOZ_PKG_DIR)
endif
include $(MOZILLA_DIR)/toolkit/mozapps/installer/signing.mk
include $(MOZILLA_DIR)/toolkit/mozapps/installer/packager.mk
PACKAGE_BASE_DIR = $(_ABS_DIST)/l10n-stage
PACKAGE_BASE_DIR = $(ABS_DIST)/l10n-stage
$(STAGEDIST): AB_CD:=en-US
$(STAGEDIST): UNPACKAGE=$(call ESCAPE_WILDCARD,$(ZIP_IN))
@@ -113,6 +113,10 @@ repackage-zip: ALREADY_SZIPPED=1
repackage-zip: libs-$(AB_CD)
# call a hook for apps to put their uninstall helper.exe into the package
$(UNINSTALLER_PACKAGE_HOOK)
# call a hook for apps to build the stub installer
ifdef MOZ_STUB_INSTALLER
$(STUB_HOOK)
endif
$(PYTHON) $(MOZILLA_DIR)/toolkit/mozapps/installer/l10n-repack.py $(STAGEDIST) $(DIST)/xpi-stage/locale-$(AB_CD) \
$(MOZ_PKG_EXTRAL10N) \
$(if $(filter omni,$(MOZ_PACKAGER_FORMAT)),$(if $(NON_OMNIJAR_FILES),--non-resource $(NON_OMNIJAR_FILES)))
@@ -137,8 +141,7 @@ endif
ifdef 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' \
DIST='$(_ABS_DIST)'
PACKAGE_BASE_DIR='$(ABS_DIST)/l10n-stage'
endif
# packaging done, undo l10n stuff
ifneq (en,$(LPROJ_ROOT))
@@ -165,7 +168,7 @@ TK_DEFINES = $(firstword \
# chrome directory.
PKG_ZIP_DIRS = chrome $(or $(DIST_SUBDIRS),$(DIST_SUBDIR))
langpack-%: LANGPACK_FILE=$(_ABS_DIST)/$(PKG_LANGPACK_PATH)$(PKG_LANGPACK_BASENAME).xpi
langpack-%: LANGPACK_FILE=$(ABS_DIST)/$(PKG_LANGPACK_PATH)$(PKG_LANGPACK_BASENAME).xpi
langpack-%: AB_CD=$*
langpack-%: XPI_NAME=locale-$*
langpack-%: libs-%
@@ -188,20 +191,20 @@ wget-en-US:
ifndef WGET
$(error Wget not installed)
endif
$(NSINSTALL) -D $(_ABS_DIST)/$(PKG_PATH)
(cd $(_ABS_DIST)/$(PKG_PATH) && $(WGET) --no-cache -nv -N '$(EN_US_BINARY_URL)/$(PACKAGE)')
@echo 'Downloaded $(EN_US_BINARY_URL)/$(PACKAGE) to $(_ABS_DIST)/$(PKG_PATH)/$(PACKAGE)'
$(NSINSTALL) -D $(ABS_DIST)/$(PKG_PATH)
(cd $(ABS_DIST)/$(PKG_PATH) && $(WGET) --no-cache -nv -N '$(EN_US_BINARY_URL)/$(PACKAGE)')
@echo 'Downloaded $(EN_US_BINARY_URL)/$(PACKAGE) to $(ABS_DIST)/$(PKG_PATH)/$(PACKAGE)'
ifdef RETRIEVE_WINDOWS_INSTALLER
ifeq ($(OS_ARCH), WINNT)
$(NSINSTALL) -D $(_ABS_DIST)/$(PKG_INST_PATH)
(cd $(_ABS_DIST)/$(PKG_INST_PATH) && $(WGET) --no-cache -nv -N '$(EN_US_BINARY_URL)/$(PKG_PATH)$(PKG_INST_BASENAME).exe')
@echo 'Downloaded $(EN_US_BINARY_URL)/$(PKG_PATH)$(PKG_INST_BASENAME).exe to $(_ABS_DIST)/$(PKG_INST_PATH)$(PKG_INST_BASENAME).exe'
$(NSINSTALL) -D $(ABS_DIST)/$(PKG_INST_PATH)
(cd $(ABS_DIST)/$(PKG_INST_PATH) && $(WGET) --no-cache -nv -N '$(EN_US_BINARY_URL)/$(PKG_PATH)$(PKG_INST_BASENAME).exe')
@echo 'Downloaded $(EN_US_BINARY_URL)/$(PKG_PATH)$(PKG_INST_BASENAME).exe to $(ABS_DIST)/$(PKG_INST_PATH)$(PKG_INST_BASENAME).exe'
endif
endif
generate-snippet-%:
$(PYTHON) $(MOZILLA_DIR)/tools/update-packaging/generatesnippet.py \
--mar-path=$(_ABS_DIST)/update \
--mar-path=$(ABS_DIST)/update \
--application-ini-file=$(STAGEDIST)/application.ini \
--locale=$* \
--product=$(MOZ_PKG_APPNAME) \
toolkit/mozapps/installer/package-name.mk
+15 -7
View File
@@ -54,8 +54,13 @@ ifndef MOZ_PKG_APPNAME
MOZ_PKG_APPNAME = $(MOZ_APP_NAME)
endif
PKG_BASENAME = $(MOZ_PKG_APPNAME)-$(MOZ_PKG_VERSION).$(MOZ_PKG_PLATFORM)
ifdef MOZ_SIMPLE_PACKAGE_NAME
PKG_BASENAME := $(MOZ_SIMPLE_PACKAGE_NAME)
else
PKG_BASENAME = $(MOZ_PKG_APPNAME)-$(MOZ_PKG_VERSION).$(AB_CD).$(MOZ_PKG_PLATFORM)
endif
PKG_PATH =
SDK_PATH =
PKG_INST_BASENAME = $(PKG_BASENAME).installer
PKG_STUB_BASENAME = $(PKG_BASENAME).installer-stub
PKG_INST_PATH = $(PKG_PATH)
@@ -98,14 +103,9 @@ PKG_INST_BASENAME = $(MOZ_PKG_APPNAME_LC)-setup-$(MOZ_PKG_VERSION)
endif
endif
PKG_PATH = $(MOZ_PKG_PLATFORM)/$(AB_CD)/
SDK_PATH = $(PKG_PATH)/sdk/
CHECKSUMS_FILE_BASENAME = $(MOZ_PKG_APPNAME_LC)-$(MOZ_PKG_VERSION)
MOZ_INFO_BASENAME = $(MOZ_PKG_APPNAME_LC)-$(MOZ_PKG_VERSION)
ifeq ($(MOZ_APP_NAME),xulrunner)
PKG_PATH = runtimes/
PKG_BASENAME = $(MOZ_APP_NAME)-$(MOZ_PKG_VERSION).$(AB_CD).$(MOZ_PKG_PLATFORM)
CHECKSUMS_FILE_BASENAME = $(PKG_BASENAME)
MOZ_INFO_BASENAME = $(PKG_BASENAME)
endif
PKG_INST_PATH = $(PKG_PATH)
PKG_UPDATE_BASENAME = $(MOZ_PKG_APPNAME_LC)-$(MOZ_PKG_VERSION)
PKG_UPDATE_PATH = update/$(PKG_PATH)
@@ -128,6 +128,9 @@ SYMBOL_ARCHIVE_BASENAME = $(PKG_BASENAME).crashreporter-symbols
# Code coverage package naming
CODE_COVERAGE_ARCHIVE_BASENAME = $(PKG_BASENAME).code-coverage-gcno
# Mozharness naming
MOZHARNESS_PACKAGE = mozharness.zip
# Test package naming
TEST_PACKAGE = $(PKG_BASENAME).common.tests.zip
CPP_TEST_PACKAGE = $(PKG_BASENAME).cppunittest.tests.zip
@@ -136,6 +139,7 @@ MOCHITEST_PACKAGE = $(PKG_BASENAME).mochitest.tests.zip
REFTEST_PACKAGE = $(PKG_BASENAME).reftest.tests.zip
WP_TEST_PACKAGE = $(PKG_BASENAME).web-platform.tests.zip
TALOS_PACKAGE = $(PKG_BASENAME).talos.tests.zip
GTEST_PACKAGE = $(PKG_BASENAME).gtest.tests.zip
ifneq (,$(wildcard $(DIST)/bin/application.ini))
BUILDID = $(shell $(PYTHON) $(MOZILLA_DIR)/config/printconfigsetting.py $(DIST)/bin/application.ini App BuildID)
@@ -165,7 +169,11 @@ MOZ_TEST_PACKAGES_FILE = $(DIST)/$(PKG_PATH)/test_packages.json
MOZ_TEST_PACKAGES_FILE_TC = $(DIST)/$(PKG_PATH)/test_packages_tc.json
# JavaScript Shell
ifdef MOZ_SIMPLE_PACKAGE_NAME
JSSHELL_NAME := $(MOZ_SIMPLE_PACKAGE_NAME).jsshell.zip
else
JSSHELL_NAME = jsshell-$(MOZ_PKG_PLATFORM).zip
endif
PKG_JSSHELL = $(DIST)/$(JSSHELL_NAME)
endif # PACKAGE_NAME_MK_INCLUDED
toolkit/mozapps/installer/packager.mk
+8 -1
View File
@@ -50,10 +50,17 @@ stage-package: $(MOZ_PKG_MANIFEST) $(MOZ_PKG_MANIFEST_DEPS)
) \
$(if $(JARLOG_DIR),$(addprefix --jarlog ,$(wildcard $(JARLOG_FILE_AB_CD)))) \
$(if $(OPTIMIZEJARS),--optimizejars) \
$(if $(DISABLE_JAR_COMPRESSION),--disable-compression) \
$(addprefix --unify ,$(UNIFY_DIST)) \
$(MOZ_PKG_MANIFEST) $(DIST) $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(if $(MOZ_PKG_MANIFEST),,$(_BINPATH)) \
$(if $(filter omni,$(MOZ_PACKAGER_FORMAT)),$(if $(NON_OMNIJAR_FILES),--non-resource $(NON_OMNIJAR_FILES)))
$(PYTHON) $(MOZILLA_DIR)/toolkit/mozapps/installer/find-dupes.py $(DEFINES) $(ACDEFINES) $(MOZ_PKG_DUPEFLAGS) $(DIST)/$(MOZ_PKG_DIR)
$(PYTHON) $(MOZILLA_DIR)/toolkit/mozapps/installer/find-dupes.py $(DEFINES) $(ACDEFINES) $(MOZ_PKG_DUPEFLAGS) $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)
ifndef MOZ_THUNDERBIRD
# Package mozharness
$(call py_action,test_archive, \
mozharness \
$(ABS_DIST)/$(PKG_PATH)$(MOZHARNESS_PACKAGE))
endif # MOZ_THUNDERBIRD
ifdef MOZ_PACKAGE_JSSHELL
# Package JavaScript Shell
@echo 'Packaging JavaScript Shell...'
toolkit/mozapps/installer/packager.py
+5 -1
View File
@@ -266,6 +266,9 @@ def main():
help='Enable jar optimizations')
parser.add_argument('--unify', default='',
help='Base directory of another build to unify with')
parser.add_argument('--disable-compression', action='store_false',
dest='compress', default=True,
help='Disable jar compression')
parser.add_argument('manifest', default=None, nargs='?',
help='Manifest file name')
parser.add_argument('source', help='Source directory')
@@ -287,10 +290,11 @@ def main():
if args.format == 'flat':
formatter = FlatFormatter(copier)
elif args.format == 'jar':
formatter = JarFormatter(copier, optimize=args.optimizejars)
formatter = JarFormatter(copier, compress=args.compress, optimize=args.optimizejars)
elif args.format == 'omni':
formatter = OmniJarFormatter(copier,
buildconfig.substs['OMNIJAR_NAME'],
compress=args.compress,
optimize=args.optimizejars,
non_resources=args.non_resource)
else:
toolkit/mozapps/installer/upload-files.mk
+56 -60
View File
@@ -46,17 +46,11 @@ STAGEPATH = universal/
endif
endif
PACKAGE_BASE_DIR = $(_ABS_DIST)
PACKAGE_BASE_DIR = $(ABS_DIST)
PACKAGE = $(PKG_PATH)$(PKG_BASENAME)$(PKG_SUFFIX)
# By default, the SDK uses the same packaging type as the main bundle,
# but on mac it is a .tar.bz2
SDK_PATH = $(PKG_PATH)
ifeq ($(MOZ_APP_NAME),xulrunner)
SDK_PATH = sdk/
# Don't codesign xulrunner internally
MOZ_INTERNAL_SIGNING_FORMAT =
endif
SDK_SUFFIX = $(PKG_SUFFIX)
SDK = $(SDK_PATH)$(PKG_BASENAME).sdk$(SDK_SUFFIX)
ifdef UNIVERSAL_BINARY
@@ -116,8 +110,7 @@ endif # WINNT
endif # MOZ_STATIC_JS
MAKE_JSSHELL = $(call py_action,zip,-C $(DIST)/bin $(abspath $(PKG_JSSHELL)) $(JSSHELL_BINS))
_ABS_DIST = $(abspath $(DIST))
JARLOG_DIR = $(abspath $(DEPTH)/jarlog/)
JARLOG_DIR = $(topobjdir)/jarlog/
JARLOG_FILE_AB_CD = $(JARLOG_DIR)/$(AB_CD).log
TAR_CREATE_FLAGS := --exclude=.mkdir.done $(TAR_CREATE_FLAGS)
@@ -129,13 +122,13 @@ ifeq ($(MOZ_PKG_FORMAT),TAR)
PKG_SUFFIX = .tar
INNER_MAKE_PACKAGE = $(CREATE_FINAL_TAR) - $(MOZ_PKG_DIR) > $(PACKAGE)
INNER_UNMAKE_PACKAGE = $(UNPACK_TAR) < $(UNPACKAGE)
MAKE_SDK = $(CREATE_FINAL_TAR) - $(MOZ_APP_NAME)-sdk > $(SDK)
MAKE_SDK = $(CREATE_FINAL_TAR) - $(MOZ_APP_NAME)-sdk > '$(SDK)'
endif
ifeq ($(MOZ_PKG_FORMAT),TGZ)
PKG_SUFFIX = .tar.gz
INNER_MAKE_PACKAGE = $(CREATE_FINAL_TAR) - $(MOZ_PKG_DIR) | gzip -vf9 > $(PACKAGE)
INNER_UNMAKE_PACKAGE = gunzip -c $(UNPACKAGE) | $(UNPACK_TAR)
MAKE_SDK = $(CREATE_FINAL_TAR) - $(MOZ_APP_NAME)-sdk | gzip -vf9 > $(SDK)
MAKE_SDK = $(CREATE_FINAL_TAR) - $(MOZ_APP_NAME)-sdk | gzip -vf9 > '$(SDK)'
endif
ifeq ($(MOZ_PKG_FORMAT),BZ2)
PKG_SUFFIX = .tar.bz2
@@ -145,7 +138,7 @@ else
INNER_MAKE_PACKAGE = $(CREATE_FINAL_TAR) - $(MOZ_PKG_DIR) | bzip2 -vf > $(PACKAGE)
endif
INNER_UNMAKE_PACKAGE = bunzip2 -c $(UNPACKAGE) | $(UNPACK_TAR)
MAKE_SDK = $(CREATE_FINAL_TAR) - $(MOZ_APP_NAME)-sdk | bzip2 -vf > $(SDK)
MAKE_SDK = $(CREATE_FINAL_TAR) - $(MOZ_APP_NAME)-sdk | bzip2 -vf > '$(SDK)'
endif
ifeq ($(MOZ_PKG_FORMAT),ZIP)
ifdef MOZ_EXTERNAL_SIGNING_FORMAT
@@ -177,12 +170,12 @@ PKG_SUFFIX = .rpm
MOZ_NUMERIC_APP_VERSION = $(shell echo $(MOZ_PKG_VERSION) | sed 's/[^0-9.].*//' )
MOZ_RPM_RELEASE = $(shell echo $(MOZ_PKG_VERSION) | sed 's/[0-9.]*//' )
RPMBUILD_TOPDIR=$(_ABS_DIST)/rpmbuild
RPMBUILD_RPMDIR=$(_ABS_DIST)
RPMBUILD_SRPMDIR=$(_ABS_DIST)
RPMBUILD_TOPDIR=$(ABS_DIST)/rpmbuild
RPMBUILD_RPMDIR=$(ABS_DIST)
RPMBUILD_SRPMDIR=$(ABS_DIST)
RPMBUILD_SOURCEDIR=$(RPMBUILD_TOPDIR)/SOURCES
RPMBUILD_SPECDIR=$(topsrcdir)/toolkit/mozapps/installer/linux/rpm
RPMBUILD_BUILDDIR=$(_ABS_DIST)/..
RPMBUILD_BUILDDIR=$(ABS_DIST)/..
SPEC_FILE = $(RPMBUILD_SPECDIR)/mozilla.spec
RPM_INCIDENTALS=$(topsrcdir)/toolkit/mozapps/installer/linux/rpm
@@ -194,7 +187,7 @@ RPM_CMD = \
-DMOZ_APP_DISPLAYNAME='$(MOZ_APP_DISPLAYNAME)' \
$(RPM_INCIDENTALS)/mozilla.desktop \
-o $(RPMBUILD_SOURCEDIR)/$(MOZ_APP_NAME).desktop && \
rm -rf $(_ABS_DIST)/$(TARGET_CPU) && \
rm -rf $(ABS_DIST)/$(TARGET_CPU) && \
$(RPMBUILD) -bb \
$(SPEC_FILE) \
--target $(TARGET_CPU) \
@@ -239,18 +232,18 @@ endif
#uploaded and that they are beside the other build artifacts
MAIN_RPM= $(MOZ_APP_NAME)-$(MOZ_NUMERIC_APP_VERSION)-$(MOZ_RPM_RELEASE).$(BUILDID).$(TARGET_CPU)$(PKG_SUFFIX)
UPLOAD_EXTRA_FILES += $(MAIN_RPM)
RPM_CMD += && mv $(TARGET_CPU)/$(MAIN_RPM) $(_ABS_DIST)/
RPM_CMD += && mv $(TARGET_CPU)/$(MAIN_RPM) $(ABS_DIST)/
ifdef ENABLE_TESTS
TESTS_RPM=$(MOZ_APP_NAME)-tests-$(MOZ_NUMERIC_APP_VERSION)-$(MOZ_RPM_RELEASE).$(BUILDID).$(TARGET_CPU)$(PKG_SUFFIX)
UPLOAD_EXTRA_FILES += $(TESTS_RPM)
RPM_CMD += && mv $(TARGET_CPU)/$(TESTS_RPM) $(_ABS_DIST)/
RPM_CMD += && mv $(TARGET_CPU)/$(TESTS_RPM) $(ABS_DIST)/
endif
ifdef INSTALL_SDK
SDK_RPM=$(MOZ_APP_NAME)-devel-$(MOZ_NUMERIC_APP_VERSION)-$(MOZ_RPM_RELEASE).$(BUILDID).$(TARGET_CPU)$(PKG_SUFFIX)
UPLOAD_EXTRA_FILES += $(SDK_RPM)
RPM_CMD += && mv $(TARGET_CPU)/$(SDK_RPM) $(_ABS_DIST)/
RPM_CMD += && mv $(TARGET_CPU)/$(SDK_RPM) $(ABS_DIST)/
endif
INNER_MAKE_PACKAGE = $(RPM_CMD)
@@ -320,7 +313,7 @@ UPLOAD_EXTRA_FILES += gecko-unsigned-unaligned.apk
DIST_FILES += $(MOZ_CHILD_PROCESS_NAME)
GECKO_APP_AP_PATH = $(abspath $(DEPTH)/mobile/android/base)
GECKO_APP_AP_PATH = $(topobjdir)/mobile/android/base
ifdef ENABLE_TESTS
INNER_ROBOCOP_PACKAGE=echo
@@ -334,13 +327,13 @@ UPLOAD_EXTRA_FILES += ../embedding/android/geckoview_example/geckoview_example.a
# Robocop/Robotium tests, Android Background tests, and Fennec need to
# be signed with the same key, which means release signing them all.
ROBOCOP_PATH = $(abspath $(DEPTH)/mobile/android/tests/browser/robocop)
ROBOCOP_PATH = $(topobjdir)/mobile/android/tests/browser/robocop
# Normally, $(NSINSTALL) would be used instead of cp, but INNER_ROBOCOP_PACKAGE
# is used in a series of commands that run under a "cd something", while
# $(NSINSTALL) is relative.
INNER_ROBOCOP_PACKAGE= \
cp $(GECKO_APP_AP_PATH)/fennec_ids.txt $(_ABS_DIST) && \
$(call RELEASE_SIGN_ANDROID_APK,$(ROBOCOP_PATH)/robocop-debug-unsigned-unaligned.apk,$(_ABS_DIST)/robocop.apk)
cp $(GECKO_APP_AP_PATH)/fennec_ids.txt $(ABS_DIST) && \
$(call RELEASE_SIGN_ANDROID_APK,$(ROBOCOP_PATH)/robocop-debug-unsigned-unaligned.apk,$(ABS_DIST)/robocop.apk)
endif
else
INNER_ROBOCOP_PACKAGE=echo 'Testing is disabled - No Android Robocop for you'
@@ -388,9 +381,9 @@ INNER_MAKE_GECKOLIBS_AAR= \
--verbose \
--revision $(geckoaar-revision) \
--topsrcdir '$(topsrcdir)' \
--distdir '$(_ABS_DIST)' \
--distdir '$(ABS_DIST)' \
--appname '$(MOZ_APP_NAME)' \
'$(_ABS_DIST)'
'$(ABS_DIST)'
else
INNER_MAKE_GECKOLIBS_AAR=echo 'Android geckolibs.aar packaging requires packaging geckoview'
endif # MOZ_DISABLE_GECKOVIEW
@@ -462,29 +455,29 @@ INNER_SZIP_LIBRARIES = \
$(if $(ALREADY_SZIPPED),,$(foreach lib,$(SZIP_LIBRARIES),host/bin/szip $(MOZ_SZIP_FLAGS) $(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/$(lib) && )) true
# Insert $(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/classes.dex into
# $(_ABS_DIST)/gecko.ap_, producing $(_ABS_DIST)/gecko.apk.
# $(ABS_DIST)/gecko.ap_, producing $(ABS_DIST)/gecko.apk.
INNER_MAKE_APK = \
( cd $(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH) && \
unzip -o $(_ABS_DIST)/gecko.ap_ && \
rm $(_ABS_DIST)/gecko.ap_ && \
$(ZIP) -r9D $(_ABS_DIST)/gecko.ap_ assets && \
$(ZIP) $(if $(ALREADY_SZIPPED),-0 ,$(if $(MOZ_ENABLE_SZIP),-0 ))$(_ABS_DIST)/gecko.ap_ $(ASSET_SO_LIBRARIES) && \
$(ZIP) -r9D $(_ABS_DIST)/gecko.ap_ $(DIST_FILES) -x $(NON_DIST_FILES) $(SZIP_LIBRARIES) && \
unzip -o $(ABS_DIST)/gecko.ap_ && \
rm $(ABS_DIST)/gecko.ap_ && \
$(ZIP) -r9D $(ABS_DIST)/gecko.ap_ assets && \
$(ZIP) $(if $(ALREADY_SZIPPED),-0 ,$(if $(MOZ_ENABLE_SZIP),-0 ))$(ABS_DIST)/gecko.ap_ $(ASSET_SO_LIBRARIES) && \
$(ZIP) -r9D $(ABS_DIST)/gecko.ap_ $(DIST_FILES) -x $(NON_DIST_FILES) $(SZIP_LIBRARIES) && \
$(if $(filter-out ./,$(OMNIJAR_DIR)), \
mkdir -p $(OMNIJAR_DIR) && mv $(OMNIJAR_NAME) $(OMNIJAR_DIR) && ) \
$(ZIP) -0 $(_ABS_DIST)/gecko.ap_ $(OMNIJAR_DIR)$(OMNIJAR_NAME)) && \
rm -f $(_ABS_DIST)/gecko.apk && \
cp $(_ABS_DIST)/gecko.ap_ $(_ABS_DIST)/gecko.apk && \
$(ZIP) -j0 $(_ABS_DIST)/gecko.apk $(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/classes.dex && \
cp $(_ABS_DIST)/gecko.apk $(_ABS_DIST)/gecko-unsigned-unaligned.apk && \
$(RELEASE_JARSIGNER) $(_ABS_DIST)/gecko.apk && \
$(ZIPALIGN) -f -v 4 $(_ABS_DIST)/gecko.apk $(PACKAGE)
$(ZIP) -0 $(ABS_DIST)/gecko.ap_ $(OMNIJAR_DIR)$(OMNIJAR_NAME)) && \
rm -f $(ABS_DIST)/gecko.apk && \
cp $(ABS_DIST)/gecko.ap_ $(ABS_DIST)/gecko.apk && \
$(ZIP) -j0 $(ABS_DIST)/gecko.apk $(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/classes.dex && \
cp $(ABS_DIST)/gecko.apk $(ABS_DIST)/gecko-unsigned-unaligned.apk && \
$(RELEASE_JARSIGNER) $(ABS_DIST)/gecko.apk && \
$(ZIPALIGN) -f -v 4 $(ABS_DIST)/gecko.apk $(PACKAGE)
ifeq ($(MOZ_BUILD_APP),mobile/android)
INNER_MAKE_PACKAGE = \
$(INNER_SZIP_LIBRARIES) && \
make -C $(GECKO_APP_AP_PATH) gecko-nodeps.ap_ && \
cp $(GECKO_APP_AP_PATH)/gecko-nodeps.ap_ $(_ABS_DIST)/gecko.ap_ && \
cp $(GECKO_APP_AP_PATH)/gecko-nodeps.ap_ $(ABS_DIST)/gecko.ap_ && \
( (test ! -f $(GECKO_APP_AP_PATH)/R.txt && echo "*** Warning: The R.txt that is being packaged might not agree with the R.txt that was built. This is normal during l10n repacks.") || \
diff $(GECKO_APP_AP_PATH)/R.txt $(GECKO_APP_AP_PATH)/gecko-nodeps/R.txt >/dev/null || \
(echo "*** Error: The R.txt that was built and the R.txt that is being packaged are not the same. Rebuild mobile/android/base and re-package." && exit 1)) && \
@@ -498,8 +491,8 @@ endif
ifeq ($(MOZ_BUILD_APP),mobile/android/b2gdroid)
INNER_MAKE_PACKAGE = \
$(INNER_SZIP_LIBRARIES) && \
cp $(abspath $(DEPTH)/mobile/android/b2gdroid/app)/classes.dex $(_ABS_DIST)/classes.dex && \
cp $(abspath $(DEPTH)/mobile/android/b2gdroid/app)/b2gdroid-unsigned-unaligned.apk $(_ABS_DIST)/gecko.ap_ && \
cp $(topobjdir)/mobile/android/b2gdroid/app/classes.dex $(ABS_DIST)/classes.dex && \
cp $(topobjdir)/mobile/android/b2gdroid/app/b2gdroid-unsigned-unaligned.apk $(ABS_DIST)/gecko.ap_ && \
$(INNER_MAKE_APK)
endif
@@ -526,17 +519,17 @@ PKG_DMG_SOURCE = $(STAGEPATH)$(MOZ_PKG_DIR)
INNER_MAKE_PACKAGE = $(call py_action,make_dmg,'$(PKG_DMG_SOURCE)' '$(PACKAGE)')
INNER_UNMAKE_PACKAGE = \
set -ex; \
rm -rf $(_ABS_DIST)/unpack.tmp; \
mkdir -p $(_ABS_DIST)/unpack.tmp; \
$(_ABS_MOZSRCDIR)/build/package/mac_osx/unpack-diskimage $(UNPACKAGE) /tmp/$(MOZ_PKG_APPNAME)-unpack $(_ABS_DIST)/unpack.tmp; \
rsync -a '$(_ABS_DIST)/unpack.tmp/$(_APPNAME)' $(MOZ_PKG_DIR); \
rm -rf $(ABS_DIST)/unpack.tmp; \
mkdir -p $(ABS_DIST)/unpack.tmp; \
$(_ABS_MOZSRCDIR)/build/package/mac_osx/unpack-diskimage $(UNPACKAGE) /tmp/$(MOZ_PKG_APPNAME)-unpack $(ABS_DIST)/unpack.tmp; \
rsync -a '$(ABS_DIST)/unpack.tmp/$(_APPNAME)' $(MOZ_PKG_DIR); \
test -n '$(MOZ_PKG_MAC_DSSTORE)' && \
rsync -a '$(_ABS_DIST)/unpack.tmp/.DS_Store' '$(MOZ_PKG_MAC_DSSTORE)'; \
rsync -a '$(ABS_DIST)/unpack.tmp/.DS_Store' '$(MOZ_PKG_MAC_DSSTORE)'; \
test -n '$(MOZ_PKG_MAC_BACKGROUND)' && \
rsync -a '$(_ABS_DIST)/unpack.tmp/.background/$(notdir $(MOZ_PKG_MAC_BACKGROUND))' '$(MOZ_PKG_MAC_BACKGROUND)'; \
rsync -a '$(ABS_DIST)/unpack.tmp/.background/$(notdir $(MOZ_PKG_MAC_BACKGROUND))' '$(MOZ_PKG_MAC_BACKGROUND)'; \
test -n '$(MOZ_PKG_MAC_ICON)' && \
rsync -a '$(_ABS_DIST)/unpack.tmp/.VolumeIcon.icns' '$(MOZ_PKG_MAC_ICON)'; \
rm -rf $(_ABS_DIST)/unpack.tmp; \
rsync -a '$(ABS_DIST)/unpack.tmp/.VolumeIcon.icns' '$(MOZ_PKG_MAC_ICON)'; \
rm -rf $(ABS_DIST)/unpack.tmp; \
if test -n '$(MOZ_PKG_MAC_RSRC)' ; then \
cp $(UNPACKAGE) $(MOZ_PKG_APPNAME).tmp.dmg && \
hdiutil unflatten $(MOZ_PKG_APPNAME).tmp.dmg && \
@@ -546,17 +539,13 @@ INNER_UNMAKE_PACKAGE = \
# The plst and blkx resources are skipped because they belong to each
# individual dmg and are created by hdiutil.
SDK_SUFFIX = .tar.bz2
SDK = $(MOZ_PKG_APPNAME)-$(MOZ_PKG_VERSION).$(AB_CD).mac-$(TARGET_CPU).sdk$(SDK_SUFFIX)
ifeq ($(MOZ_APP_NAME),xulrunner)
SDK = $(SDK_PATH)$(MOZ_APP_NAME)-$(MOZ_PKG_VERSION).$(AB_CD).mac-$(TARGET_CPU).sdk$(SDK_SUFFIX)
endif
MAKE_SDK = $(CREATE_FINAL_TAR) - $(MOZ_APP_NAME)-sdk | bzip2 -vf > $(SDK)
MAKE_SDK = $(CREATE_FINAL_TAR) - $(MOZ_APP_NAME)-sdk | bzip2 -vf > '$(SDK)'
endif
ifdef MOZ_INTERNAL_SIGNING_FORMAT
MOZ_SIGN_PREPARED_PACKAGE_CMD=$(MOZ_SIGN_CMD) $(foreach f,$(MOZ_INTERNAL_SIGNING_FORMAT),-f $(f)) $(foreach i,$(SIGN_INCLUDES),-i $(i)) $(foreach x,$(SIGN_EXCLUDES),-x $(x))
ifeq (WINNT,$(OS_ARCH))
MOZ_SIGN_PREPARED_PACKAGE_CMD += --nsscmd '$(_ABS_DIST)/bin/shlibsign$(BIN_SUFFIX) -v -i'
MOZ_SIGN_PREPARED_PACKAGE_CMD += --nsscmd '$(ABS_DIST)/bin/shlibsign$(BIN_SUFFIX) -v -i'
endif
endif
@@ -586,8 +575,7 @@ MAKE_PACKAGE += && $(MOZ_SIGN_PACKAGE_CMD) '$(PACKAGE)'
endif
ifdef MOZ_SIGN_CMD
MAKE_SDK += && $(MOZ_SIGN_CMD) -f gpg $(SDK)
UPLOAD_EXTRA_FILES += $(SDK).asc
MAKE_SDK += && $(MOZ_SIGN_CMD) -f gpg '$(SDK)'
endif
NO_PKG_FILES += \
@@ -682,6 +670,11 @@ endif
ifneq (android,$(MOZ_WIDGET_TOOLKIT))
OPTIMIZEJARS = 1
ifneq (gonk,$(MOZ_WIDGET_TOOLKIT))
ifdef NIGHTLY_BUILD
DISABLE_JAR_COMPRESSION = 1
endif
endif
endif
# A js binary is needed to perform verification of JavaScript minification.
@@ -732,6 +725,7 @@ UPLOAD_FILES= \
$(call QUOTED_WILDCARD,$(DIST)/$(COMPLETE_MAR)) \
$(call QUOTED_WILDCARD,$(DIST)/$(LANGPACK)) \
$(call QUOTED_WILDCARD,$(wildcard $(DIST)/$(PARTIAL_MAR))) \
$(call QUOTED_WILDCARD,$(DIST)/$(PKG_PATH)$(MOZHARNESS_PACKAGE)) \
$(call QUOTED_WILDCARD,$(DIST)/$(PKG_PATH)$(TEST_PACKAGE)) \
$(call QUOTED_WILDCARD,$(DIST)/$(PKG_PATH)$(CPP_TEST_PACKAGE)) \
$(call QUOTED_WILDCARD,$(DIST)/$(PKG_PATH)$(XPC_TEST_PACKAGE)) \
@@ -739,8 +733,10 @@ UPLOAD_FILES= \
$(call QUOTED_WILDCARD,$(DIST)/$(PKG_PATH)$(TALOS_PACKAGE)) \
$(call QUOTED_WILDCARD,$(DIST)/$(PKG_PATH)$(REFTEST_PACKAGE)) \
$(call QUOTED_WILDCARD,$(DIST)/$(PKG_PATH)$(WP_TEST_PACKAGE)) \
$(call QUOTED_WILDCARD,$(DIST)/$(PKG_PATH)$(GTEST_PACKAGE)) \
$(call QUOTED_WILDCARD,$(DIST)/$(PKG_PATH)$(SYMBOL_ARCHIVE_BASENAME).zip) \
$(call QUOTED_WILDCARD,$(DIST)/$(SDK)) \
$(call QUOTED_WILDCARD,$(DIST)/$(SDK).asc) \
$(call QUOTED_WILDCARD,$(MOZ_SOURCESTAMP_FILE)) \
$(call QUOTED_WILDCARD,$(MOZ_BUILDINFO_FILE)) \
$(call QUOTED_WILDCARD,$(MOZ_MOZINFO_FILE)) \
@@ -761,8 +757,8 @@ endif
ifdef UNIFY_DIST
UNIFY_ARCH := $(notdir $(patsubst %/,%,$(dir $(UNIFY_DIST))))
UPLOAD_FILES += \
$(wildcard $(UNIFY_DIST)/$(SDK_PATH)$(PKG_BASENAME)-$(UNIFY_ARCH).sdk$(SDK_SUFFIX)) \
$(wildcard $(UNIFY_DIST)/$(SDK_PATH)$(PKG_BASENAME)-$(UNIFY_ARCH).sdk$(SDK_SUFFIX).asc)
$(call QUOTED_WILDCARD,$(UNIFY_DIST)/$(SDK_PATH)$(PKG_BASENAME)-$(UNIFY_ARCH).sdk$(SDK_SUFFIX)) \
$(call QUOTED_WILDCARD,$(UNIFY_DIST)/$(SDK_PATH)$(PKG_BASENAME)-$(UNIFY_ARCH).sdk$(SDK_SUFFIX).asc)
endif
SIGN_CHECKSUM_CMD=
toolkit/mozapps/update/tests/Makefile.in
+2 -2
View File
@@ -2,8 +2,8 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
XPCSHELLTESTROOT = $(abspath $(DEPTH))/_tests/xpcshell/$(relativesrcdir)
CHROMETESTROOT = $(abspath $(DEPTH))/_tests/testing/mochitest/chrome/$(relativesrcdir)
XPCSHELLTESTROOT = $(topobjdir)/_tests/xpcshell/$(relativesrcdir)
CHROMETESTROOT = $(topobjdir)/_tests/testing/mochitest/chrome/$(relativesrcdir)
pp_const_file = $(srcdir)/data/xpcshellConstantsPP.js
toolkit/mozapps/update/updater/updater-xpcshell/Makefile.in
+2 -2
View File
@@ -5,8 +5,8 @@
# For changes here, also consider ../Makefile.in
XPCSHELLTESTROOT = $(abspath $(DEPTH))/_tests/xpcshell/toolkit/mozapps/update/tests
MOCHITESTROOT = $(abspath $(DEPTH))/_tests/testing/mochitest/chrome/toolkit/mozapps/update/tests
XPCSHELLTESTROOT = $(topobjdir)/_tests/xpcshell/toolkit/mozapps/update/tests
MOCHITESTROOT = $(topobjdir)/_tests/testing/mochitest/chrome/toolkit/mozapps/update/tests
include $(topsrcdir)/config/rules.mk
tools/update-packaging/Makefile.in
+2 -2
View File
@@ -11,7 +11,7 @@ STANDALONE_MAKEFILE := 1
PACKAGE_BASE_DIR = $(DIST)
# Default output location for update archive
STAGE_DIR = $(abspath $(DIST)/$(PKG_UPDATE_PATH))
STAGE_DIR = $(ABS_DIST)/$(PKG_UPDATE_PATH)
ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
ifdef UNIVERSAL_BINARY
@@ -35,7 +35,7 @@ full-update:: complete-patch
ifeq ($(OS_TARGET), WINNT)
MOZ_PKG_FORMAT := SFX7Z
UNPACKAGE = '$(subst $(DIST),$(_ABS_DIST),$(INSTALLER_PACKAGE))'
UNPACKAGE = '$(subst $(DIST),$(ABS_DIST),$(INSTALLER_PACKAGE))'
ifdef AB_CD
UNPACKAGE = '$(PACKAGE_BASE_DIR)/$(PACKAGE)'
endif