macos: add a tokend postfix for dmg

This commit is contained in:
Frank Morgner 2021-03-04 09:25:59 +01:00
parent b9080c16d6
commit 26fac9592d
2 changed files with 6 additions and 2 deletions

View File

@ -5,6 +5,7 @@ matrix:
- compiler: clang
os: osx
osx_image: xcode9.4
env: DO_PUSH_ARTIFACT=yes
- compiler: clang
os: osx
osx_image: xcode12.2

View File

@ -140,9 +140,12 @@ if (( $(xcodebuild -version | sed -En 's/Xcode[[:space:]]+([0-9]+)(\.[0-9]*)*/\1
else
xcodebuild -target OpenSC -configuration Deployment -project OpenSC.tokend/Tokend.xcodeproj install DSTROOT=${BUILDPATH}/target_tokend
fi
TOKEND="-tokend"
else
# https://github.com/OpenSC/OpenSC.tokend/issues/33
mkdir -p ${BUILDPATH}/target_tokend
TOKEND=""
fi
#if ! test -e $BUILDPATH/target/Library/Security/tokend/OpenSC.tokend/Contents/Resources/Applications/terminal-notifier.app; then
@ -232,9 +235,9 @@ if test -n "${CODE_SIGN_IDENTITY}"; then
fi
# Create .dmg
rm -f OpenSC-@PACKAGE_VERSION@.dmg
rm -f OpenSC-@PACKAGE_VERSION@$TOKEND.dmg
i=0
while ! hdiutil create -srcfolder "${imagedir}" -volname "@PACKAGE_NAME@" -fs JHFS+ OpenSC-@PACKAGE_VERSION@.dmg
while ! hdiutil create -srcfolder "${imagedir}" -volname "@PACKAGE_NAME@" -fs JHFS+ OpenSC-@PACKAGE_VERSION@$TOKEND.dmg
do
i=$[$i+1]
if [ $i -gt 2 ]