Bug 1481067 - Remove option to build comm-central as topsourcedir from suite. r=IanN a=IanN

suite/Makefile.in

@@ -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

suite/app.mozbuild

@@ -5,7 +5,7 @@
 
 GENERATED_FILES['source-repo.h'].script = 'comm/build/source_repos.py:source_repo_header'
 
-include('/%s/mailnews/mailnews.mozbuild' % CONFIG['commreltopsrcdir'])
+include('/comm/mailnews/mailnews.mozbuild')
 
 include('/toolkit/toolkit.mozbuild')
 
@@ -19,17 +19,17 @@ if CONFIG['MOZ_DOMINSPECTOR']:
     DIRS += ['/extensions/inspector']
 
 if CONFIG['MOZ_COMPOSER']:
-    DIRS += ['/%s/editor/ui' % CONFIG['commreltopsrcdir']]
+    DIRS += ['/comm/editor/ui']
 
 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 += [
     '/xpfe/components/autocomplete',
-    '/%s/suite' % CONFIG['commreltopsrcdir'],
+    '/comm/suite',
 ]

suite/app/Makefile.in

@@ -6,7 +6,7 @@ dist_dest   = $(DIST)/$(MOZ_MACBUNDLE_NAME)
 
 AB_CD = $(MOZ_UI_LOCALE)
 
-LICENSE_TXT_FILE = $(commtopsrcdir)/suite/installer/license.txt
+LICENSE_TXT_FILE = $(topsrcdir)/comm/suite/installer/license.txt
 
 # Build a binary bootstrapping with XRE_main
 
@@ -22,7 +22,7 @@ endif
 # shouldn't get 755 perms need $(IFLAGS1) for either way of calling nsinstall.
 NSDISTMODE = copy
 
-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,7 +39,7 @@ ifeq ($(OS_ARCH),WINNT)
 EXTRA_DEPS += seamonkey.exe.manifest
 endif
 
-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)/profile/channel-prefs.js

suite/app/moz.build

@@ -9,10 +9,10 @@ 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':
@@ -22,7 +22,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['CC_TYPE'] in ('msvc', 'clang-cl'):
@@ -33,8 +33,8 @@ if CONFIG['CC_TYPE'] in ('msvc', 'clang-cl'):
 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 += [

suite/base/jar.mn

@@ -77,9 +77,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)

suite/base/moz.build

@@ -13,7 +13,7 @@ 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]
 
 # For customized buildconfig

suite/build.mk

@@ -2,34 +2,33 @@
 # 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
 distribution:
-	$(MAKE) -j1 -C $(commtopobjdir)/suite/locales $@
+	$(MAKE) -j1 -C comm/suite/locales $@
 
 # 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
@@ -44,4 +43,3 @@ mochitest:: mochitest-browser-chrome
 
 .PHONY: mochitest-browser-chrome
 endif
-endif

suite/components/build/Makefile.in

@@ -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 =

suite/components/shell/moz.build

@@ -24,7 +24,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',
     ]
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
     SOURCES += ['nsMacShellService.cpp']

suite/confvars.sh

@@ -11,8 +11,8 @@ MOZ_APP_NAME=seamonkey
 MOZ_APP_DISPLAYNAME=SeaMonkey
 MOZ_COMPOSER=1
 MOZ_SUITE=1
-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.
@@ -21,7 +21,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`

suite/installer/Makefile.in

@@ -4,7 +4,7 @@
 
 STANDALONE_MAKEFILE := 1
 
-include $(moztopsrcdir)/config/rules.mk
+include $(topsrcdir)/config/rules.mk
 
 MOZ_PKG_REMOVALS = $(srcdir)/removed-files.in
 
@@ -17,7 +17,7 @@ endif
 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 = \
@@ -143,7 +143,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)
@@ -183,7 +183,7 @@ DEFINES += -DMOZ_CLANG_RT_ASAN_LIB=$(notdir $(MOZ_CLANG_RT_ASAN_LIB_PATH))
 endif
 
 libs::
-	$(MAKE) -C $(commtopobjdir)/suite/locales langpack
+	$(MAKE) -C $(topobjdir)/comm/suite/locales langpack
 
 ifeq (WINNT,$(OS_ARCH))
 PKGCOMP_FIND_OPTS =

suite/installer/windows/Makefile.in

@@ -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 \
@@ -34,7 +34,7 @@ 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 $(topsrcdir)/config/rules.mk
-include $(moztopsrcdir)/toolkit/mozapps/installer/windows/nsis/makensis.mk
+include $(topsrcdir)/toolkit/mozapps/installer/windows/nsis/makensis.mk

suite/locales/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/.
 
-LOCALE_TOPDIR=$(commtopsrcdir)
+LOCALE_TOPDIR=$(topsrcdir)/comm
 LOCALE_RELATIVEDIR=suite/locales
 
-include $(moztopsrcdir)/config/config.mk
+include $(topsrcdir)/config/config.mk
 
 SUBMAKEFILES += \
 	$(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/Makefile \
@@ -35,7 +35,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 \
@@ -64,13 +64,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-json): $(call mkdir_deps,$(SEARCHPLUGINS_PATH)) $(if $(IS_LANGUAGE_REPACK),FORCE)
 	$(call py_action,generate_searchjson,$(srcdir)/search/list.json $(AB_CD) $(list-json))
@@ -190,13 +188,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

suite/moz.build

@@ -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 += [

suite/themes/modern/moz.build

@@ -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',