configure.ac | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-)
New commits: commit 2c67f40e2c2968845e423db72f41dc24f8b7a467 Author: Christian Lohmaier <lohmaier+libreoff...@googlemail.com> AuthorDate: Tue Jun 21 13:45:00 2022 +0200 Commit: Xisco Fauli <xiscofa...@libreoffice.org> CommitDate: Mon Jul 4 10:59:21 2022 +0200 allow pretty names in --enable-macosx-code/package-signing also reorder the logic to avoid duplicating the matches for default value and manually provided one. Change-Id: I4466cbeaf5abd7168f21e22cd910f63568c14e24 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136224 Tested-by: Jenkins Reviewed-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com> (cherry picked from commit 2f5b54ba51157a2346e10dfb82e3d434d6030aaa) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136552 Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org> diff --git a/configure.ac b/configure.ac index 6134678b9c54..8e13abca6f65 100644 --- a/configure.ac +++ b/configure.ac @@ -3565,16 +3565,22 @@ if test $_os = Darwin; then AC_MSG_CHECKING([whether to do code signing]) - if test "$enable_macosx_code_signing" = yes; then - # By default use the first suitable certificate (?). - - # http://stackoverflow.com/questions/13196291/difference-between-mac-developer-and-3rd-party-mac-developer-application - # says that the "Mac Developer" certificate is useful just for self-testing. For distribution - # outside the Mac App Store, use the "Developer ID Application" one, and for distribution in - # the App Store, the "3rd Party Mac Developer" one. I think it works best to the - # "Developer ID Application" one. + if test -z "$enable_macosx_code_signing" -o "$enable_macosx_code_signing" == "no" ; then + AC_MSG_RESULT([no]) + else + if test "$enable_macosx_code_signing" = yes; then + # By default use the first suitable certificate (?). - identity=`security find-identity -p codesigning -v 2>/dev/null | grep 'Developer ID Application:' | $AWK '{print $2}' |head -1` + # http://stackoverflow.com/questions/13196291/difference-between-mac-developer-and-3rd-party-mac-developer-application + # says that the "Mac Developer" certificate is useful just for self-testing. For distribution + # outside the Mac App Store, use the "Developer ID Application" one, and for distribution in + # the App Store, the "3rd Party Mac Developer" one. I think it works best to the + # "Developer ID Application" one. + identity="Developer ID Application:" + else + identity=$enable_macosx_code_signing + fi + identity=`security find-identity -p codesigning -v 2>/dev/null | $AWK "/$identity/{print \\$2; exit}"` if test -n "$identity"; then MACOSX_CODESIGNING_IDENTITY=$identity pretty_name=`security find-identity -p codesigning -v | grep "$MACOSX_CODESIGNING_IDENTITY" | sed -e 's/^[[^"]]*"//' -e 's/"//'` @@ -3582,12 +3588,6 @@ if test $_os = Darwin; then else AC_MSG_ERROR([cannot determine identity to use]) fi - elif test -n "$enable_macosx_code_signing" -a "$enable_macosx_code_signing" != no ; then - MACOSX_CODESIGNING_IDENTITY=$enable_macosx_code_signing - pretty_name=`security find-identity -p codesigning -v | grep "$MACOSX_CODESIGNING_IDENTITY" | sed -e 's/^[[^"]]*"//' -e 's/"//'` - AC_MSG_RESULT([yes, using the identity $MACOSX_CODESIGNING_IDENTITY for $pretty_name]) - else - AC_MSG_RESULT([no]) fi AC_MSG_CHECKING([whether to create a Mac App Store package]) @@ -3596,11 +3596,15 @@ if test $_os = Darwin; then AC_MSG_RESULT([no]) elif test -z "$MACOSX_CODESIGNING_IDENTITY"; then AC_MSG_ERROR([You forgot --enable-macosx-code-signing]) - elif test "$enable_macosx_package_signing" = yes; then - # By default use the first suitable certificate. - # It should be a "3rd Party Mac Developer Installer" one - - identity=`security find-identity -v 2>/dev/null | grep '3rd Party Mac Developer Installer:' | awk '{print $2}' |head -1` + else + if test "$enable_macosx_package_signing" = yes; then + # By default use the first suitable certificate. + # It should be a "3rd Party Mac Developer Installer" one + identity="3rd Party Mac Developer Installer:" + else + identity=$enable_macosx_package_signing + fi + identity=`security find-identity -v 2>/dev/null | $AWK "/$identity/ {print \\$2; exit}"` if test -n "$identity"; then MACOSX_PACKAGE_SIGNING_IDENTITY=$identity pretty_name=`security find-identity -v | grep "$MACOSX_PACKAGE_SIGNING_IDENTITY" | sed -e 's/^[[^"]]*"//' -e 's/"//'` @@ -3608,10 +3612,6 @@ if test $_os = Darwin; then else AC_MSG_ERROR([Could not find any suitable '3rd Party Mac Developer Installer' certificate]) fi - else - MACOSX_PACKAGE_SIGNING_IDENTITY=$enable_macosx_package_signing - pretty_name=`security find-identity -v | grep "$MACOSX_PACKAGE_SIGNING_IDENTITY" | sed -e 's/^[[^"]]*"//' -e 's/"//'` - AC_MSG_RESULT([yes, using the identity $MACOSX_PACKAGE_SIGNING_IDENTITY for $pretty_name]) fi if test -n "$MACOSX_CODESIGNING_IDENTITY" -a -n "$MACOSX_PACKAGE_SIGNING_IDENTITY" -a "$MACOSX_CODESIGNING_IDENTITY" = "$MACOSX_PACKAGE_SIGNING_IDENTITY"; then