Browse Source

Change the MOZILLA_DIR path

custom-2020
Matt A. Tobin 3 years ago committed by Roy Tam
parent
commit
506337cd49
  1. 32
      aclocal.m4
  2. 2
      build/mach_bootstrap.py
  3. 2
      build/moz.configure/platform.configure
  4. 2
      build/pymake/make.py
  5. 2
      calendar/.eslintrc.js
  6. 2
      calendar/lightning/build/universal.mk
  7. 24
      client.mk
  8. 2
      config/baseconfig.mk
  9. 2
      config/rules.mk
  10. 2
      configure.in
  11. 4
      configure.py
  12. 8
      mach
  13. 2
      moz.configure
  14. 10
      projects/mail/app/moz.build
  15. 2
      projects/mail/app/splash.rc
  16. 2
      projects/mail/base/content/mailWindowOverlay.xul
  17. 6
      projects/mail/base/jar.mn
  18. 2
      projects/mail/components/addrbook/content/addressbook.xul
  19. 2
      projects/mail/components/compose/content/messengercompose.xul
  20. 26
      projects/mail/components/smime/jar.mn
  21. 2
      projects/mail/components/steel/steelApplication.js
  22. 2
      projects/mail/locales/Makefile.in
  23. 4
      projects/mail/locales/l10n-aurora.ini
  24. 4
      projects/mail/locales/l10n-beta.ini
  25. 4
      projects/mail/locales/l10n-central.ini
  26. 4
      projects/mail/locales/l10n.ini
  27. 2
      projects/mail/moz.configure
  28. 6
      projects/navigator/app/moz.build
  29. 2
      projects/navigator/base/jar.mn
  30. 4
      projects/navigator/communicator/jar.mn
  31. 2
      projects/navigator/components/smile/src/smileApplication.js
  32. 2
      projects/navigator/moz.configure
  33. 10
      projects/navigator/themes/modern/jar.mn

32
aclocal.m4 vendored

@ -1,22 +1,22 @@
dnl
dnl Local autoconf macros used with mozilla
dnl Local autoconf macros used with UXP
dnl The contents of this file are under the Public Domain.
dnl
builtin(include, mozilla/build/autoconf/toolchain.m4)dnl
builtin(include, mozilla/build/autoconf/config.status.m4)dnl
builtin(include, mozilla/build/autoconf/nspr.m4)dnl
builtin(include, mozilla/build/autoconf/nss.m4)dnl
builtin(include, mozilla/build/autoconf/pkg.m4)dnl
builtin(include, mozilla/build/autoconf/codeset.m4)dnl
builtin(include, mozilla/build/autoconf/altoptions.m4)dnl
builtin(include, mozilla/build/autoconf/mozprog.m4)dnl
builtin(include, mozilla/build/autoconf/acwinpaths.m4)dnl
builtin(include, mozilla/build/autoconf/lto.m4)dnl
builtin(include, mozilla/build/autoconf/frameptr.m4)dnl
builtin(include, mozilla/build/autoconf/compiler-opts.m4)dnl
builtin(include, mozilla/build/autoconf/zlib.m4)dnl
builtin(include, mozilla/build/autoconf/expandlibs.m4)dnl
builtin(include, platform/build/autoconf/toolchain.m4)dnl
builtin(include, platform/build/autoconf/config.status.m4)dnl
builtin(include, platform/build/autoconf/nspr.m4)dnl
builtin(include, platform/build/autoconf/nss.m4)dnl
builtin(include, platform/build/autoconf/pkg.m4)dnl
builtin(include, platform/build/autoconf/codeset.m4)dnl
builtin(include, platform/build/autoconf/altoptions.m4)dnl
builtin(include, platform/build/autoconf/mozprog.m4)dnl
builtin(include, platform/build/autoconf/acwinpaths.m4)dnl
builtin(include, platform/build/autoconf/lto.m4)dnl
builtin(include, platform/build/autoconf/frameptr.m4)dnl
builtin(include, platform/build/autoconf/compiler-opts.m4)dnl
builtin(include, platform/build/autoconf/zlib.m4)dnl
builtin(include, platform/build/autoconf/expandlibs.m4)dnl
MOZ_PROG_CHECKMSYS()
@ -24,4 +24,4 @@ MOZ_PROG_CHECKMSYS()
# configure.in: autoconf puts the argument parsing code above anything
# expanded from configure.in, and we need to get the configure options
# from .mozconfig in place before that argument parsing code.
dnl MOZ_READ_MOZCONFIG(mozilla)
dnl MOZ_READ_MOZCONFIG(platform)

