123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263 |
- # HG changeset patch
- # User Bill Gianopoulos <wgianopoulos@gmail.com>
- # Date 1718443645 0
- Bug 9999999 - Port bugs 1898060 and 1898177 to suite.
- Bug 1898060 - Move MOZ_APP_ID from old-configure to moz.configure.
- Bug 1898177 - Move MOZ_APP_VENDOR from confvars.sh to moz.configure.
- diff --git a/suite/confvars.sh b/suite/confvars.sh
- --- a/suite/confvars.sh
- +++ b/suite/confvars.sh
- @@ -1,14 +1,13 @@
- #! /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
- @@ -16,15 +15,14 @@ MOZ_OFFICIAL_BRANDING_DIRECTORY=comm/sui
- 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 "
- MAR_CHANNEL_ID=seamonkey-comm-central
-
- -MOZ_APP_ID={92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}
- 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
- @@ -3,16 +3,18 @@
- # 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/.
-
- 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")
-
- 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
-
|