|
@@ -23,49 +23,6 @@ diff --git a/suite/app.mozbuild b/suite/app.mozbuild
|
|
|
'/comm/calendar',
|
|
|
'/comm/suite',
|
|
|
]
|
|
|
-@@ -66,42 +66,16 @@ def seamonkey_version(build_env, app_pat
|
|
|
-
|
|
|
-
|
|
|
- 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"
|
|
|
-- )
|
|
|
-- 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)
|
|
|
-
|
|
|
- # Building extensions is disabled by default.
|
|
|
-
|
|
|
- # =========================================================
|
|
|
- # = ChatZilla extension
|
|
|
- # =========================================================
|
|
|
diff --git a/suite/branding/seamonkey/locales/Makefile.in b/suite/branding/seamonkey/locales/Makefile.in
|
|
|
--- a/suite/branding/seamonkey/locales/Makefile.in
|
|
|
+++ b/suite/branding/seamonkey/locales/Makefile.in
|
|
@@ -148,3 +105,46 @@ diff --git a/suite/moz.configure b/suite/moz.configure
|
|
|
def seamonkey_version(build_env, app_path):
|
|
|
version_file = os.path.join(
|
|
|
build_env.topsrcdir, app_path[0], "config", "version.txt"
|
|
|
+@@ -82,42 +66,16 @@ def seamonkey_version(build_env, app_pat
|
|
|
+
|
|
|
+
|
|
|
+ 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"
|
|
|
+- )
|
|
|
+- 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)
|
|
|
+
|
|
|
+ # Building extensions is disabled by default.
|
|
|
+
|
|
|
+ # =========================================================
|
|
|
+ # = ChatZilla extension
|
|
|
+ # =========================================================
|