- Cleaning up the branches

rca · Jun 21, 2010 · 5df934b · 5df934b
2 parents 34c6b2d + 37042ae
commit 5df934b
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 3 deletions.
diff --git a/GPGMail/Dependencies/MacGPGME b/GPGMail/Dependencies/MacGPGME
diff --git a/GPGMail/GPGMail.xcodeproj/project.pbxproj b/GPGMail/GPGMail.xcodeproj/project.pbxproj
@@ -86,6 +86,7 @@
 		559A81340838EEFD0052F47C /* System.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 559A812F0838EEFD0052F47C /* System.framework */; };
 		559FD1250BBC428000C8FE50 /* KeyServers.plist in Resources */ = {isa = PBXBuildFile; fileRef = 559A80E80838ED6D0052F47C /* KeyServers.plist */; };
 		8D5B49B4048680CD000E48DA /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7ADFEA557BF11CA2CBB /* Cocoa.framework */; };
+		AC48AFAC11CDEE0300393D2C /* MacGPGME.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AC48AFAB11CDEE0300393D2C /* MacGPGME.framework */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXBuildRule section */
@@ -286,7 +287,7 @@
 		1B194BEA11CC58BC0092B810 /* OutgoingMessage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OutgoingMessage.h; path = Source/PrivateHeaders/OutgoingMessage.h; sourceTree = "<group>"; };
 		1B45A53B11CC98AB00ED4663 /* MessageViewer+GPGMail.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "MessageViewer+GPGMail.m"; path = "Source/MessageViewer+GPGMail.m"; sourceTree = "<group>"; };
 		1B6B7DF311CD1C600055F528 /* Sparkle.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Sparkle.framework; path = Frameworks/Sparkle.framework; sourceTree = "<group>"; };
-		1B6B7E5111CD24440055F528 /* dsa_pub.pem */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = dsa_pub.pem; sourceTree = "<group>"; };
+		1B6B7E5111CD24440055F528 /* dsa_pub.pem */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = dsa_pub.pem; path = Release/dsa_pub.pem; sourceTree = "<group>"; };
 		1B859A6E109331A6009E469A /* MVTerminationHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MVTerminationHandler.h; path = Source/PrivateHeaders/MVTerminationHandler.h; sourceTree = "<group>"; };
 		1BCEE1E211CC051500488D19 /* LICENSE.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = LICENSE.txt; path = Documentation/LICENSE.txt; sourceTree = "<group>"; };
 		1BF51A6F108FCD1900AC8268 /* ExceptionHandling.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ExceptionHandling.framework; path = System/Library/Frameworks/ExceptionHandling.framework; sourceTree = SDKROOT; };
@@ -418,6 +419,7 @@
 		559A81860838F3C30052F47C /* Info-GPGMail.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = "Info-GPGMail.plist"; path = "Plists/Info-GPGMail.plist"; sourceTree = "<group>"; };
 		559A819C0838F87E0052F47C /* Installer.applescript */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.applescript; name = Installer.applescript; path = Release/Installer.applescript; sourceTree = "<group>"; };
 		8D5B49B6048680CD000E48DA /* GPGMail.mailbundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = GPGMail.mailbundle; sourceTree = BUILT_PRODUCTS_DIR; };
+		AC48AFAB11CDEE0300393D2C /* MacGPGME.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MacGPGME.framework; path = Dependencies/MacGPGME/build/Release/MacGPGME.framework; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -434,6 +436,7 @@
 				559A81340838EEFD0052F47C /* System.framework in Frameworks */,
 				1BF51A70108FCD1900AC8268 /* ExceptionHandling.framework in Frameworks */,
 				1B6B7DF411CD1C600055F528 /* Sparkle.framework in Frameworks */,
+				AC48AFAC11CDEE0300393D2C /* MacGPGME.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -512,6 +515,7 @@
 				559A812E0838EEFD0052F47C /* Security.framework */,
 				559A812F0838EEFD0052F47C /* System.framework */,
 				1058C7ADFEA557BF11CA2CBB /* Cocoa.framework */,
+				AC48AFAB11CDEE0300393D2C /* MacGPGME.framework */,
 			);
 			name = "Linked Frameworks";
 			sourceTree = "<group>";
