|
|
@@ -1,105 +0,0 @@
|
|
|
-# HG changeset patch
|
|
|
-# User Frank-Rainer Grahl <frgrahl@gmx.net>
|
|
|
-# Date 1653596573 -7200
|
|
|
-# Parent 77aefd9efc5573a56a7c5cbd5a9b3650c027dcf8
|
|
|
-Bug 1772807 - Include source information for comm and mozilla repos. r=IanN
|
|
|
-
|
|
|
-diff --git a/suite/confvars.sh b/suite/confvars.sh
|
|
|
---- a/suite/confvars.sh
|
|
|
-+++ b/suite/confvars.sh
|
|
|
-@@ -1,16 +1,21 @@
|
|
|
- #! /bin/sh
|
|
|
- # This Source Code Form is subject to the terms of the Mozilla Public
|
|
|
- # 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/.
|
|
|
-
|
|
|
- MOZ_APP_VENDOR=Mozilla
|
|
|
- MOZ_APP_NAME=seamonkey
|
|
|
- MOZ_APP_DISPLAYNAME=SeaMonkey
|
|
|
-+
|
|
|
-+MOZ_APP_VERSION=$SEAMONKEY_VERSION
|
|
|
-+MOZ_APP_VERSION_DISPLAY=$SEAMONKEY_VERSION_DISPLAY
|
|
|
-+# MOZ_PKG_VERSION=$SEAMONKEY_VERSION_PACKAGE
|
|
|
-+
|
|
|
- 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
|
|
|
- # of values.
|
|
|
- ACCEPTED_MAR_CHANNEL_IDS=seamonkey-comm-central
|
|
|
- # The MAR_CHANNEL_ID must not contain the following 3 characters: ",\t "
|
|
|
-diff --git a/suite/moz.configure b/suite/moz.configure
|
|
|
---- a/suite/moz.configure
|
|
|
-+++ b/suite/moz.configure
|
|
|
-@@ -60,29 +60,36 @@ set_defconf("commtopobjdir", comm_paths.
|
|
|
- @imports(_from="__builtin__", _import="open")
|
|
|
- def seamonkey_version(build_env, app_path):
|
|
|
- version_file = os.path.join(
|
|
|
- build_env.topsrcdir, app_path[0], "config", "version.txt"
|
|
|
- )
|
|
|
- version_file_display = os.path.join(
|
|
|
- build_env.topsrcdir, app_path[0], "config", "version_display.txt"
|
|
|
- )
|
|
|
-+ version_file_package = os.path.join(
|
|
|
-+ build_env.topsrcdir, app_path[0], "config", "version_package.txt"
|
|
|
-+ )
|
|
|
- rv = []
|
|
|
-- for f in [version_file, version_file_display]:
|
|
|
-+ for f in [version_file, version_file_display, version_file_package]:
|
|
|
- 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])
|
|
|
-+ return namespace(version=rv[0],
|
|
|
-+ version_display=rv[1],
|
|
|
-+ version_package=rv[2])
|
|
|
-
|
|
|
-
|
|
|
- set_defconf("SEAMONKEY_VERSION", seamonkey_version.version)
|
|
|
- set_defconf("SEAMONKEY_VERSION_DISPLAY", seamonkey_version.version_display)
|
|
|
-+# Currently not set in suite comm-central
|
|
|
-+# 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"
|
|
|
-@@ -105,18 +112,16 @@ set_defconf("THUNDERBIRD_VERSION", thund
|
|
|
- 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)
|
|
|
-
|
|
|
- # Building extensions is disabled by default.
|
|
|
--# Bug 1231349 needs to be fixed first for l10n builds.
|
|
|
--# Set desired defaults to True from False when the l10n bug is fixed.
|
|
|
-
|
|
|
- # =========================================================
|
|
|
- # = ChatZilla extension
|
|
|
- # =========================================================
|
|
|
- option(
|
|
|
- "--enable-irc", default=False, help="Enable building of the ChatZilla IRC extension"
|
|
|
- )
|
|
|
-
|
|
|
-@@ -143,10 +148,12 @@ def debugqa(arg):
|
|
|
-
|
|
|
- set_config("MOZ_DEBUGQA", debugqa)
|
|
|
-
|
|
|
- # Miscellaneous programs
|
|
|
- # ==============================================================
|
|
|
-
|
|
|
- check_prog("ZIP", ("zip",))
|
|
|
-
|
|
|
-+include("../build/moz.configure/gecko_source.configure")
|
|
|
-+
|
|
|
- include("../mailnews/moz.configure")
|
|
|
- include("../../toolkit/moz.configure")
|
Frank-Rainer Grahl