|
|
@@ -0,0 +1,44 @@
|
|
|
+# HG changeset patch
|
|
|
+# User Bill Gianopoulos <wgianopoulos@gmail.com>
|
|
|
+# Date 1718654652 0
|
|
|
+Bug 9999999 - Port bug 1900200 to suite.
|
|
|
+Bug 1900200 - Move MOZ_DEVTOOLS from confvars.sh to moz.configure
|
|
|
+
|
|
|
+diff --git a/suite/confvars.sh b/suite/confvars.sh
|
|
|
+--- a/suite/confvars.sh
|
|
|
++++ b/suite/confvars.sh
|
|
|
+@@ -17,12 +17,9 @@ MOZ_UPDATER=1
|
|
|
+ # 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 "
|
|
|
+ MAR_CHANNEL_ID=seamonkey-comm-central
|
|
|
+
|
|
|
+ MOZ_PROFILE_MIGRATOR=1
|
|
|
+
|
|
|
+-# Include the DevTools client, not just the server (which is the default)
|
|
|
+-MOZ_DEVTOOLS=all
|
|
|
+-
|
|
|
+ NSS_EXTRA_SYMBOLS_FILE=../comm/mailnews/nss-extra.symbols
|
|
|
+diff --git a/suite/moz.configure b/suite/moz.configure
|
|
|
+--- a/suite/moz.configure
|
|
|
++++ b/suite/moz.configure
|
|
|
+@@ -5,16 +5,18 @@
|
|
|
+ # file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
|
|
+
|
|
|
+ set_config("MOZ_SUITE", True)
|
|
|
+ set_define("MOZ_SUITE", True)
|
|
|
+
|
|
|
+ imply_option("MOZ_APP_BASENAME", "SeaMonkey")
|
|
|
+ imply_option("MOZ_APP_ID", "{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}")
|
|
|
+ imply_option("MOZ_APP_VENDOR", "Mozilla")
|
|
|
++# Include the DevTools client, not just the server (which is the default)
|
|
|
++imply_option("MOZ_DEVTOOLS", "all")
|
|
|
+
|
|
|
+ imply_option('--enable-default-browser-agent', False)
|
|
|
+
|
|
|
+ @depends(target_is_windows, target_has_linux_kernel)
|
|
|
+ def bundled_fonts(is_windows, is_linux):
|
|
|
+ if is_windows or is_linux:
|
|
|
+ return True
|
|
|
+
|
Bill Gianopoulos