@@ -1153,8 +1157,10 @@
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(BUILT_PRODUCTS_DIR)/../Release",
 					"$(FRAMEWORK_SEARCH_PATHS_QUOTED_1)",
+					"$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
 				);
 				FRAMEWORK_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/Frameworks\"";
+				FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/Dependencies/MacGPGME/build/Release\"";
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_ENABLE_FIX_AND_CONTINUE = YES;
 				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
@@ -1164,7 +1170,7 @@
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				HEADER_SEARCH_PATHS = /usr/local/include;
-				INFOPLIST_FILE = "Info-GPGMail.plist";
+				INFOPLIST_FILE = "Plists/Info-GPGMail.plist";
 				INSTALL_PATH = "$(HOME)/Library/Mail/Bundles";
 				LIBRARY_SEARCH_PATHS = (
 					/usr/local/lib,
@@ -1198,8 +1204,10 @@
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(BUILT_PRODUCTS_DIR)/../Release",
 					"$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
+					"$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_2)",
 				);
 				FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/Frameworks\"";
+				FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_2 = "\"$(SRCROOT)/Dependencies/MacGPGME/build/Release\"";
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = GPGMail_Prefix.pch;
 				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;

diff --git a/GPGMail/Release/dsa_pub.pem b/GPGMail/Release/dsa_pub.pem
@@ -0,0 +1,20 @@
+-----BEGIN PUBLIC KEY-----
+MIIDOzCCAi0GByqGSM44BAEwggIgAoIBAQDTOheW+hpVKyrCiHc2Rq2pzOP3sMDh
+j9ffFwvCpObbpqYuPrqH0x7faXU9G7HEboMkcxrKAwTZlprsiX0Xprjuxt05jFOv
+AIIh3ZHdvi78demnYONjUslWvrIKCgxm04zutI4admfyCzsoSRQSJeN2hnLk4rHe
+DhaOfL0cPnM+sp4q4HCkMq2yWsMLJCW0zdqqrQZdGJ93WEbrbrkKXrKYOJRpNtJj
+nm42JnH3SLpqhJAnHuWGrnmw71VRCCCGOSxu0TwNvooVZjzfrFmLJku3lbnK/2d/
+uN13uTkPjAaa4TjGC5oWm2BGZOv7FUJabP5HAyw22OSBrojjSAO7axJRAhUA4ezN
+Yb02o+NYbsd/Hh1PsXPhYCsCggEACJwKv0BMgW6l/jb34Yc7nvqWhLwYLzUm79RP
+slHWDQjkussddfdy1ONeBnvPqFKNlvSFlj3IjBM3coB3XOtoPx9qQy/c17eMGgYt
+WnURRcA9zR7Q+lD/tRkBlHG9vLFwtRNdKm/jTScMIWq5YwZW25qJReNLayIx/D23
+Exc/IwFfQBoHqNPpAoEr6d4mMfwfHpxqqocoM1P2a/HYm5112bdEMxUKuLNx0pLG
+/Dwy0CkdIpsNPEyzsll+DVCfJINNvZHF/OdbGYdkJg+H5ELBKbm1XGDQOzLTC8s6
+1Rp1JkI/qGEMhQFpmRb0stabc7zLa+T0WUAwrUC6KsYxo0pj7gOCAQYAAoIBAQCJ
+P2Z+XoPz+FC/NrXgeMjEfxHK7Zd9HLcMB9nFHL0OUF6Pg243tDgnb4N6TCHHtv/s
+w0Q4f66EBu1V2WX3/VICRkQBfUnKXOHGhluc/r0kpm9ew5RP68VQlTZVHDALN6e6
+aOPjDDcIondKt6zSaiU5eHIsfAPgu9vcl1mLC+MYfOW3rmO55tFrVsA4mehExtVZ
+1N32sUNeY7PXsMovGybLxCyKpWjSoK19Awh07pjBBv+djK/cTttm3MLYjySvUfmR
+1djSzVk5Z76A+Omp8nwawDHREsukgP+VtIyuWRIoCUy8DKDQgi3MO18WcGXIYaFI
+zHvy/HM0UiunCXMcl4p/
+-----END PUBLIC KEY-----