2
build/mach_bootstrap.py

@ -8,7 +8,7 @@ import os, sys
def bootstrap(topsrcdir, mozilla_dir=None):
if mozilla_dir is None:
mozilla_dir = os.path.join(topsrcdir, 'mozilla')
mozilla_dir = os.path.join(topsrcdir, 'platform')
sys.path[0:0] = [mozilla_dir]
import build.mach_bootstrap
return build.mach_bootstrap.bootstrap(topsrcdir, mozilla_dir)

2
build/moz.configure/platform.configure vendored

@ -33,7 +33,7 @@ def platform(value):
__sandbox__.set_config_impl('MOZ_JAR_MAKER_FILE_FORMAT', 'flat')
return ''
else:
return '../mozilla/toolkit/moz.configure'
return '../platform/toolkit/moz.configure'
# Include the toolkit moz.configure or silently continue with an empty string from above
include(platform)

2
build/pymake/make.py

@ -15,7 +15,7 @@ def getpath(relpath):
thisdir = os.path.dirname(__file__)
return os.path.abspath(os.path.join(thisdir, *relpath))
PYMAKE = getpath(["..", "..", "mozilla", "build", "pymake", "make.py"])
PYMAKE = getpath(["..", "..", "platform", "build", "pymake", "make.py"])
def main(args):
if 'TINDERBOX_OUTPUT' in os.environ:

2
calendar/.eslintrc.js

@ -2,7 +2,7 @@
module.exports = {
"extends": [
"../mozilla/toolkit/.eslintrc.js"
"../platform/toolkit/.eslintrc.js"
],
"rules": {
// Enforce one true brace style (opening brace on the same line)

2
calendar/lightning/build/universal.mk

@ -15,7 +15,7 @@ topsrcdir = $(TOPSRCDIR)
DEPTH = $(OBJDIR)
include $(DEPTH)/config/autoconf.mk
include $(topsrcdir)/mozilla/toolkit/mozapps/installer/package-name.mk
include $(topsrcdir)/platform/toolkit/mozapps/installer/package-name.mk
THUNDERBIRD_VERSION := $(shell cat $(topsrcdir)/projects/mail/config/version.txt)
LIGHTNING_VERSION := $(shell $(PYTHON) $(topsrcdir)/calendar/lightning/build/makeversion.py $(word 1,$(MOZ_PKG_VERSION) $(THUNDERBIRD_VERSION)))

24
client.mk

@ -40,7 +40,7 @@ comma := ,
CWD := $(CURDIR)
ifneq (1,$(words $(CWD)))
$(error The mozilla directory cannot be located in a path with spaces.)
$(error The platform directory cannot be located in a path with spaces.)
endif
ifeq "$(CWD)" "/"
@ -160,8 +160,8 @@ endif
# 'configure' scripts generated by autoconf.
CONFIGURES := $(TOPSRCDIR)/configure
CONFIGURES += $(TOPSRCDIR)/mozilla/configure
CONFIGURES += $(TOPSRCDIR)/mozilla/js/src/configure
CONFIGURES += $(TOPSRCDIR)/platform/configure
CONFIGURES += $(TOPSRCDIR)/platform/js/src/configure
# Make targets that are going to be passed to the real build system
OBJDIR_TARGETS = install export libs clean realclean distclean maybe_clobber_profiledbuild upload sdk installer package package-compare stage-package source-package l10n-check automation/build
@ -262,7 +262,7 @@ profiledbuild::
ifdef MOZ_UNIFY_BDATE
ifndef MOZ_BUILD_DATE
ifdef MOZ_BUILD_PROJECTS
MOZ_BUILD_DATE = $(shell $(PYTHON) $(TOPSRCDIR)/mozilla/build/variables.py buildid_header | awk '{print $$3}')
MOZ_BUILD_DATE = $(shell $(PYTHON) $(TOPSRCDIR)/platform/build/variables.py buildid_header | awk '{print $$3}')
export MOZ_BUILD_DATE
endif
endif
@ -315,11 +315,11 @@ CONFIG_CACHE = $(wildcard $(OBJDIR)/config.cache)
EXTRA_CONFIG_DEPS := \
$(TOPSRCDIR)/aclocal.m4 \
$(TOPSRCDIR)/mozilla/aclocal.m4 \
$(TOPSRCDIR)/mozilla/old-configure.in \
$(wildcard $(TOPSRCDIR)/mozilla/build/autoconf/*.m4) \
$(TOPSRCDIR)/mozilla/js/src/aclocal.m4 \
$(TOPSRCDIR)/mozilla/js/src/old-configure.in \
$(TOPSRCDIR)/platform/aclocal.m4 \
$(TOPSRCDIR)/platform/old-configure.in \
$(wildcard $(TOPSRCDIR)/platform/build/autoconf/*.m4) \
$(TOPSRCDIR)/platform/js/src/aclocal.m4 \
$(TOPSRCDIR)/platform/js/src/old-configure.in \
$(NULL)
$(CONFIGURES): %: %.in $(EXTRA_CONFIG_DEPS)
@ -329,9 +329,9 @@ $(CONFIGURES): %: %.in $(EXTRA_CONFIG_DEPS)
CONFIG_STATUS_DEPS := \
$(wildcard $(CONFIGURES)) \
$(wildcard $(TOPSRCDIR)/mozilla/nsprpub/configure) \
$(wildcard $(TOPSRCDIR)/mozilla/config/milestone.txt) \
$(wildcard $(TOPSRCDIR)/ldap/sdks/c-sdk/configure) \
$(wildcard $(TOPSRCDIR)/platform/nsprpub/configure) \
$(wildcard $(TOPSRCDIR)/platform/config/milestone.txt) \
$(wildcard $(TOPSRCDIR)/platform/ldap/sdks/c-sdk/configure) \
$(wildcard $(addsuffix confvars.sh,$(wildcard $(TOPSRCDIR)/*/))) \
$(NULL)

