adium 4218:ffef4c9983a5: I hope this finally makes Adium build c...

[commits at adium.im]

details:	http://hg.adium.im/adium/rev/ffef4c9983a5
revision:	4218:ffef4c9983a5
branch:		(none)
author:		Thijs Alkemade <thijsalkemade at gmail.com>
date:		Wed Oct 05 17:54:51 2011 +0200

I hope this finally makes Adium build correctly with Sparkle as a subrepository. Make sure Adium looks for the right configuration of Sparkle when building.

diffs (59 lines):

diff -r 5e0ed6cce910 -r ffef4c9983a5 .hgsubstate
--- a/.hgsubstate	Tue Oct 04 23:21:48 2011 +0200
+++ b/.hgsubstate	Wed Oct 05 17:54:51 2011 +0200
@@ -1,1 +1,1 @@
-6ae0160d679358b9775ba7f9f275beae31ad5c5d Frameworks/Sparkle
+a574ecb987850d25af738e7a65567c8d56abffe3 Frameworks/Sparkle
diff -r 5e0ed6cce910 -r ffef4c9983a5 Adium.xcodeproj/project.pbxproj
--- a/Adium.xcodeproj/project.pbxproj	Tue Oct 04 23:21:48 2011 +0200
+++ b/Adium.xcodeproj/project.pbxproj	Wed Oct 05 17:54:51 2011 +0200
@@ -1420,10 +1420,10 @@
 		6EC1684D06C170A000F9FAD3 /* DCInviteToChatPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 6EC1684806C170A000F9FAD3 /* DCInviteToChatPlugin.m */; };
 		6EC1684F06C170A000F9FAD3 /* DCInviteToChatWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 6EC1684A06C170A000F9FAD3 /* DCInviteToChatWindowController.m */; };
 		6EC1685006C170A000F9FAD3 /* InviteToChatWindow.nib in Resources */ = {isa = PBXBuildFile; fileRef = 6EC1684B06C170A000F9FAD3 /* InviteToChatWindow.nib */; };
+		761F04F4143CB16300DA8CB2 /* Sparkle.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 7694977F143B7BE7002A6069 /* Sparkle.framework */; };
 		766ABAB61306D1020049FFB7 /* AIUnreadMessagesTooltip.m in Sources */ = {isa = PBXBuildFile; fileRef = 766ABAB51306D1020049FFB7 /* AIUnreadMessagesTooltip.m */; };
 		76889DEB12D3CA17007AEF00 /* GetInfo.png in Resources */ = {isa = PBXBuildFile; fileRef = 76889DEA12D3CA17007AEF00 /* GetInfo.png */; };
 		76889DEF12D3CA40007AEF00 /* Personal.png in Resources */ = {isa = PBXBuildFile; fileRef = 76889DEE12D3CA40007AEF00 /* Personal.png */; };
-		76949798143B820F002A6069 /* Sparkle.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 7694977F143B7BE7002A6069 /* Sparkle.framework */; };
 		76949799143B8319002A6069 /* Sparkle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7694977F143B7BE7002A6069 /* Sparkle.framework */; };
 		76C1AF9C125A906A00D269A9 /* AIAdiumURLProtocol.m in Sources */ = {isa = PBXBuildFile; fileRef = 76C1AF9B125A906A00D269A9 /* AIAdiumURLProtocol.m */; };
 		7E6F8A94105611B700C6D80D /* libotr.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7E6F8A93105611B700C6D80D /* libotr.framework */; };
@@ -1734,7 +1734,7 @@
 			dstPath = "";
 			dstSubfolderSpec = 10;
 			files = (
-				76949798143B820F002A6069 /* Sparkle.framework in Copy Frameworks */,
+				761F04F4143CB16300DA8CB2 /* Sparkle.framework in Copy Frameworks */,
 				7EDDBF1F1130D06700D31F1E /* libgsttag.framework in Copy Frameworks */,
 				7E7CF7F51124B9A8001CFC73 /* libgstsdp.framework in Copy Frameworks */,
 				7EA7F05A1124AAA900E0C1F0 /* libgstaudio.framework in Copy Frameworks */,
diff -r 5e0ed6cce910 -r ffef4c9983a5 xcconfigs/Base.xcconfig
--- a/xcconfigs/Base.xcconfig	Tue Oct 04 23:21:48 2011 +0200
+++ b/xcconfigs/Base.xcconfig	Wed Oct 05 17:54:51 2011 +0200
@@ -1,6 +1,5 @@
 GCC_PREFIX_HEADER = Adium.pch
 ARCHS = $(NATIVE_ARCH_ACTUAL)
-FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_PROJECT_2 = "$(SRCROOT)/Frameworks"
 GCC_ENABLE_CPP_EXCEPTIONS = NO
 GCC_WARN_CHECK_SWITCH_STATEMENTS = YES
 GCC_WARN_SHADOW = YES
diff -r 5e0ed6cce910 -r ffef4c9983a5 xcconfigs/Debug.xcconfig
--- a/xcconfigs/Debug.xcconfig	Tue Oct 04 23:21:48 2011 +0200
+++ b/xcconfigs/Debug.xcconfig	Wed Oct 05 17:54:51 2011 +0200
@@ -1,4 +1,5 @@
 #include "Base.xcconfig"
+FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_PROJECT_2 = "$(SRCROOT)/Frameworks" "$(SRCROOT)/Frameworks/Sparkle/build/Debug"
 STRIP_INSTALLED_PRODUCT = NO
 GCC_OPTIMIZATION_LEVEL = 0
 COPY_PHASE_STRIP = NO
diff -r 5e0ed6cce910 -r ffef4c9983a5 xcconfigs/Release.xcconfig
--- a/xcconfigs/Release.xcconfig	Tue Oct 04 23:21:48 2011 +0200
+++ b/xcconfigs/Release.xcconfig	Wed Oct 05 17:54:51 2011 +0200
@@ -1,5 +1,6 @@
 #include "Base.xcconfig"
 ARCHS = x86_64 i386
+FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_PROJECT_2 = "$(SRCROOT)/Frameworks" "$(SRCROOT)/Frameworks/Sparkle/build/Release"
 DEPLOYMENT_POSTPROCESSING = YES
 APPLY_RULES_IN_COPY_FILES = YES
 GCC_DEBUGGING_SYMBOLS = used