diff options
Diffstat (limited to 'browser/confvars.sh')
| -rwxr-xr-x | browser/confvars.sh | 53 |
1 files changed, 25 insertions, 28 deletions
diff --git a/browser/confvars.sh b/browser/confvars.sh index 98fa4cbe9c..25692b1889 100755 --- a/browser/confvars.sh +++ b/browser/confvars.sh @@ -3,8 +3,8 @@ # 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_BASENAME=Firefox -MOZ_APP_VENDOR=Mozilla +MOZ_APP_BASENAME=Basilisk +MOZ_APP_VENDOR=Moonchild MOZ_PHOENIX=1 MC_BASILISK=1 MOZ_UPDATER=1 @@ -15,42 +15,38 @@ if test "$OS_ARCH" = "WINNT" -o \ fi if test "$OS_ARCH" = "WINNT"; then - MOZ_MAINTENANCE_SERVICE=1 - if ! test "$HAVE_64BIT_BUILD"; then - if test "$MOZ_UPDATE_CHANNEL" = "nightly" -o \ - "$MOZ_UPDATE_CHANNEL" = "aurora" -o \ - "$MOZ_UPDATE_CHANNEL" = "beta" -o \ - "$MOZ_UPDATE_CHANNEL" = "beta-dev" -o \ - "$MOZ_UPDATE_CHANNEL" = "release" -o \ - "$MOZ_UPDATE_CHANNEL" = "release-dev"; then - if ! test "$MOZ_DEBUG"; then - MOZ_STUB_INSTALLER=1 - fi - fi - fi + MOZ_MAINTENANCE_SERVICE= fi -# Enable building ./signmar and running libmar signature tests -MOZ_ENABLE_SIGNMAR=1 +# For Basilisk we want to use 55.0.YYYY.MM.DD as MOZ_APP_VERSION in release +# builds so add-on developers have something to target while maintaining +# Firefox compatiblity. +# To enable add "export BASILISK_VERSION=1" to the .mozconfig file. +# However, this will cause a full rebuild at 00:00 UTC every day so +# don't export the variable if you are in development or don't care. +# When not exported we fall back the value in the version*.txt file. +if test -n "$BASILISK_VERSION" ; then + MOZ_APP_VERSION=55.0.`date --utc '+%Y.%m.%d'` + MOZ_APP_VERSION_DISPLAY=`date --utc '+%Y.%m.%d'` +else + MOZ_APP_VERSION=`cat ${_topsrcdir}/$MOZ_BUILD_APP/config/version.txt` + MOZ_APP_VERSION_DISPLAY=`cat ${_topsrcdir}/$MOZ_BUILD_APP/config/version_display.txt` +fi -MOZ_APP_VERSION=`cat ${_topsrcdir}/$MOZ_BUILD_APP/config/version.txt` -MOZ_APP_VERSION_DISPLAY=`cat ${_topsrcdir}/$MOZ_BUILD_APP/config/version_display.txt` MOZ_EXTENSIONS_DEFAULT=" gio" + # MOZ_APP_DISPLAYNAME will be set by branding/configure.sh # MOZ_BRANDING_DIRECTORY is the default branding directory used when none is # specified. It should never point to the "official" branding directory. -# For mozilla-beta, mozilla-release, or mozilla-central repositories, use -# "unofficial" branding. -# For the mozilla-aurora repository, use "aurora". -MOZ_BRANDING_DIRECTORY=browser/branding/unofficial -MOZ_OFFICIAL_BRANDING_DIRECTORY=browser/branding/official +MOZ_BRANDING_DIRECTORY=$MOZ_BUILD_APP/branding/unofficial +MOZ_OFFICIAL_BRANDING_DIRECTORY=$MOZ_BUILD_APP/branding/official MOZ_APP_ID={ec8030f7-c20a-464f-9b0e-13a3a9e97384} # 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=firefox-mozilla-esr +ACCEPTED_MAR_CHANNEL_IDS=basilisk-release # The MAR_CHANNEL_ID must not contain the following 3 characters: ",\t " -MAR_CHANNEL_ID=firefox-mozilla-esr +MAR_CHANNEL_ID=basilisk-release MOZ_PROFILE_MIGRATOR=1 MOZ_APP_STATIC_INI=1 MOZ_WEBGL_CONFORMANT=1 @@ -58,8 +54,9 @@ MOZ_JSDOWNLOADS=1 MOZ_RUST_MP4PARSE=1 MOZ_RUST_URLPARSE=1 -# Enable checking that add-ons are signed by the trusted root -MOZ_ADDON_SIGNING=1 +# Disable checking that add-ons are signed by the trusted root +MOZ_ADDON_SIGNING=0 +MOZ_REQUIRE_SIGNING=0 # Include the DevTools client, not just the server (which is the default) MOZ_DEVTOOLS=all |