2
config/baseconfig.mk

@ -12,5 +12,5 @@ ifndef INCLUDED_AUTOCONF_MK
topsrcdir := $(dir $(firstword $(MAKEFILE_LIST)))..
endif
MOZILLA_SRCDIR = $(topsrcdir)/mozilla
MOZILLA_SRCDIR = $(topsrcdir)/platform
include $(MOZILLA_SRCDIR)/config/baseconfig.mk

2
config/rules.mk

@ -10,4 +10,4 @@ $(error topsrcdir was not set))
endif
# Use mozilla-central's copy of rules.mk.
include $(topsrcdir)/mozilla/config/rules.mk
include $(topsrcdir)/platform/config/rules.mk

2
configure.in

@ -13,7 +13,7 @@ divert(0)dnl
#!/bin/sh
SRCDIR=$(dirname $0)
TOPSRCDIR="$SRCDIR"
MOZILLA_SRCDIR="${SRCDIR}/mozilla"
MOZILLA_SRCDIR="${SRCDIR}/platform"
export OLD_CONFIGURE="${MOZILLA_SRCDIR}"/old-configure
# Ensure the comm-* values are used.

4
configure.py

@ -10,12 +10,12 @@ import sys
base_dir = os.path.abspath(os.path.dirname(__file__))
sys.path.append(os.path.join(base_dir, 'mozilla', 'python', 'mozbuild'))
sys.path.append(os.path.join(base_dir, 'platform', 'python', 'mozbuild'))
from mozbuild.configure import ConfigureSandbox
# We can't just import config_status since configure is shadowed by this file!
f, pathname, desc = imp.find_module('configure',
[os.path.join(base_dir, 'mozilla')])
[os.path.join(base_dir, 'platform')])
config_status = imp.load_module('configure', f, pathname, desc).config_status
def main(argv):

8
mach

@ -2,7 +2,7 @@
if GIT_PATH="$(which git 2>/dev/null)"; then
_COMM_BRANCH=`"${GIT_PATH}" symbolic-ref --short HEAD | tr [:upper:] [:lower:]`
_MOZILLA_BRANCH=`cd mozilla && "${GIT_PATH}" symbolic-ref --short HEAD | tr [:upper:] [:lower:]`
_MOZILLA_BRANCH=`cd platform && "${GIT_PATH}" symbolic-ref --short HEAD | tr [:upper:] [:lower:]`
if [ -n "$_MOZILLA_BRANCH" ]; then
export BINOC_GIT_BRANCH=$_COMM_BRANCH@$_MOZILLA_BRANCH
@ -12,7 +12,7 @@ if GIT_PATH="$(which git 2>/dev/null)"; then
fi
BINOC_TOOLCHAIN=`uname`
MACH_CMD=./mozilla/mach
MACH_CMD=./platform/mach
if [ "$1" == "release" ]; then
$MACH_CMD build
@ -27,12 +27,12 @@ elif [ "$1" == "checkout" ]; then
"${GIT_PATH}" checkout TRUNK
fi
"${GIT_PATH}" pull
if [ ! -d "mozilla" ]; then
if [ ! -d "platform" ]; then
"${GIT_PATH}" submodule init
fi
if [ "$2" == "absolute-trunk" ]; then
echo "uxp:"
cd mozilla
cd platform
if [ "$_MOZILLA_BRANCH" != "master" ]; then
"${GIT_PATH}" checkout master
fi

2
moz.configure vendored

@ -4,4 +4,4 @@
# 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('mozilla/moz.configure')
include('platform/moz.configure')

10
projects/mail/app/moz.build

@ -13,9 +13,9 @@ USE_LIBS += ['mozglue']
SOURCES += ['nsMailApp.cpp']
LOCAL_INCLUDES += [
'!/build',
'/mozilla/toolkit/xre',
'/mozilla/xpcom/base',
'/mozilla/xpcom/build',
'/platform/toolkit/xre',
'/platform/xpcom/base',
'/platform/xpcom/build',
]
if CONFIG['OS_ARCH'] == 'WINNT':
@ -25,8 +25,8 @@ if CONFIG['OS_ARCH'] == 'WINNT':
if CONFIG['MOZ_SANDBOX'] and CONFIG['OS_ARCH'] == 'WINNT':
# For sandbox includes and the include dependencies those have
LOCAL_INCLUDES += [
'/mozilla/security/sandbox/chromium',
'/mozilla/security/sandbox/chromium-shim',
'/platform/security/sandbox/chromium',
'/platform/security/sandbox/chromium-shim',
]
USE_LIBS += [

2
projects/mail/app/splash.rc

@ -17,7 +17,7 @@ IDI_APPLICATION ICON THUNDERBIRD_ICO
// For some reason IDI_MAILBIFF needs to be larger than the value of IDI_APPLICATION for static builds
#define IDI_MAILBIFF 32576
IDI_MAILBIFF ICON "../../../mozilla/mailnews/build/newmail.ico"
IDI_MAILBIFF ICON "../../../platform/mailnews/build/newmail.ico"
// Windows taskbar icons
#define IDI_WRITE_MESSAGE 32577

2
projects/mail/base/content/mailWindowOverlay.xul

@ -2935,7 +2935,7 @@
#ifdef XP_MACOSX
<!-- Mac window menu -->
#include ../../../../mozilla/toolkit/content/macWindowMenu.inc
#include ../../../../platform/toolkit/content/macWindowMenu.inc
#endif
<!-- Help -->

6
projects/mail/base/jar.mn

@ -115,14 +115,14 @@ messenger.jar:
content/messenger/sanitizeDialog.js (content/sanitizeDialog.js)
* content/messenger/toolbarIconColor.js (content/toolbarIconColor.js)
# the following files are mail-specific overrides
* content/messenger/license.html (/mozilla/toolkit/content/license.html)
* content/messenger/license.html (/platform/toolkit/content/license.html)
% override chrome://global/content/license.html chrome://messenger/content/license.html
comm.jar:
% content communicator %content/communicator/
content/communicator/charsetOverlay.xul (content/charsetOverlay.xul)
content/communicator/contentAreaClick.js (content/contentAreaClick.js)
content/communicator/labelsencodings.properties (/mozilla/dom/encoding/labelsencodings.properties)
content/communicator/labelsencodings.properties (/platform/dom/encoding/labelsencodings.properties)
* content/communicator/utilityOverlay.xul (content/utilityOverlay.xul)
* content/communicator/utilityOverlay.js (content/utilityOverlay.js)
@ -130,4 +130,4 @@ toolkit.jar:
% overlay chrome://global/content/customizeToolbar.xul chrome://messenger/content/customizeToolbarOverlay.xul
% overlay chrome://mozapps/content/downloads/downloads.xul chrome://messenger/content/downloadsOverlay.xul
% overlay chrome://mozapps/content/extensions/extensions.xul chrome://messenger/content/extensionsOverlay.xul
content/global/logopage.xhtml (/mozilla/toolkit/content/logopage.xhtml)
content/global/logopage.xhtml (/platform/toolkit/content/logopage.xhtml)

2
projects/mail/components/addrbook/content/addressbook.xul

@ -576,7 +576,7 @@
#ifdef XP_MACOSX
<!-- Mac window menu -->
#include ../../../../../mozilla/toolkit/content/macWindowMenu.inc
#include ../../../../../platform/toolkit/content/macWindowMenu.inc
#endif
<!-- Help -->

2
projects/mail/components/compose/content/messengercompose.xul

@ -711,7 +711,7 @@
#ifdef XP_MACOSX
<!-- Mac window menu -->
#include ../../../../../mozilla/toolkit/content/macWindowMenu.inc
#include ../../../../../platform/toolkit/content/macWindowMenu.inc
#endif
<!-- Help -->

26
projects/mail/components/smime/jar.mn

@ -14,16 +14,16 @@ messenger.jar:
content/messenger-smime/msgCompSMIMEOverlay.js (content/msgCompSMIMEOverlay.js)
content/messenger-smime/msgHdrViewSMIMEOverlay.js (content/msgHdrViewSMIMEOverlay.js)
content/messenger-smime/msgHdrViewSMIMEOverlay.xul (content/msgHdrViewSMIMEOverlay.xul)
content/messenger/am-smime.xul (/mozilla/mailnews/extensions/smime/content/am-smime.xul)
content/messenger/am-smime.js (/mozilla/mailnews/extensions/smime/content/am-smime.js)
content/messenger/am-smimeIdentityEditOverlay.xul (/mozilla/mailnews/extensions/smime/content/am-smimeIdentityEditOverlay.xul)
content/messenger/am-smimeOverlay.xul (/mozilla/mailnews/extensions/smime/content/am-smimeOverlay.xul)
content/messenger/certpicker.js (/mozilla/mailnews/extensions/smime/content/certpicker.js)
content/messenger/certpicker.xul (/mozilla/mailnews/extensions/smime/content/certpicker.xul)
content/messenger-smime/msgReadSMIMEOverlay.js (/mozilla/mailnews/extensions/smime/content/msgReadSMIMEOverlay.js)
content/messenger-smime/msgCompSecurityInfo.js (/mozilla/mailnews/extensions/smime/content/msgCompSecurityInfo.js)
content/messenger-smime/msgCompSecurityInfo.xul (/mozilla/mailnews/extensions/smime/content/msgCompSecurityInfo.xul)
content/messenger-smime/msgReadSecurityInfo.xul (/mozilla/mailnews/extensions/smime/content/msgReadSecurityInfo.xul)
content/messenger-smime/msgReadSecurityInfo.js (/mozilla/mailnews/extensions/smime/content/msgReadSecurityInfo.js)
content/messenger-smime/certFetchingStatus.xul (/mozilla/mailnews/extensions/smime/content/certFetchingStatus.xul)
content/messenger-smime/certFetchingStatus.js (/mozilla/mailnews/extensions/smime/content/certFetchingStatus.js)
content/messenger/am-smime.xul (/platform/mailnews/extensions/smime/content/am-smime.xul)
content/messenger/am-smime.js (/platform/mailnews/extensions/smime/content/am-smime.js)
content/messenger/am-smimeIdentityEditOverlay.xul (/platform/mailnews/extensions/smime/content/am-smimeIdentityEditOverlay.xul)
content/messenger/am-smimeOverlay.xul (/platform/mailnews/extensions/smime/content/am-smimeOverlay.xul)
content/messenger/certpicker.js (/platform/mailnews/extensions/smime/content/certpicker.js)
content/messenger/certpicker.xul (/platform/mailnews/extensions/smime/content/certpicker.xul)
content/messenger-smime/msgReadSMIMEOverlay.js (/platform/mailnews/extensions/smime/content/msgReadSMIMEOverlay.js)
content/messenger-smime/msgCompSecurityInfo.js (/platform/mailnews/extensions/smime/content/msgCompSecurityInfo.js)
content/messenger-smime/msgCompSecurityInfo.xul (/platform/mailnews/extensions/smime/content/msgCompSecurityInfo.xul)
content/messenger-smime/msgReadSecurityInfo.xul (/platform/mailnews/extensions/smime/content/msgReadSecurityInfo.xul)
content/messenger-smime/msgReadSecurityInfo.js (/platform/mailnews/extensions/smime/content/msgReadSecurityInfo.js)
content/messenger-smime/certFetchingStatus.xul (/platform/mailnews/extensions/smime/content/certFetchingStatus.xul)
content/messenger-smime/certFetchingStatus.js (/platform/mailnews/extensions/smime/content/certFetchingStatus.js)

2
projects/mail/components/steel/steelApplication.js

@ -30,7 +30,7 @@ var ApplicationFactory = {
}
};
#include ../../../../mozilla/toolkit/components/exthelper/extApplication.js
#include ../../../../platform/toolkit/components/exthelper/extApplication.js
function Application() {
Deprecated.warning("STEEL is deprecated, you should use AppConstants.jsm or Services.jsm.",

2
projects/mail/locales/Makefile.in

@ -55,7 +55,7 @@ DIST_SUBDIRS = $(DIST_SUBDIR)
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/mozilla/toolkit/locales/l10n.mk
include $(topsrcdir)/platform/toolkit/locales/l10n.mk
$(STAGEDIST): $(DIST)/branding

4
projects/mail/locales/l10n-aurora.ini

@ -11,8 +11,8 @@ dirs = mail
[includes]
# non-central apps might want to use %(topsrcdir)s here, or other vars
# RFE: that needs to be supported by compare-locales, too, though
toolkit = mozilla/toolkit/locales/l10n.ini
devtools_client = mozilla/devtools/client/locales/l10n.ini
toolkit = platform/toolkit/locales/l10n.ini
devtools_client = platform/devtools/client/locales/l10n.ini
[include_toolkit]
type = hg

4
projects/mail/locales/l10n-beta.ini

@ -11,8 +11,8 @@ dirs = mail
[includes]
# non-central apps might want to use %(topsrcdir)s here, or other vars
# RFE: that needs to be supported by compare-locales, too, though
toolkit = mozilla/toolkit/locales/l10n.ini
devtools_client = mozilla/devtools/client/locales/l10n.ini
toolkit = platform/toolkit/locales/l10n.ini
devtools_client = platform/devtools/client/locales/l10n.ini
[include_toolkit]
type = hg

4
projects/mail/locales/l10n-central.ini

@ -11,8 +11,8 @@ dirs = mail
[includes]
# non-central apps might want to use %(topsrcdir)s here, or other vars
# RFE: that needs to be supported by compare-locales, too, though
toolkit = mozilla/toolkit/locales/l10n.ini
devtools_client = mozilla/devtools/client/locales/l10n.ini
toolkit = platform/toolkit/locales/l10n.ini
devtools_client = platform/devtools/client/locales/l10n.ini
[include_toolkit]
type = hg

4
projects/mail/locales/l10n.ini

@ -12,5 +12,5 @@ dirs = mail
# include toolkit from mozilla.
# Don't specify which, use l10n-central.ini and friends if you're
# not working on a local check-out
toolkit = mozilla/toolkit/locales/l10n.ini
devtools_client = mozilla/devtools/client/locales/l10n.ini
toolkit = platform/toolkit/locales/l10n.ini
devtools_client = platform/devtools/client/locales/l10n.ini

2
projects/mail/moz.configure vendored

@ -4,4 +4,4 @@
# 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('../../mozilla/toolkit/moz.configure')
include('../../platform/toolkit/moz.configure')

6
projects/navigator/app/moz.build

@ -11,9 +11,9 @@ SOURCES += ['nsNavigatorApp.cpp']
LOCAL_INCLUDES += [
'!/build',
'/mozilla/toolkit/xre',
'/mozilla/xpcom/base',
'/mozilla/xpcom/build',
'/platform/toolkit/xre',
'/platform/xpcom/base',
'/platform/xpcom/build',
]
if CONFIG['OS_ARCH'] == 'WINNT':

2
projects/navigator/base/jar.mn

@ -50,7 +50,7 @@ navigator.jar:
# XXXTobin: Logopage is busted
#toolkit.jar:
# content/global/logopage.xhtml (/mozilla/toolkit/content/logopage.xhtml)
# content/global/logopage.xhtml (/platform/toolkit/content/logopage.xhtml)
en-US.jar:
% locale communicator en-US %locale/en-US/communicator/

4
projects/navigator/communicator/jar.mn

@ -151,10 +151,10 @@ comm.jar:
content/communicator/search/search-panel.js (content/search/search-panel.js)
content/communicator/search/search-panel.xul (content/search/search-panel.xul)
content/communicator/labelsencodings.properties (/mozilla/dom/encoding/labelsencodings.properties)
content/communicator/labelsencodings.properties (/platform/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 (/mozilla/toolkit/content/license.html)
* content/communicator/license.html (/platform/toolkit/content/license.html)
#ifdef XP_MACOSX
content/communicator/platformCommunicatorOverlay.xul (content/platform/mac/platformCommunicatorOverlay.xul)

2
projects/navigator/components/smile/src/smileApplication.js

@ -727,7 +727,7 @@ var ApplicationFactory = {
}
};
#include ../../../../../mozilla/toolkit/components/exthelper/extApplication.js
#include ../../../../../platform/toolkit/components/exthelper/extApplication.js
//=================================================
// Application constructor

2
projects/navigator/moz.configure vendored

@ -4,4 +4,4 @@
# 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('../../mozilla/toolkit/moz.configure')
include('../../platform/toolkit/moz.configure')

10
projects/navigator/themes/modern/jar.mn

@ -269,7 +269,7 @@ modern.jar:
skin/modern/global/filepicker/folder-home.gif (global/filepicker/folder-home.gif)
skin/modern/global/filepicker/folder-new.gif (global/filepicker/folder-new.gif)
skin/modern/global/icons/authentication-48.png (global/icons/authentication-48.png)
skin/modern/global/icons/autoscroll.png (/mozilla/toolkit/themes/windows/global/icons/autoscroll.png)
skin/modern/global/icons/autoscroll.png (/platform/toolkit/themes/windows/global/icons/autoscroll.png)
skin/modern/global/icons/blacklist_favicon.png (global/icons/blacklist_favicon.png)
skin/modern/global/icons/blacklist_large.png (global/icons/blacklist_large.png)
skin/modern/global/icons/close-act.gif (global/icons/close-act.gif)
@ -309,20 +309,20 @@ modern.jar:
skin/modern/global/icons/warning-64.png (global/icons/warning-64.png)
skin/modern/global/icons/wrap.png (global/icons/wrap.png)
skin/modern/global/media/checkerboard.png (global/media/checkerboard.png)
skin/modern/global/media/clicktoplay-bgtexture.png (/mozilla/toolkit/themes/shared/media/clicktoplay-bgtexture.png)
skin/modern/global/media/error.png (/mozilla/toolkit/themes/shared/media/error.png)
skin/modern/global/media/clicktoplay-bgtexture.png (/platform/toolkit/themes/shared/media/clicktoplay-bgtexture.png)
skin/modern/global/media/error.png (/platform/toolkit/themes/shared/media/error.png)
skin/modern/global/media/muteButton.png (global/media/muteButton.png)
skin/modern/global/media/pauseButton.png (global/media/pauseButton.png)
skin/modern/global/media/playButton.png (global/media/playButton.png)
skin/modern/global/media/scrubberThumb.png (global/media/scrubberThumb.png)
skin/modern/global/media/scrubberThumbWide.png (global/media/scrubberThumbWide.png)
skin/modern/global/media/throbber.png (/mozilla/toolkit/themes/shared/media/throbber.png)
skin/modern/global/media/throbber.png (/platform/toolkit/themes/shared/media/throbber.png)
skin/modern/global/media/stalled.png (global/media/stalled.png)
skin/modern/global/media/TopLevelImageDocument.css (global/media/TopLevelImageDocument.css)
skin/modern/global/media/TopLevelVideoDocument.css (global/media/TopLevelVideoDocument.css)
skin/modern/global/media/unmuteButton.png (global/media/unmuteButton.png)
skin/modern/global/media/videocontrols.css (global/media/videocontrols.css)
skin/modern/global/media/videoClickToPlayButton.svg (/mozilla/toolkit/themes/shared/media/videoClickToPlayButton.svg)
skin/modern/global/media/videoClickToPlayButton.svg (/platform/toolkit/themes/shared/media/videoClickToPlayButton.svg)
skin/modern/global/menu/menu-arrow-dis.gif (global/menu/menu-arrow-dis.gif)
skin/modern/global/menu/menu-arrow-hov.gif (global/menu/menu-arrow-hov.gif)
skin/modern/global/menu/menu-arrow.gif (global/menu/menu-arrow.gif)

Loading…
Cancel
Save