Bug 1817633 - Clean up SeaMonkey build files. r=frg

Port Bug 1816266 "comm/mail/moz.configure cleanup".

suite/app.mozbuild

@@ -3,11 +3,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('/comm/mailnews/mailnews.mozbuild')
-
 include('/toolkit/toolkit.mozbuild')
 
 DIRS += [
+    '/comm/mailnews',
     '/%s' % CONFIG['MOZ_BRANDING_DIRECTORY'],
     '/comm/calendar',
     '/comm/suite',

suite/branding/seamonkey/locales/Makefile.in

@@ -5,4 +5,4 @@
 LOCALE_TOPDIR=$(commtopsrcdir)
 LOCALE_RELATIVEDIR=suite/branding/seamonkey/locales
 
-include $(moztopsrcdir)/config/config.mk
+include $(topsrcdir)/config/config.mk

suite/mailnews/components/addrbook/moz.build

@@ -5,4 +5,4 @@
 
 JAR_MANIFESTS += ["jar.mn"]
 
-DEFINES["TOOLKIT_DIR"] = "%s/toolkit" % (CONFIG["moztopsrcdir"],)
+DEFINES["TOOLKIT_DIR"] = "%s/toolkit" % (CONFIG["topsrcdir"],)

suite/moz.configure

@@ -22,23 +22,10 @@ add_old_configure_assignment("MOZ_BUNDLED_FONTS", bundled_fonts)
 
 
 @depends(build_environment, "--help")
-def comm_paths(build_env, _):
+@imports(_from="os.path", _import="join")
+def commtopsrcdir(build_env, _):
     topsrcdir = build_env.topsrcdir
-    topobjdir = build_env.topobjdir
-
-    moztopsrcdir = topsrcdir
-    commtopsrcdir = "%s/comm" % topsrcdir
-    mozreltopsrcdir = "."
-    commreltopsrcdir = "comm"
-    commtopobjdir = "%s/comm" % topobjdir
-
-    return namespace(
-        moztopsrcdir=moztopsrcdir,
-        commtopsrcdir=commtopsrcdir,
-        mozreltopsrcdir=mozreltopsrcdir,
-        commreltopsrcdir=commreltopsrcdir,
-        commtopobjdir=commtopobjdir,
-    )
+    return join(topsrcdir, "comm")
 
 
 @template
@@ -48,11 +35,8 @@ def set_defconf(k, v):
     add_old_configure_assignment(k, v)
 
 
-set_defconf("moztopsrcdir", comm_paths.moztopsrcdir)
-set_defconf("commtopsrcdir", comm_paths.commtopsrcdir)
-set_defconf("mozreltopsrcdir", comm_paths.mozreltopsrcdir)
-set_defconf("commreltopsrcdir", comm_paths.commreltopsrcdir)
-set_defconf("commtopobjdir", comm_paths.commtopobjdir)
+add_old_configure_assignment("commtopsrcdir", commtopsrcdir)
+set_config("commtopsrcdir", commtopsrcdir)
 
 
 @depends(build_environment, application)
@@ -87,32 +71,6 @@ set_defconf("SEAMONKEY_VERSION_DISPLAY", seamonkey_version.version_display)
 # set_defconf("MOZ_PKG_VERSION", seamonkey_version.version_package)
 
 
-@depends(build_environment)
-@imports(_from="os.path", _import="exists")
-@imports(_from="__builtin__", _import="open")
-def thunderbird_version(build_env):
-    version_file = os.path.join(
-        build_env.topsrcdir, "comm/mail", "config", "version.txt"
-    )
-    version_file_display = os.path.join(
-        build_env.topsrcdir, "comm/mail", "config", "version_display.txt"
-    )
-    rv = []
-    for f in [version_file, version_file_display]:
-        if exists(f):
-            f_value = open(f).read().strip()
-        else:
-            f_value = "unknown"
-        rv.append(f_value)
-
-    return namespace(version=rv[0], version_display=rv[1])
-
-
-set_defconf("THUNDERBIRD_VERSION", thunderbird_version.version)
-set_defconf("THUNDERBIRD_VERSION_DISPLAY", thunderbird_version.version_display)
-
-set_define("MOZ_SEPARATE_MANIFEST_FOR_THEME_OVERRIDES", True)
-
 imply_option("MOZ_PLACES", True)
 imply_option("MOZ_SERVICES_SYNC", False)