diff options
| author | rowanbeentje <rowan@beent.je> | 2009-12-09 00:13:37 +0000 |
|---|---|---|
| committer | rowanbeentje <rowan@beent.je> | 2009-12-09 00:13:37 +0000 |
| commit | 82863377e365f27dffe757dba7b25163a48aec1d (patch) | |
| tree | 9a28f016a7b0a4e70bf2fad58fdfca61a5e481c1 | |
| parent | c71309b319ec4ea254ed5d6efd12fd7766fc5184 (diff) | |
| download | sequelpro-82863377e365f27dffe757dba7b25163a48aec1d.tar.gz sequelpro-82863377e365f27dffe757dba7b25163a48aec1d.tar.bz2 sequelpro-82863377e365f27dffe757dba7b25163a48aec1d.zip | |
- Fix a build issue on Distribution builds by including a link to libcrypto (thanks to Stuart!)
- Improve debug code signing by also signing the tunnel assistant, and add code signing for Distribution builds. This addresses Issue #426. (assistant signing improvement also applied to nightlies)
| -rwxr-xr-x | Scripts/build.sh | 14 | ||||
| -rw-r--r-- | sequel-pro.xcodeproj/project.pbxproj | 2 |
2 files changed, 16 insertions, 0 deletions
diff --git a/Scripts/build.sh b/Scripts/build.sh index 80fef06f..8b0e27d1 100755 --- a/Scripts/build.sh +++ b/Scripts/build.sh @@ -23,12 +23,26 @@ fi # Perform distribution specific tasks if this is a 'Distribution' build if [ "$CONFIGURATION" == 'Distribution' ] then + codesign -s 'Sequel Pro Distribution' "${BUILT_PRODUCTS_DIR}/${TARGET_NAME}${WRAPPER_SUFFIX}/Contents/Resources/SequelProTunnelAssistant" 2> /dev/null + codesign -s 'Sequel Pro Distribution' "${BUILT_PRODUCTS_DIR}/${TARGET_NAME}${WRAPPER_SUFFIX}" 2> /dev/null + + # Verify that code signing has worked - all distribution builds must be signed with the same key. + VERIFYERRORS=`codesign --verify "${BUILT_PRODUCTS_DIR}/${TARGET_NAME}${WRAPPER_SUFFIX}" 2>&1` + VERIFYERRORS+=`codesign --verify "${BUILT_PRODUCTS_DIR}/${TARGET_NAME}${WRAPPER_SUFFIX}/Contents/Resources/SequelProTunnelAssistant" 2>&1` + if [ "$VERIFYERRORS" != '' ] + then + echo "error: Signing verification threw an error: $VERIFYERRORS" + echo "error: All distribution builds must be signed with the key used for all previous distribution signing!" + exit 1 + fi + "${SRCROOT}/Scripts/package-application.sh" -p "${BUILT_PRODUCTS_DIR}/${TARGET_NAME}${WRAPPER_SUFFIX}" fi # Development build code signing if [ "$CONFIGURATION" == 'Debug' ] then + codesign -s 'Sequel Pro Development' "${BUILT_PRODUCTS_DIR}/${TARGET_NAME}${WRAPPER_SUFFIX}/Contents/Resources/SequelProTunnelAssistant" 2> /dev/null codesign -s 'Sequel Pro Development' "${BUILT_PRODUCTS_DIR}/${TARGET_NAME}${WRAPPER_SUFFIX}" 2> /dev/null # Run a fake command to silence errors diff --git a/sequel-pro.xcodeproj/project.pbxproj b/sequel-pro.xcodeproj/project.pbxproj index 1ee42157..8310a8f5 100644 --- a/sequel-pro.xcodeproj/project.pbxproj +++ b/sequel-pro.xcodeproj/project.pbxproj @@ -170,6 +170,7 @@ 58C3506710B9A57300D37E14 /* button_right.png in Resources */ = {isa = PBXBuildFile; fileRef = 58C3506610B9A57300D37E14 /* button_right.png */; }; 58C3506B10B9AA8B00D37E14 /* button_pagination.png in Resources */ = {isa = PBXBuildFile; fileRef = 58C3506A10B9AA8B00D37E14 /* button_pagination.png */; }; 58C3507510B9ADEA00D37E14 /* ContentPaginationView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 58C3507310B9ADEA00D37E14 /* ContentPaginationView.xib */; }; + 58C458DF10CF188F00E6E13E /* libcrypto.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 17B7B58F1016028F00F057DE /* libcrypto.dylib */; }; 58C56EF50F438E120035701E /* SPDataCellFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = 58C56EF40F438E120035701E /* SPDataCellFormatter.m */; }; 58CB20ED0F79A75D005EA204 /* button_edit_mode_selected.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 58CB20EC0F79A75D005EA204 /* button_edit_mode_selected.tiff */; }; 58CDB3300FCE138D00F8ACA3 /* SPSSHTunnel.m in Sources */ = {isa = PBXBuildFile; fileRef = 58CDB32F0FCE138D00F8ACA3 /* SPSSHTunnel.m */; }; @@ -724,6 +725,7 @@ 296DC89F0F8FD336002A3258 /* WebKit.framework in Frameworks */, 17B7B5991016038400F057DE /* MCPKit.framework in Frameworks */, BCC5CC3C103EEE49007CE557 /* libz.dylib in Frameworks */, + 58C458DF10CF188F00E6E13E /* libcrypto.dylib in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; |