configure.ac | 7 ++++++-
sysui/desktop/macosx/Info.plist.in | 4 ++++
2 files changed, 10 insertions(+), 1 deletion(-)
New commits:
commit 9328e304c55684911b97f4e4fa3dab2fd1eb7f0f
Author: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
AuthorDate: Tue Oct 18 12:51:52 2022 +0200
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Mon Oct 24 09:56:58 2022 +0200
macOS: add XCode and SDK buildversions to Info.plist
without those submitting a build for external testing via testflight is
not possible because appstore thinks you were using a beta version of XCode
Change-Id: I6979a9d290c3e67dd9969d6e535625760b639c25
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141496
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
(cherry picked from commit 3336cb1b3d12e9cd5c2f560c82129dc8ed7527da)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141698
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/configure.ac b/configure.ac
index 4c0e343e3f66..4258dd0225f6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3286,7 +3286,7 @@ if test $_os = Darwin; then
fi
AC_MSG_RESULT([macOS SDK $macosx_sdk at $MACOSX_SDK_PATH])
-
+ MACOSX_SDK_BUILD_VERSION=$(xcodebuild -version -sdk "$MACOSX_SDK_PATH"
ProductBuildVersion)
case $macosx_sdk in
10.13)
MACOSX_SDK_VERSION=101300
@@ -3353,6 +3353,9 @@ if test $_os = Darwin; then
AC_MSG_ERROR(["$my_xcode_ver1" is too old or unrecognized, must be at
least Xcode 11.3])
fi
+ my_xcode_ver1=$(xcrun xcodebuild -version | tail -n 1)
+ MACOSX_XCODE_BUILD_VERSION=${my_xcode_ver1#Build version }
+
case "$with_macosx_version_min_required" in
10.12)
MAC_OS_X_VERSION_MIN_REQUIRED="101200"
@@ -3574,6 +3577,8 @@ AC_SUBST(ENABLE_MACOSX_SANDBOX)
AC_SUBST(MACOSX_BUNDLE_IDENTIFIER)
AC_SUBST(MACOSX_PROVISIONING_INFO)
AC_SUBST(MACOSX_PROVISIONING_PROFILE)
+AC_SUBST(MACOSX_SDK_BUILD_VERSION)
+AC_SUBST(MACOSX_XCODE_BUILD_VERSION)
dnl ===================================================================
dnl Check iOS SDK and compiler
diff --git a/sysui/desktop/macosx/Info.plist.in
b/sysui/desktop/macosx/Info.plist.in
index 6593139019fc..5401687027fa 100644
--- a/sysui/desktop/macosx/Info.plist.in
+++ b/sysui/desktop/macosx/Info.plist.in
@@ -1961,6 +1961,10 @@
<true/>
<key>NSContactsUsageDescription</key>
<string>You can add your contacts as a data source for mail merge or
similar operations.</string>
+ <key>DTXcodeBuild</key>
+ <string>@MACOSX_XCODE_BUILD_VERSION@</string>
+ <key>DTSDKBuild</key>
+ <string>@MACOSX_SDK_BUILD_VERSION@</string>
</dict>
</plist>
<!-- vim:set shiftwidth=4 softtabstop=4 expandtab: -->
