diff --git a/AutoCat.xcodeproj/project.xcworkspace/xcuserdata/selim.xcuserdatad/IDEFindNavigatorScopes.plist b/AutoCat.xcodeproj/project.xcworkspace/xcuserdata/selim.xcuserdatad/IDEFindNavigatorScopes.plist new file mode 100644 index 0000000..5dd5da8 --- /dev/null +++ b/AutoCat.xcodeproj/project.xcworkspace/xcuserdata/selim.xcuserdatad/IDEFindNavigatorScopes.plist @@ -0,0 +1,5 @@ + + + + + diff --git a/AutoCat.xcodeproj/xcshareddata/xcschemes/AutoCat.xcscheme b/AutoCat.xcodeproj/xcshareddata/xcschemes/AutoCat.xcscheme new file mode 100644 index 0000000..defffdc --- /dev/null +++ b/AutoCat.xcodeproj/xcshareddata/xcschemes/AutoCat.xcscheme @@ -0,0 +1,78 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/AutoCat.xcodeproj/xcuserdata/selim.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/AutoCat.xcodeproj/xcuserdata/selim.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist index 9b245e6..9f4253c 100644 --- a/AutoCat.xcodeproj/xcuserdata/selim.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist +++ b/AutoCat.xcodeproj/xcuserdata/selim.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist @@ -63,22 +63,6 @@ landmarkType = "7"> - - - - isShown orderHint - 14 + 8 DifferenceKit (Playground) 2.xcscheme isShown orderHint - 15 + 9 DifferenceKit (Playground).xcscheme isShown orderHint - 11 + 7 Eureka (Playground) 1.xcscheme isShown orderHint - 2 + 5 Eureka (Playground) 2.xcscheme isShown orderHint - 3 + 6 Eureka (Playground).xcscheme isShown orderHint - 1 + 4 GettingStarted (Playground) 1.xcscheme isShown orderHint - 12 + 14 GettingStarted (Playground) 2.xcscheme isShown orderHint - 13 + 15 GettingStarted (Playground) 3.xcscheme @@ -91,42 +91,42 @@ isShown orderHint - 8 + 13 Rx (Playground) 1.xcscheme isShown orderHint - 5 + 2 Rx (Playground) 2.xcscheme isShown orderHint - 6 + 3 Rx (Playground).xcscheme isShown orderHint - 4 + 1 SwiftDate (Playground) 1.xcscheme isShown orderHint - 9 + 11 SwiftDate (Playground) 2.xcscheme isShown orderHint - 10 + 12 SwiftDate (Playground) 3.xcscheme @@ -154,7 +154,7 @@ isShown orderHint - 7 + 10 SuppressBuildableAutocreation diff --git a/dmg/AppIcon.icns b/dmg/AppIcon.icns new file mode 100644 index 0000000..722b660 Binary files /dev/null and b/dmg/AppIcon.icns differ diff --git a/dmg/dmgbg.png b/dmg/dmgbg.png new file mode 100644 index 0000000..c19c277 Binary files /dev/null and b/dmg/dmgbg.png differ diff --git a/dmg/sign_dmg.sh b/dmg/sign_dmg.sh new file mode 100755 index 0000000..ed5217a --- /dev/null +++ b/dmg/sign_dmg.sh @@ -0,0 +1,62 @@ +#!/usr/bin/env bash + +APP=$1 +VERSION=$2 + +CODESIGNID="Developer ID Application: Selim Mustafaev" +NOTARY="--username selim@fastmail.fm --password actd-lhgc-kooe-jtrs" +APPNAME="AutoCat" +BUNDLEID="pro.aliencat.AutoCat" + +function msg { + printf "\\n${fBold}-- %s${fNormal}\\n" "${@}" +} + +srcDir="$(mktemp -dt $$)" + +msg "Preparing disk image sources at ${srcDir}:" +cp -R "${APP}" "${srcDir}" +ln -s /Applications "${srcDir}" + +# Disk image name +dmg_name="${APPNAME}-${VERSION}" + +msg "Creating disk image:" +hdiutil create -format UDBZ -fs HFS+ -srcdir "${srcDir}" -volname "${dmg_name}" "${dmg_name}.dmg" + +# Sign disk image +codesign --deep --force -v -s "${CODESIGNID}" --timestamp "${dmg_name}.dmg" + +# Notarize the dmg +if ! test -z "$NOTARY" ; then + zip "${dmg_name}.dmg.zip" "${dmg_name}.dmg" + uuid=`xcrun altool --notarize-app --primary-bundle-id "${BUNDLEID}" ${NOTARY} --file "${dmg_name}.dmg.zip" 2>&1 | grep 'RequestUUID' | awk '{ print $3 }'` + echo "dmg Result= $uuid" # Display identifier string + sleep 15 + while : + do + fullstatus=`xcrun altool --notarization-info "$uuid" ${NOTARY} 2>&1` # get the status + status1=`echo "$fullstatus" | grep 'Status\:' | awk '{ print $2 }'` + if [ "$status1" = "success" ]; then + xcrun stapler staple "${dmg_name}.dmg" # staple the ticket + xcrun stapler validate -v "${dmg_name}.dmg" + echo "dmg Notarization success" + break + elif [ "$status1" = "in" ]; then + echo "dmg Notarization still in progress, sleeping for 15 seconds and trying again" + sleep 15 + else + echo "dmg Notarization failed fullstatus below" + echo "$fullstatus" + exit 1 + fi + done +fi + +# Zip disk image for redistribution +#zip "${dmg_name}.zip" "${dmg_name}.dmg" +#rm "${dmg_name}.dmg" + +msg "Removing disk image caches:" +rm -rf "${srcDir}" +rm "${dmg_name}.dmg.zip" \ No newline at end of file diff --git a/dmg/test.sh b/dmg/test.sh new file mode 100755 index 0000000..bbac04a --- /dev/null +++ b/dmg/test.sh @@ -0,0 +1,14 @@ +#!/usr/bin/env bash + +create-dmg \ + --volname "AutoCat" \ + --volicon "AppIcon.icns" \ + --background "dmgbg.png" \ + --window-pos 800 600 \ + --window-size 800 600 \ + --icon-size 128 \ + --icon "AutoCat.app" 160 290 \ + --hide-extension "AutoCat.app" \ + --app-drop-link 635 290 \ + "AutoCat.dmg" \ + "app/"