Bug 1481067 - Remove option to build comm-central as topsourcedir from suite. r=IanN
This commit is contained in:
Frank-Rainer Grahl
Родитель
2ac808e31a
Коммит
453e85bc74
|
|
@ -3,7 +3,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/.
|
||||
|
||||
include $(moztopsrcdir)/config/rules.mk
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
ifdef MAKENSISU
|
||||
# For Windows build the uninstaller during the application build since the
|
||||
|
|
@ -17,7 +17,7 @@ endif
|
|||
# platform.ini are the same, which isn't a problem for Firefox, but
|
||||
# it's not right for anything else. So we correct platform.ini here.
|
||||
|
||||
MOZ_REV=$(shell hg -R "$(moztopsrcdir)" parent --template="{node}" 2>/dev/null)
|
||||
MOZ_REV=$(shell hg -R "$(topsrcdir)" parent --template="{node}" 2>/dev/null)
|
||||
|
||||
libs:: $(DIST)/bin/platform.ini
|
||||
sed -e "s/^\(SourceStamp=\).*/\1$(MOZ_REV)/" $(DIST)/bin/platform.ini \
|
||||
|
|
|
|||
|
|
@ -3,23 +3,22 @@
|
|||
# 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('/%s/mailnews/mailnews.mozbuild' % CONFIG['commreltopsrcdir'])
|
||||
include('/comm/mailnews/mailnews.mozbuild')
|
||||
|
||||
include('/toolkit/toolkit.mozbuild')
|
||||
|
||||
if CONFIG['MOZ_EXTENSIONS']:
|
||||
DIRS += ['/extensions']
|
||||
|
||||
|
||||
DIRS += ['/%s' % CONFIG['MOZ_BRANDING_DIRECTORY']]
|
||||
|
||||
if CONFIG['MOZ_CALENDAR']:
|
||||
DIRS += [
|
||||
'/%s/calendar/lightning' % CONFIG['commreltopsrcdir'],
|
||||
'/%s/calendar/timezones' % CONFIG['commreltopsrcdir']
|
||||
'/comm/calendar/lightning',
|
||||
'/comm/calendar/timezones',
|
||||
]
|
||||
|
||||
DIRS += [
|
||||
'/%s/editor/ui' % CONFIG['commreltopsrcdir'],
|
||||
'/%s/suite' % CONFIG['commreltopsrcdir'],
|
||||
'/comm/editor/ui',
|
||||
'/comm/suite',
|
||||
]
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ MOZ_WINCONSOLE = 0
|
|||
endif
|
||||
endif
|
||||
|
||||
include $(moztopsrcdir)/config/config.mk
|
||||
include $(topsrcdir)/config/config.mk
|
||||
|
||||
# If we are trying to show an error dialog about the lack of SSE2 support,
|
||||
# make sure that code itself doesn't use SSE2.
|
||||
|
|
@ -39,14 +39,14 @@ ifeq ($(OS_ARCH),WINNT)
|
|||
EXTRA_DEPS += seamonkey.exe.manifest
|
||||
endif
|
||||
|
||||
include $(moztopsrcdir)/config/rules.mk
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
libs::
|
||||
ifeq ($(OS_ARCH),WINNT)
|
||||
$(EXIT_ON_ERROR) \
|
||||
$(PERL) -pe 's/(?<!\r)\n/\r\n/g;' < $(commtopsrcdir)/suite/installer/license.txt > $(DIST)/bin/license.txt
|
||||
$(PERL) -pe 's/(?<!\r)\n/\r\n/g;' < $(topsrcdir)/comm/suite/installer/license.txt > $(DIST)/bin/license.txt
|
||||
else
|
||||
$(INSTALL) $(IFLAGS1) $(commtopsrcdir)/suite/installer/license.txt $(DIST)/bin/
|
||||
$(INSTALL) $(IFLAGS1) $(topsrcdir)/comm/suite/installer/license.txt $(DIST)/bin/
|
||||
endif
|
||||
|
||||
ifneq ($(OS_ARCH),WINNT)
|
||||
|
|
|
|||
|
|
@ -12,10 +12,10 @@ USE_LIBS += ['mozglue']
|
|||
SOURCES += ['nsSuiteApp.cpp']
|
||||
LOCAL_INCLUDES += [
|
||||
'!/build',
|
||||
'/%s/ipc/contentproc/' % CONFIG['mozreltopsrcdir'],
|
||||
'/%s/toolkit/xre' % CONFIG['mozreltopsrcdir'],
|
||||
'/%s/xpcom/base' % CONFIG['mozreltopsrcdir'],
|
||||
'/%s/xpcom/build' % CONFIG['mozreltopsrcdir'],
|
||||
'/ipc/contentproc/',
|
||||
'/toolkit/xre',
|
||||
'/xpcom/base',
|
||||
'/xpcom/build',
|
||||
]
|
||||
|
||||
if CONFIG['OS_ARCH'] == 'WINNT':
|
||||
|
|
@ -25,7 +25,7 @@ if CONFIG['OS_ARCH'] == 'WINNT':
|
|||
if CONFIG['LIBFUZZER']:
|
||||
USE_LIBS += [ 'fuzzer' ]
|
||||
LOCAL_INCLUDES += [
|
||||
'/%s/tools/fuzzing/libfuzzer' % CONFIG['mozreltopsrcdir'],
|
||||
'/tools/fuzzing/libfuzzer',
|
||||
]
|
||||
|
||||
if CONFIG['_MSC_VER']:
|
||||
|
|
@ -36,8 +36,8 @@ if CONFIG['_MSC_VER']:
|
|||
if CONFIG['MOZ_SANDBOX'] and CONFIG['OS_ARCH'] == 'WINNT':
|
||||
# For sandbox includes and the include dependencies those have
|
||||
LOCAL_INCLUDES += [
|
||||
'/%s/security/sandbox/chromium' % CONFIG['mozreltopsrcdir'],
|
||||
'/%s/security/sandbox/chromium-shim' % CONFIG['mozreltopsrcdir'],
|
||||
'/security/sandbox/chromium',
|
||||
'/security/sandbox/chromium-shim',
|
||||
]
|
||||
|
||||
USE_LIBS += [
|
||||
|
|
|
|||
|
|
@ -73,9 +73,9 @@ comm.jar:
|
|||
content/communicator/helpEditorOverlay.xul (content/helpEditorOverlay.xul)
|
||||
content/communicator/helpMessengerOverlay.xul (content/helpMessengerOverlay.xul)
|
||||
content/communicator/helpSecurityOverlay.xul (content/helpSecurityOverlay.xul)
|
||||
content/communicator/labelsencodings.properties (/@mozreltopsrcdir@/dom/encoding/labelsencodings.properties)
|
||||
content/communicator/labelsencodings.properties (/dom/encoding/labelsencodings.properties)
|
||||
# the following file is a suite-specific override of the generic license.html, using suite/common/app-license.html as input:
|
||||
* content/communicator/license.html (/@mozreltopsrcdir@/toolkit/content/license.html)
|
||||
* content/communicator/license.html (/toolkit/content/license.html)
|
||||
content/communicator/nsContextMenu.js (content/nsContextMenu.js)
|
||||
content/communicator/openLocation.js (content/openLocation.js)
|
||||
content/communicator/openLocation.xul (content/openLocation.xul)
|
||||
|
|
|
|||
|
|
@ -13,5 +13,5 @@ JAR_MANIFESTS += ['jar.mn']
|
|||
# chrome://global/content/license.html (about:license)
|
||||
DEFINES['APP_LICENSE_BLOCK'] = '%s/content/overrides/app-license.html' % SRCDIR
|
||||
|
||||
for var in ('MOZ_APP_NAME', 'MOZ_MACBUNDLE_NAME', 'mozreltopsrcdir'):
|
||||
for var in ('MOZ_APP_NAME', 'MOZ_MACBUNDLE_NAME'):
|
||||
DEFINES[var] = CONFIG[var]
|
||||
|
|
|
|||
|
|
@ -3,7 +3,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/.
|
||||
|
||||
include $(moztopsrcdir)/config/rules.mk
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
# channel-prefs.js is handled separate from other prefs due to bug 756325.
|
||||
libs:: $(srcdir)/channel-prefs.js
|
||||
|
|
|
|||
|
|
@ -2,29 +2,28 @@
|
|||
# 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/.
|
||||
|
||||
ifndef COMM_BUILD
|
||||
package:
|
||||
@$(MAKE) -C $(commtopobjdir)/suite/installer
|
||||
@$(MAKE) -C comm/suite/installer
|
||||
|
||||
package-compare:
|
||||
@$(MAKE) -C $(commtopobjdir)/suite/installer package-compare
|
||||
@$(MAKE) -C comm/suite/installer package-compare
|
||||
|
||||
install::
|
||||
@$(MAKE) -C $(commtopobjdir)/suite/installer install
|
||||
@$(MAKE) -C comm/suite/installer install
|
||||
|
||||
source-package::
|
||||
@$(MAKE) -C $(commtopobjdir)/suite/installer source-package
|
||||
@$(MAKE) -C comm/suite/installer source-package
|
||||
|
||||
upload::
|
||||
@$(MAKE) -C $(commtopobjdir)/suite/installer upload
|
||||
@$(MAKE) -C comm/suite/installer upload
|
||||
|
||||
source-upload::
|
||||
@$(MAKE) -C $(commtopobjdir)/suite/installer source-upload
|
||||
@$(MAKE) -C comm/suite/installer source-upload
|
||||
|
||||
# make -j1 because dependencies in l10n build targets don't work
|
||||
# with parallel builds
|
||||
merge-% installers-% langpack-% chrome-% clobber-%:
|
||||
$(MAKE) -j1 -C $(commtopobjdir)/suite/locales $@
|
||||
$(MAKE) -j1 -C comm/suite/locales $@
|
||||
|
||||
# mochitests need to be run from the Mozilla build system
|
||||
ifdef ENABLE_TESTS
|
||||
|
|
@ -39,4 +38,3 @@ mochitest:: mochitest-browser-chrome
|
|||
|
||||
.PHONY: mochitest-browser-chrome
|
||||
endif
|
||||
endif
|
||||
|
|
|
|||
|
|
@ -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/.
|
||||
|
||||
include $(moztopsrcdir)/config/rules.mk
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
# Ensure that we don't embed a manifest referencing the CRT.
|
||||
EMBED_MANIFEST_AT =
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ if CONFIG['OS_ARCH'] == 'WINNT':
|
|||
'nsWindowsShellService.cpp',
|
||||
]
|
||||
LOCAL_INCLUDES += [
|
||||
'/%s/other-licenses/nsis/Contrib/CityHash/cityhash' % (CONFIG['mozreltopsrcdir'],),
|
||||
'/other-licenses/nsis/Contrib/CityHash/cityhash',
|
||||
]
|
||||
OS_LIBS += [
|
||||
'ole32',
|
||||
|
|
|
|||
|
|
@ -9,8 +9,8 @@ MOZ_APP_BASENAME=SeaMonkey
|
|||
MOZ_APP_VENDOR=Mozilla
|
||||
MOZ_APP_NAME=seamonkey
|
||||
MOZ_APP_DISPLAYNAME=SeaMonkey
|
||||
MOZ_BRANDING_DIRECTORY=$commreltopsrcdir/suite/branding/seamonkey
|
||||
MOZ_OFFICIAL_BRANDING_DIRECTORY=$commreltopsrcdir/suite/branding/seamonkey
|
||||
MOZ_BRANDING_DIRECTORY=comm/suite/branding/seamonkey
|
||||
MOZ_OFFICIAL_BRANDING_DIRECTORY=comm/suite/branding/seamonkey
|
||||
MOZ_UPDATER=1
|
||||
# This should usually be the same as the value MAR_CHANNEL_ID.
|
||||
# If more than one ID is needed, then you should use a comma separated list
|
||||
|
|
@ -18,7 +18,6 @@ MOZ_UPDATER=1
|
|||
ACCEPTED_MAR_CHANNEL_IDS=seamonkey-comm-central
|
||||
# The MAR_CHANNEL_ID must not contain the following 3 characters: ",\t "
|
||||
MAR_CHANNEL_ID=seamonkey-comm-central
|
||||
MOZ_SERVICES_FXACCOUNTS=1
|
||||
|
||||
MOZ_APP_VERSION_TXT=${_topsrcdir}/$MOZ_BUILD_APP/config/version.txt
|
||||
MOZ_APP_VERSION=`cat $MOZ_APP_VERSION_TXT`
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
|
||||
DISTROEXT = $(ABS_DIST)/bin/distribution/extensions
|
||||
|
||||
include $(moztopsrcdir)/config/rules.mk
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
# If adding extra extensions here, check that EXTRA_ARGS defined below won't
|
||||
# affect them unintentionally.
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
|
||||
STANDALONE_MAKEFILE := 1
|
||||
|
||||
include $(moztopsrcdir)/config/rules.mk
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
MOZ_PKG_REMOVALS = $(srcdir)/removed-files.in
|
||||
|
||||
|
|
@ -14,13 +14,13 @@ ifndef SYSTEM_LIBXUL
|
|||
MOZ_PKG_FATAL_WARNINGS = 1
|
||||
endif
|
||||
|
||||
DEFINES += -DPKG_LOCALE_MANIFEST=$(commtopobjdir)/suite/installer/locale-manifest.in
|
||||
DEFINES += -DPKG_LOCALE_MANIFEST=$(topobjdir)/comm/suite/installer/locale-manifest.in
|
||||
MOZ_CHROME_LOCALE_ENTRIES=@RESPATH@/chrome/
|
||||
|
||||
MOZ_PKG_DUPEFLAGS = \
|
||||
-w \
|
||||
-f $(srcdir)/allowed-dupes.mn \
|
||||
-f $(moztopsrcdir)/browser/installer/allowed-dupes.mn \
|
||||
-f $(topsrcdir)/browser/installer/allowed-dupes.mn \
|
||||
$(NULL)
|
||||
|
||||
MOZ_NONLOCALIZED_PKG_LIST = \
|
||||
|
|
@ -154,7 +154,7 @@ NON_OMNIJAR_FILES = \
|
|||
defaults/profile/chrome/userContent-example.css \
|
||||
$(NULL)
|
||||
|
||||
include $(moztopsrcdir)/toolkit/mozapps/installer/packager.mk
|
||||
include $(topsrcdir)/toolkit/mozapps/installer/packager.mk
|
||||
|
||||
ifeq (Darwin, $(OS_ARCH))
|
||||
BINPATH = $(_BINPATH)
|
||||
|
|
@ -195,7 +195,7 @@ DEFINES += -DMOZ_OMNIJAR=1
|
|||
endif
|
||||
|
||||
libs::
|
||||
$(MAKE) -C $(commtopobjdir)/suite/locales langpack
|
||||
$(MAKE) -C $(topobjdir)/comm/suite/locales langpack
|
||||
|
||||
ifeq (WINNT,$(OS_ARCH))
|
||||
PKGCOMP_FIND_OPTS =
|
||||
|
|
@ -215,7 +215,7 @@ package-compare:: $(MOZ_PKG_MANIFEST)
|
|||
rm -f $(DIST)/pack-list.txt $(DIST)/bin-list.txt
|
||||
|
||||
# The comm-* source stamp is already there.
|
||||
PLATFORM_SOURCE_STAMP = $(firstword $(shell hg -R "$(moztopsrcdir)" parent --template="{node|short}\n" 2>/dev/null))
|
||||
PLATFORM_SOURCE_REPO = $(shell hg -R "$(moztopsrcdir)" showconfig paths.default 2>/dev/null | sed -e "s/^ssh:/https:/")
|
||||
PLATFORM_SOURCE_STAMP = $(firstword $(shell hg -R "$(topsrcdir)" parent --template="{node|short}\n" 2>/dev/null))
|
||||
PLATFORM_SOURCE_REPO = $(shell hg -R "$(topsrcdir)" showconfig paths.default 2>/dev/null | sed -e "s/^ssh:/https:/")
|
||||
make-sourcestamp-file::
|
||||
@echo "$(PLATFORM_SOURCE_REPO)/rev/$(PLATFORM_SOURCE_STAMP)" >> $(MOZ_SOURCESTAMP_FILE)
|
||||
|
|
|
|||
|
|
@ -2,12 +2,12 @@
|
|||
# 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 $(moztopsrcdir)/toolkit/mozapps/installer/package-name.mk
|
||||
include $(topsrcdir)/toolkit/mozapps/installer/package-name.mk
|
||||
|
||||
CONFIG_DIR = instgen
|
||||
SFX_MODULE = $(commtopsrcdir)/other-licenses/7zstub/seamonkey/7zSD.sfx
|
||||
SFX_MODULE = $(topsrcdir)/comm/other-licenses/7zstub/seamonkey/7zSD.sfx
|
||||
|
||||
EXPAND_COMM_LOCALE_SRCDIR = $(if $(filter en-US,$(AB_CD)),$(topsrcdir)/$(commreltopsrcdir)/$(1)/en-US,$(or $(realpath $(L10NBASEDIR)),$(abspath $(L10NBASEDIR)))/$(AB_CD)/$(subst /locales,,$(1)))
|
||||
EXPAND_COMM_LOCALE_SRCDIR = $(if $(filter en-US,$(AB_CD)),$(topsrcdir)/comm/$(1)/en-US,$(or $(realpath $(L10NBASEDIR)),$(abspath $(L10NBASEDIR)))/$(AB_CD)/$(subst /locales,,$(1)))
|
||||
|
||||
INSTALLER_FILES = \
|
||||
app.tag \
|
||||
|
|
@ -28,13 +28,13 @@ ifdef MOZ_UPDATER
|
|||
DEFINES += -DMOZ_UPDATER=1
|
||||
endif
|
||||
|
||||
include $(moztopsrcdir)/config/config.mk
|
||||
include $(topsrcdir)/config/config.mk
|
||||
|
||||
ifdef IS_LANGUAGE_REPACK
|
||||
PPL_LOCALE_ARGS = \
|
||||
--l10n-dir=$(REAL_LOCALE_MERGEDIR)/suite/installer/windows \
|
||||
--l10n-dir=$(call EXPAND_COMM_LOCALE_SRCDIR,suite/locales)/installer/windows \
|
||||
--l10n-dir=$(commtopsrcdir)/suite/locales/en-US/installer/windows \
|
||||
--l10n-dir=$(topsrcdir)/comm/suite/locales/en-US/installer/windows \
|
||||
$(NULL)
|
||||
else
|
||||
PPL_LOCALE_ARGS=$(call EXPAND_COMM_LOCALE_SRCDIR,suite/locales)/installer/windows
|
||||
|
|
@ -45,15 +45,15 @@ $(CONFIG_DIR)/setup.exe::
|
|||
$(MKDIR) $(CONFIG_DIR)
|
||||
$(INSTALL) $(addprefix $(srcdir)/,$(INSTALLER_FILES)) $(CONFIG_DIR)
|
||||
$(INSTALL) $(addprefix $(topsrcdir)/$(MOZ_BRANDING_DIRECTORY)/,$(BRANDING_FILES)) $(CONFIG_DIR)
|
||||
$(PYTHON) $(moztopsrcdir)/toolkit/mozapps/installer/windows/nsis/preprocess-locale.py \
|
||||
--convert-utf8-utf16le $(commtopsrcdir)/suite/installer/license.txt $(CONFIG_DIR)/license.txt
|
||||
$(PYTHON) $(topsrcdir)/toolkit/mozapps/installer/windows/nsis/preprocess-locale.py \
|
||||
--convert-utf8-utf16le $(topsrcdir)/comm/suite/installer/license.txt $(CONFIG_DIR)/license.txt
|
||||
$(call py_action,preprocessor,-Fsubstitution $(DEFINES) $(ACDEFINES) \
|
||||
$(srcdir)/nsis/defines.nsi.in -o $(CONFIG_DIR)/defines.nsi)
|
||||
$(PYTHON) $(moztopsrcdir)/toolkit/mozapps/installer/windows/nsis/preprocess-locale.py \
|
||||
--preprocess-locale $(moztopsrcdir) \
|
||||
$(PYTHON) $(topsrcdir)/toolkit/mozapps/installer/windows/nsis/preprocess-locale.py \
|
||||
--preprocess-locale $(topsrcdir) \
|
||||
$(PPL_LOCALE_ARGS) $(AB_CD) $(CONFIG_DIR)
|
||||
|
||||
GARBARGE_DIRS += instgen
|
||||
|
||||
include $(moztopsrcdir)/config/rules.mk
|
||||
include $(moztopsrcdir)/toolkit/mozapps/installer/windows/nsis/makensis.mk
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
include $(topsrcdir)/toolkit/mozapps/installer/windows/nsis/makensis.mk
|
||||
|
|
|
|||
|
|
@ -2,10 +2,10 @@
|
|||
# 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/.
|
||||
|
||||
LOCALE_TOPDIR=$(commtopsrcdir)
|
||||
LOCALE_TOPDIR=$(topsrcdir)/comm
|
||||
LOCALE_RELATIVEDIR=suite/locales
|
||||
|
||||
include $(moztopsrcdir)/config/config.mk
|
||||
include $(topsrcdir)/config/config.mk
|
||||
|
||||
MERGE_FILES = $(foreach f,$(1),$(call MERGE_FILE,$(f)))
|
||||
|
||||
|
|
@ -42,7 +42,7 @@ MOZ_PKG_MAC_ICON=$(ABS_DIST)/branding/disk.icns
|
|||
MOZ_PKG_MAC_EXTRA=--symlink '/Applications:/ '
|
||||
endif
|
||||
|
||||
MOZ_SFX_PACKAGE=$(commtopsrcdir)/other-licenses/7zstub/seamonkey/7zSD.sfx
|
||||
MOZ_SFX_PACKAGE=$(topsrcdir)/comm/other-licenses/7zstub/seamonkey/7zSD.sfx
|
||||
|
||||
NON_OMNIJAR_FILES = \
|
||||
defaults/messenger/mailViews.dat \
|
||||
|
|
@ -72,13 +72,11 @@ libs:: searchplugins
|
|||
# Currently not set in SeaMonkey.
|
||||
DIST_SUBDIRS = $(DIST_SUBDIR)
|
||||
|
||||
include $(moztopsrcdir)/config/rules.mk
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
ifeq ($(commreltopsrcdir),comm)
|
||||
COMPARE_LOCALES_DEFINES += -Dmozilla=..
|
||||
endif
|
||||
|
||||
include $(moztopsrcdir)/toolkit/locales/l10n.mk
|
||||
include $(topsrcdir)/toolkit/locales/l10n.mk
|
||||
|
||||
$(list-txt): $(call mkdir_deps,$(SEARCHPLUGINS_PATH)) $(if $(IS_LANGUAGE_REPACK),FORCE)
|
||||
$(RM) $(list-txt)
|
||||
|
|
@ -202,13 +200,13 @@ endif
|
|||
|
||||
ident:
|
||||
@printf 'comm_revision '
|
||||
@$(PYTHON) $(moztopsrcdir)/config/printconfigsetting.py \
|
||||
@$(PYTHON) $(topsrcdir)/config/printconfigsetting.py \
|
||||
'$(STAGEDIST)/application.ini' App SourceStamp
|
||||
@printf 'moz_revision '
|
||||
@$(PYTHON) $(moztopsrcdir)/config/printconfigsetting.py \
|
||||
@$(PYTHON) $(topsrcdir)/config/printconfigsetting.py \
|
||||
'$(STAGEDIST)/platform.ini' Build SourceStamp
|
||||
@printf 'buildid '
|
||||
@$(PYTHON) $(moztopsrcdir)/config/printconfigsetting.py \
|
||||
@$(PYTHON) $(topsrcdir)/config/printconfigsetting.py \
|
||||
'$(STAGEDIST)/application.ini' App BuildID
|
||||
|
||||
ifdef MOZ_IRC
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ if CONFIG['MAKENSISU']:
|
|||
DIRS += ['installer/windows']
|
||||
|
||||
if CONFIG['MOZ_BUNDLED_FONTS']:
|
||||
DIRS += ['/%s/browser/fonts' % CONFIG['mozreltopsrcdir']]
|
||||
DIRS += ['/browser/fonts']
|
||||
|
||||
# app is always last as it packages up the built files on mac.
|
||||
DIRS += [
|
||||
|
|
|
|||
|
|
@ -12,7 +12,6 @@ JAR_MANIFESTS += ['jar.mn']
|
|||
USE_EXTENSION_MANIFEST = True
|
||||
|
||||
DEFINES['SEAMONKEY_VERSION'] = CONFIG['SEAMONKEY_VERSION']
|
||||
DEFINES['mozreltopsrcdir'] = CONFIG['mozreltopsrcdir']
|
||||
|
||||
FINAL_TARGET_FILES += [
|
||||
'icon.png',
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче