Make Basilisk build in a comm configuration

16 files changed, 53 insertions, 54 deletions

diff --git a/basilisk/app.mozbuild b/basilisk/app.mozbuild
index a6c2693..747b0b4 100644
--- a/basilisk/app.mozbuild
+++ b/basilisk/app.mozbuild
@@ -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('/toolkit/toolkit.mozbuild')
+include('/platform/toolkit/toolkit.mozbuild')
 
 if CONFIG['MOZ_EXTENSIONS']:
     DIRS += ['/extensions']
@@ -12,4 +12,4 @@ DIRS += ['/%s' % CONFIG['MOZ_BRANDING_DIRECTORY']]
 
 # Never add dirs after the browser root because they apparently won't
 # get packaged properly on Mac.
-DIRS += ['/application/basilisk']
+DIRS += ['/basilisk']
diff --git a/basilisk/app/moz.build b/basilisk/app/moz.build
index 72f34d5..ce54ddd 100644
--- a/basilisk/app/moz.build
+++ b/basilisk/app/moz.build
@@ -24,9 +24,9 @@ DEFINES['APP_VERSION'] = CONFIG['MOZ_APP_VERSION']
 
 LOCAL_INCLUDES += [
     '!/build',
-    '/toolkit/xre',
-    '/xpcom/base',
-    '/xpcom/build',
+    '/platform/toolkit/xre',
+    '/platform/xpcom/base',
+    '/platform/xpcom/build',
 ]
 
 USE_LIBS += [
diff --git a/basilisk/base/content/baseMenuOverlay.xul b/basilisk/base/content/baseMenuOverlay.xul
index dce35e9..def549b 100644
--- a/basilisk/base/content/baseMenuOverlay.xul
+++ b/basilisk/base/content/baseMenuOverlay.xul
@@ -29,7 +29,7 @@
         <menuitem id="menu_mac_show_all" label="&showAllAppsCmdMac.label;"/>
     </menupopup>
 <!-- Mac window menu -->
-#include ../../../../toolkit/content/macWindowMenu.inc
+#include ../../../platform/toolkit/content/macWindowMenu.inc
 #endif
 
 #ifdef XP_WIN
diff --git a/basilisk/base/jar.mn b/basilisk/base/jar.mn
index f546ec4..10a9154 100644
--- a/basilisk/base/jar.mn
+++ b/basilisk/base/jar.mn
@@ -153,7 +153,7 @@ browser.jar:
         content/browser/webrtcIndicator.js            (content/webrtcIndicator.js)
 #endif
 # the following files are browser-specific overrides
-*       content/browser/license.html                  (/toolkit/content/license.html)
+*       content/browser/license.html                  (/platform/toolkit/content/license.html)
 % override chrome://global/content/license.html chrome://browser/content/license.html
 #ifdef MOZ_SAFE_BROWSING
         content/browser/report-phishing-overlay.xul     (content/report-phishing-overlay.xul)
diff --git a/basilisk/build.mk b/basilisk/build.mk
index 10fe02d..1031e5a 100644
--- a/basilisk/build.mk
+++ b/basilisk/build.mk
@@ -3,49 +3,49 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 installer:
-	@$(MAKE) -C application/basilisk/installer installer
+	@$(MAKE) -C basilisk/installer installer
 
 package:
-	@$(MAKE) -C application/basilisk/installer make-archive
+	@$(MAKE) -C basilisk/installer make-archive
 
 l10n-package:
-	@$(MAKE) -C application/basilisk/installer make-langpack
+	@$(MAKE) -C basilisk/installer make-langpack
 
 mozpackage:
-	@$(MAKE) -C application/basilisk/installer
+	@$(MAKE) -C basilisk/installer
 
 package-compare:
-	@$(MAKE) -C application/basilisk/installer package-compare
+	@$(MAKE) -C basilisk/installer package-compare
 
 stage-package:
-	@$(MAKE) -C application/basilisk/installer stage-package make-buildinfo-file
+	@$(MAKE) -C basilisk/installer stage-package make-buildinfo-file
 
 sdk:
-	@$(MAKE) -C application/basilisk/installer make-sdk
+	@$(MAKE) -C basilisk/installer make-sdk
 
 install::
-	@$(MAKE) -C application/basilisk/installer install
+	@$(MAKE) -C basilisk/installer install
 
 clean::
-	@$(MAKE) -C application/basilisk/installer clean
+	@$(MAKE) -C basilisk/installer clean
 
 distclean::
-	@$(MAKE) -C application/basilisk/installer distclean
+	@$(MAKE) -C basilisk/installer distclean
 
 source-package::
-	@$(MAKE) -C application/basilisk/installer source-package
+	@$(MAKE) -C basilisk/installer source-package
 
 upload::
-	@$(MAKE) -C application/basilisk/installer upload
+	@$(MAKE) -C basilisk/installer upload
 
 source-upload::
-	@$(MAKE) -C application/basilisk/installer source-upload
+	@$(MAKE) -C basilisk/installer source-upload
 
 hg-bundle::
-	@$(MAKE) -C application/basilisk/installer hg-bundle
+	@$(MAKE) -C basilisk/installer hg-bundle
 
 l10n-check::
-	@$(MAKE) -C application/basilisk/locales l10n-check
+	@$(MAKE) -C basilisk/locales l10n-check
 
 ifdef ENABLE_TESTS
 # Implemented in testing/testsuite-targets.mk
diff --git a/basilisk/confvars.sh b/basilisk/confvars.sh
index 2df7e82..9b4138d 100644
--- a/basilisk/confvars.sh
+++ b/basilisk/confvars.sh
@@ -35,8 +35,8 @@ MOZ_EXTENSIONS_DEFAULT=" gio"
 # MOZ_APP_DISPLAYNAME will be set by branding/configure.sh
 # MOZ_BRANDING_DIRECTORY is the default branding directory used when none is
 # specified. It should never point to the "official" branding directory.
-MOZ_BRANDING_DIRECTORY=$MOZ_BUILD_APP/branding/unofficial
-MOZ_OFFICIAL_BRANDING_DIRECTORY=$MOZ_BUILD_APP/branding/official
+MOZ_BRANDING_DIRECTORY=basilisk/branding/unofficial
+MOZ_OFFICIAL_BRANDING_DIRECTORY=basilisk/branding/official
 MOZ_APP_ID={ec8030f7-c20a-464f-9b0e-13a3a9e97384}
 # 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
diff --git a/basilisk/installer/Makefile.in b/basilisk/installer/Makefile.in
index ddd1c71..29dcf72 100644
--- a/basilisk/installer/Makefile.in
+++ b/basilisk/installer/Makefile.in
@@ -94,8 +94,8 @@ endif
 
 INSTALL_SDK = 1
 
-include $(topsrcdir)/toolkit/mozapps/installer/signing.mk
-include $(topsrcdir)/toolkit/mozapps/installer/packager-uxp.mk
+include $(MOZILLA_SRCDIR)/toolkit/mozapps/installer/signing.mk
+include $(MOZILLA_SRCDIR)/toolkit/mozapps/installer/packager-uxp.mk
 
 ifeq (bundle, $(MOZ_FS_LAYOUT))
 BINPATH = $(_BINPATH)
@@ -149,7 +149,7 @@ endif
 # fail to produce a langpack. See bug 1255096.
 make-langpack:
 ifeq (,$(filter FasterMake+RecursiveMake,$(BUILD_BACKENDS)))
-	$(MAKE) -C $(DEPTH)/application/basilisk/locales langpack
+	$(MAKE) -C $(DEPTH)/basilisk/locales langpack
 else
 	@echo WARNING: "Language Pack was not generated due to using the hybrid FasterMake/RecursiveMake backend." >&2
 endif
diff --git a/basilisk/installer/windows/Makefile.in b/basilisk/installer/windows/Makefile.in
index 5326ab8..799542f 100644
--- a/basilisk/installer/windows/Makefile.in
+++ b/basilisk/installer/windows/Makefile.in
@@ -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/.
 
-include $(topsrcdir)/toolkit/mozapps/installer/package-name.mk
+include $(MOZILLA_SRCDIR)/toolkit/mozapps/installer/package-name.mk
 
 CONFIG_DIR = instgen
-SFX_MODULE = $(topsrcdir)/other-licenses/7zstub/uxp/7zSD.sfx
+SFX_MODULE = $(MOZILLA_SRCDIR)/other-licenses/7zstub/uxp/7zSD.sfx
 
 INSTALLER_FILES = \
 	app.tag \
@@ -26,12 +26,12 @@ include $(topsrcdir)/config/config.mk
 
 ifdef LOCALE_MERGEDIR
 PPL_LOCALE_ARGS = \
-  --l10n-dir=$(LOCALE_MERGEDIR)/application/basilisk/installer \
-  --l10n-dir=$(call EXPAND_LOCALE_SRCDIR,application/basilisk/locales)/installer \
-  --l10n-dir=$(topsrcdir)/application/basilisk/locales/en-US/installer \
+  --l10n-dir=$(LOCALE_MERGEDIR)/basilisk/installer \
+  --l10n-dir=$(call EXPAND_LOCALE_SRCDIR,basilisk/locales)/installer \
+  --l10n-dir=$(topsrcdir)/basilisk/locales/en-US/installer \
   $(NULL)
 else
-PPL_LOCALE_ARGS=$(call EXPAND_LOCALE_SRCDIR,application/basilisk/locales)/installer
+PPL_LOCALE_ARGS=$(call EXPAND_LOCALE_SRCDIR,basilisk/locales)/installer
 endif
 
 OVERRIDE_DEFAULT_GOAL := installer
@@ -48,8 +48,8 @@ uninstaller::
 	$(INSTALL) $(addprefix $(DIST)/branding/,$(BRANDING_FILES)) $(CONFIG_DIR)
 	$(call py_action,preprocessor,-Fsubstitution $(DEFINES) $(ACDEFINES) \
 	  $(srcdir)/nsis/defines.nsi.in -o $(CONFIG_DIR)/defines.nsi)
-	$(PYTHON) $(topsrcdir)/toolkit/mozapps/installer/windows/nsis/preprocess-locale.py \
-	  --preprocess-locale $(topsrcdir) \
+	$(PYTHON) $(MOZILLA_SRCDIR)/toolkit/mozapps/installer/windows/nsis/preprocess-locale.py \
+	  --preprocess-locale $(MOZILLA_SRCDIR) \
 	  $(PPL_LOCALE_ARGS) $(AB_CD) $(CONFIG_DIR)
 
 # For building the maintenanceservice installer
@@ -58,8 +58,8 @@ maintenanceservice_installer::
 	$(INSTALL) $(addprefix $(srcdir)/,$(INSTALLER_FILES)) $(CONFIG_DIR)
 	$(call py_action,preprocessor,-Fsubstitution $(DEFINES) $(ACDEFINES) \
 	  $(srcdir)/nsis/defines.nsi.in -o $(CONFIG_DIR)/defines.nsi)
-	$(PYTHON) $(topsrcdir)/toolkit/mozapps/installer/windows/nsis/preprocess-locale.py \
-	  --preprocess-locale $(topsrcdir) \
+	$(PYTHON) $(MOZILLA_SRCDIR)/toolkit/mozapps/installer/windows/nsis/preprocess-locale.py \
+	  --preprocess-locale $(MOZILLA_SRCDIR) \
 	  $(PPL_LOCALE_ARGS) $(AB_CD) $(CONFIG_DIR)
 endif
 
@@ -70,11 +70,11 @@ $(CONFIG_DIR)/setup.exe::
 	$(INSTALL) $(addprefix $(DIST)/branding/,$(BRANDING_FILES)) $(CONFIG_DIR)
 	$(call py_action,preprocessor,-Fsubstitution $(DEFINES) $(ACDEFINES) \
 	  $(srcdir)/nsis/defines.nsi.in -o $(CONFIG_DIR)/defines.nsi)
-	$(PYTHON) $(topsrcdir)/toolkit/mozapps/installer/windows/nsis/preprocess-locale.py \
-	  --preprocess-locale $(topsrcdir) \
+	$(PYTHON) $(MOZILLA_SRCDIR)/toolkit/mozapps/installer/windows/nsis/preprocess-locale.py \
+	  --preprocess-locale $(MOZILLA_SRCDIR) \
 	  $(PPL_LOCALE_ARGS) $(AB_CD) $(CONFIG_DIR)
 
 GARBARGE_DIRS += instgen
 
 include $(topsrcdir)/config/rules.mk
-include $(topsrcdir)/toolkit/mozapps/installer/windows/nsis/makensis.mk
+include $(MOZILLA_SRCDIR)/toolkit/mozapps/installer/windows/nsis/makensis.mk
diff --git a/basilisk/locales/Makefile.in b/basilisk/locales/Makefile.in
index 0d8b1d8..8da6b30 100644
--- a/basilisk/locales/Makefile.in
+++ b/basilisk/locales/Makefile.in
@@ -81,7 +81,7 @@ DIST_SUBDIRS = $(DIST_SUBDIR)
 
 include $(topsrcdir)/config/rules.mk
 
-include $(topsrcdir)/toolkit/locales/l10n.mk
+include $(MOZILLA_SRCDIR)/toolkit/locales/l10n.mk
 
 $(list-json): $(call mkdir_deps,$(SEARCHPLUGINS_PATH)) $(if $(IS_LANGUAGE_REPACK),FORCE)
 	$(call py_action,generate_searchjson,$(srcdir)/search/list.json $(AB_CD) $(list-json))
@@ -101,7 +101,6 @@ ifdef MOZ_SERVICES_SYNC
 	@$(MAKE) -C $(DEPTH)/services/sync/locales AB_CD=$* XPI_NAME=locale-$*
 endif
 	@$(MAKE) -C $(DEPTH)/extensions/spellcheck/locales AB_CD=$* XPI_NAME=locale-$*
-# 	@$(MAKE) -C ../extensions/pocket/locale AB_CD=$* XPI_NAME=locale-$*
 	@$(MAKE) -C $(DEPTH)/intl/locales AB_CD=$* XPI_NAME=locale-$*
 	@$(MAKE) -C $(DEPTH)/devtools/client/locales AB_CD=$* XPI_NAME=locale-$* XPI_ROOT_APPID='$(XPI_ROOT_APPID)'
 	@$(MAKE) -B searchplugins AB_CD=$* XPI_NAME=locale-$*
@@ -193,5 +192,5 @@ l10n-check::
 	@# 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= UNIVERSAL_BINARY=
-	$(PYTHON) $(topsrcdir)/toolkit/mozapps/installer/unpack.py $(DIST)/l10n-stage/$(MOZ_PKG_DIR)$(_RESPATH)
+	$(PYTHON) $(MOZILLA_SRCDIR)/toolkit/mozapps/installer/unpack.py $(DIST)/l10n-stage/$(MOZ_PKG_DIR)$(_RESPATH)
 	cd $(DIST)/l10n-stage && test $$(cat $(MOZ_PKG_DIR)$(_RESPATH)/update.locale) = x-test
diff --git a/basilisk/moz.configure b/basilisk/moz.configure
index 7223625..bd82877 100644
--- a/basilisk/moz.configure
+++ b/basilisk/moz.configure
@@ -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('../../toolkit/moz.configure')
+include('../platform/toolkit/moz.configure')
diff --git a/basilisk/themes/linux/browser.css b/basilisk/themes/linux/browser.css
index fbc5b65..0ea2860 100644
--- a/basilisk/themes/linux/browser.css
+++ b/basilisk/themes/linux/browser.css
@@ -1386,8 +1386,8 @@ toolbarbutton.chevron > .toolbarbutton-icon {
 
 %include ../shared/fullscreen/warning.inc.css
 %include ../shared/ctrlTab.inc.css
-%include ../../../../devtools/client/themes/responsivedesign.inc.css
-%include ../../../../devtools/client/themes/commandline.inc.css
+%include ../../../platform/devtools/client/themes/responsivedesign.inc.css
+%include ../../../platform/devtools/client/themes/commandline.inc.css
 %include ../shared/plugin-doorhanger.inc.css
 
 notification.pluginVulnerable > .notification-inner > .messageCloseButton:not(:hover) {
diff --git a/basilisk/themes/osx/browser.css b/basilisk/themes/osx/browser.css
index 70f1f61..375a755 100644
--- a/basilisk/themes/osx/browser.css
+++ b/basilisk/themes/osx/browser.css
@@ -2958,8 +2958,8 @@ toolbarbutton.chevron > .toolbarbutton-menu-dropmarker {
 
 %include ../shared/fullscreen/warning.inc.css
 %include ../shared/ctrlTab.inc.css
-%include ../../../../devtools/client/themes/responsivedesign.inc.css
-%include ../../../../devtools/client/themes/commandline.inc.css
+%include ../../../platform/devtools/client/themes/responsivedesign.inc.css
+%include ../../../platform/devtools/client/themes/commandline.inc.css
 %include ../shared/plugin-doorhanger.inc.css
 
 %include downloads/indicator.css
diff --git a/basilisk/themes/osx/preferences/preferences.css b/basilisk/themes/osx/preferences/preferences.css
index a8dcadc..d76e904 100644
--- a/basilisk/themes/osx/preferences/preferences.css
+++ b/basilisk/themes/osx/preferences/preferences.css
@@ -5,7 +5,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 */
 
-%include ../../../../../toolkit/themes/osx/global/shared.inc
+%include ../../../../platform/toolkit/themes/osx/global/shared.inc
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 @namespace html url("http://www.w3.org/1999/xhtml");
diff --git a/basilisk/themes/osx/shared.inc b/basilisk/themes/osx/shared.inc
index 3076450..c15933d 100644
--- a/basilisk/themes/osx/shared.inc
+++ b/basilisk/themes/osx/shared.inc
@@ -1,4 +1,4 @@
-%include ../../../../toolkit/themes/osx/global/shared.inc

+%include ../../../platform/toolkit/themes/osx/global/shared.inc

 %include ../shared/browser.inc

 

 %filter substitution

diff --git a/basilisk/themes/tab-svgs.mozbuild b/basilisk/themes/tab-svgs.mozbuild
index 5601ac8..e0fe091 100644
--- a/basilisk/themes/tab-svgs.mozbuild
+++ b/basilisk/themes/tab-svgs.mozbuild
@@ -4,8 +4,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/.
 
-script = '/application/basilisk/themes/preprocess-tab-svgs.py'
-input = ['/application/basilisk/themes/shared/tab-selected.svg']
+script = '/basilisk/themes/preprocess-tab-svgs.py'
+input = ['/basilisk/themes/shared/tab-selected.svg']
 
 # Context variables can't be used inside functions, so hack around that.
 generated_files = GENERATED_FILES
diff --git a/basilisk/themes/windows/browser.css b/basilisk/themes/windows/browser.css
index 9a96552..a0043b2 100644
--- a/basilisk/themes/windows/browser.css
+++ b/basilisk/themes/windows/browser.css
@@ -2170,8 +2170,8 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] {
 
 %include ../shared/fullscreen/warning.inc.css
 %include ../shared/ctrlTab.inc.css
-%include ../../../../devtools/client/themes/responsivedesign.inc.css
-%include ../../../../devtools/client/themes/commandline.inc.css
+%include ../../../platform/devtools/client/themes/responsivedesign.inc.css
+%include ../../../platform/devtools/client/themes/commandline.inc.css
 %include ../shared/plugin-doorhanger.inc.css
 
 notification.pluginVulnerable > .notification-inner > .messageCloseButton {