# HG changeset patch # User Ian Neal # Date 1623162001 14400 # Parent 2440838654e2a2a00bbf8609f0d527487edb4d55 Bug 1605654 - Make use of MOZ_PKG_VERSION for packaging. r=frg a=frg diff --git a/suite/config/version_package.txt b/suite/config/version_package.txt new file mode 100644 --- /dev/null +++ b/suite/config/version_package.txt @@ -0,0 +1,1 @@ +2.53.1b1 diff --git a/suite/configure.in b/suite/configure.in --- a/suite/configure.in +++ b/suite/configure.in @@ -3,16 +3,17 @@ dnl vi: set tabstop=2 shiftwidth=2 expan dnl This Source Code Form is subject to the terms of the Mozilla Public dnl License, v. 2.0. If a copy of the MPL was not distributed with this dnl file, You can obtain one at http://mozilla.org/MPL/2.0/. dnl Things we need to carry from confvars.sh AC_DEFINE(MOZ_SUITE) AC_SUBST(MOZ_SUITE) AC_SUBST(MOZ_COMPOSER) +AC_SUBST(MOZ_PKG_VERSION) AC_SUBST(SEAMONKEY_VERSION) AC_DEFINE(MOZ_SEPARATE_MANIFEST_FOR_THEME_OVERRIDES) AC_SUBST(MOZ_BUNDLED_FONTS) dnl Optional parts of the build. AC_SUBST(MOZ_MORK) if test "$MOZ_MORK"; then AC_DEFINE(MOZ_MORK) diff --git a/suite/confvars.sh b/suite/confvars.sh --- a/suite/confvars.sh +++ b/suite/confvars.sh @@ -22,16 +22,18 @@ ACCEPTED_MAR_CHANNEL_IDS=seamonkey-comm- MAR_CHANNEL_ID=seamonkey-comm-central MOZ_MORK=1 MOZ_SERVICES_FXACCOUNTS=1 MOZ_APP_VERSION_TXT=${_topsrcdir}/$MOZ_BUILD_APP/config/version.txt MOZ_APP_VERSION=`cat $MOZ_APP_VERSION_TXT` MOZ_APP_VERSION_DISPLAY_TXT=${_topsrcdir}/$MOZ_BUILD_APP/config/version_display.txt MOZ_APP_VERSION_DISPLAY=`cat $MOZ_APP_VERSION_DISPLAY_TXT` +MOZ_PKG_VERSION_TXT=${_topsrcdir}/$MOZ_BUILD_APP/config/version_package.txt +MOZ_PKG_VERSION=`cat $MOZ_PKG_VERSION_TXT` SEAMONKEY_VERSION=$MOZ_APP_VERSION MOZ_APP_ID={92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a} MOZ_PROFILE_MIGRATOR=1 MOZ_SEPARATE_MANIFEST_FOR_THEME_OVERRIDES=1 if test "$OS_ARCH" = "WINNT" -o \ "$OS_ARCH" = "Linux"; then