adium 3788:33aad553ecf4: 10.6 changes to projects and xcconfigs....
commits at adium.im
commits at adium.im
Mon Mar 28 21:28:05 UTC 2011
details: http://hg.adium.im/adium/rev/33aad553ecf4
revision: 3788:33aad553ecf4
branch: (none)
author: Adrian Godoroja <robotive at me.com>
date: Tue Mar 29 00:27:47 2011 +0300
10.6 changes to projects and xcconfigs. Moving to LLVM Clang.
diffs (269 lines):
diff -r d2e2842de122 -r 33aad553ecf4 Frameworks/AutoHyperlinks Framework/xcconfigs/AutoHyperlinks.xcconfig
--- a/Frameworks/AutoHyperlinks Framework/xcconfigs/AutoHyperlinks.xcconfig Mon Mar 28 23:00:00 2011 +0200
+++ b/Frameworks/AutoHyperlinks Framework/xcconfigs/AutoHyperlinks.xcconfig Tue Mar 29 00:27:47 2011 +0300
@@ -3,7 +3,7 @@
GCC_WARN_CHECK_SWITCH_STATEMENTS = YES
GCC_WARN_SHADOW = YES
GCC_C_LANGUAGE_STANDARD = gnu99
-GCC_VERSION = 4.2
+GCC_VERSION = com.apple.compilers.llvm.clang.1_0
SDKROOT = macosx10.6
SYMROOT = ../../build
MACOSX_DEPLOYMENT_TARGET = 10.6
diff -r d2e2842de122 -r 33aad553ecf4 Frameworks/AutoHyperlinks Framework/xcconfigs/Release.xcconfig
--- a/Frameworks/AutoHyperlinks Framework/xcconfigs/Release.xcconfig Mon Mar 28 23:00:00 2011 +0200
+++ b/Frameworks/AutoHyperlinks Framework/xcconfigs/Release.xcconfig Tue Mar 29 00:27:47 2011 +0300
@@ -1,5 +1,5 @@
#include "AutoHyperlinks.xcconfig"
-ARCHS = x86_64 i386 ppc
+ARCHS = x86_64 i386
DEPLOYMENT_POSTPROCESSING = YES
APPLY_RULES_IN_COPY_FILES = YES
GCC_DEBUGGING_SYMBOLS = used
diff -r d2e2842de122 -r 33aad553ecf4 Frameworks/FriBidi Framework/Debug.xcconfig
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/Frameworks/FriBidi Framework/Debug.xcconfig Tue Mar 29 00:27:47 2011 +0300
@@ -0,0 +1,14 @@
+#include "FriBidi.xcconfig"
+
+COPY_PHASE_STRIP = NO
+DYLIB_CURRENT_VERSION = 1
+GCC_OPTIMIZATION_LEVEL = 0
+FRAMEWORK_VERSION = A
+WRAPPER_EXTENSION = framework
+GCC_PRECOMPILE_PREFIX_HEADER = YES
+GCC_PREFIX_HEADER = FriBidi_Prefix.pch
+INFOPLIST_FILE = Info.plist
+LD_DYLIB_INSTALL_NAME = @rpath/FriBidi.framework/Versions/A/FriBidi
+GCC_DYNAMIC_NO_PIC = NO
+DYLIB_COMPATIBILITY_VERSION = 1
+PRODUCT_NAME = FriBidi
diff -r d2e2842de122 -r 33aad553ecf4 Frameworks/FriBidi Framework/FriBidi.xcconfig
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/Frameworks/FriBidi Framework/FriBidi.xcconfig Tue Mar 29 00:27:47 2011 +0300
@@ -0,0 +1,8 @@
+SYMROOT = ../../build
+APPLY_RULES_IN_COPY_FILES = YES
+INFOPLIST_OUTPUT_FORMAT = binary
+SDKROOT = macosx10.6
+GCC_VERSION = com.apple.compilers.llvm.clang.1_0
+GCC_PREPROCESSOR_DEFINITIONS = HAVE_CONFIG_H
+PLIST_FILE_OUTPUT_FORMAT = binary
+ARCHS = x86_64 i386
diff -r d2e2842de122 -r 33aad553ecf4 Frameworks/FriBidi Framework/FriBidi.xcodeproj/project.pbxproj
--- a/Frameworks/FriBidi Framework/FriBidi.xcodeproj/project.pbxproj Mon Mar 28 23:00:00 2011 +0200
+++ b/Frameworks/FriBidi Framework/FriBidi.xcodeproj/project.pbxproj Tue Mar 29 00:27:47 2011 +0300
@@ -8,6 +8,10 @@
/* Begin PBXBuildFile section */
8DC2EF570486A6940098B216 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7B1FEA5585E11CA2CBB /* Cocoa.framework */; };
+ 9719EEF2134129210030317B /* Debug.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 9719EEEC134129210030317B /* Debug.xcconfig */; };
+ 9719EEF3134129210030317B /* Release-Debug.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 9719EEED134129210030317B /* Release-Debug.xcconfig */; };
+ 9719EEF4134129210030317B /* Release.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 9719EEEE134129210030317B /* Release.xcconfig */; };
+ 9719EEF6134129210030317B /* FriBidi.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 9719EEF0134129210030317B /* FriBidi.xcconfig */; };
EE5B50140A9B6C8400B8BC5F /* fribidi_char_sets_cap_rtl.h in Headers */ = {isa = PBXBuildFile; fileRef = EE5B4FEC0A9B6C8400B8BC5F /* fribidi_char_sets_cap_rtl.h */; settings = {ATTRIBUTES = (Public, ); }; };
EE5B50150A9B6C8400B8BC5F /* fribidi_char_sets_cap_rtl.c in Sources */ = {isa = PBXBuildFile; fileRef = EE5B4FED0A9B6C8400B8BC5F /* fribidi_char_sets_cap_rtl.c */; };
EE5B50170A9B6C8400B8BC5F /* fribidi_char_sets_cp1255.c in Sources */ = {isa = PBXBuildFile; fileRef = EE5B4FEF0A9B6C8400B8BC5F /* fribidi_char_sets_cp1255.c */; };
@@ -57,6 +61,10 @@
32DBCF5E0370ADEE00C91783 /* FriBidi_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FriBidi_Prefix.pch; sourceTree = "<group>"; };
8DC2EF5A0486A6940098B216 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; };
8DC2EF5B0486A6940098B216 /* FriBidi.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = FriBidi.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+ 9719EEEC134129210030317B /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Debug.xcconfig; sourceTree = "<group>"; };
+ 9719EEED134129210030317B /* Release-Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = "Release-Debug.xcconfig"; sourceTree = "<group>"; };
+ 9719EEEE134129210030317B /* Release.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Release.xcconfig; sourceTree = "<group>"; };
+ 9719EEF0134129210030317B /* FriBidi.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = FriBidi.xcconfig; sourceTree = "<group>"; };
EE5B4FEB0A9B6C8400B8BC5F /* fribidi_benchmark.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = fribidi_benchmark.c; path = "fribidi-0.10.7/fribidi_benchmark.c"; sourceTree = "<group>"; };
EE5B4FEC0A9B6C8400B8BC5F /* fribidi_char_sets_cap_rtl.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = fribidi_char_sets_cap_rtl.h; path = "fribidi-0.10.7/fribidi_char_sets_cap_rtl.h"; sourceTree = "<group>"; };
EE5B4FED0A9B6C8400B8BC5F /* fribidi_char_sets_cap_rtl.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = fribidi_char_sets_cap_rtl.c; path = "fribidi-0.10.7/fribidi_char_sets_cap_rtl.c"; sourceTree = "<group>"; };
@@ -133,6 +141,7 @@
32C88DFF0371C24200C91783 /* Other Sources */,
089C1665FE841158C02AAC07 /* Resources */,
0867D69AFE84028FC02AAC07 /* External Frameworks and Libraries */,
+ 9719EEE9134128D00030317B /* xcconfigs */,
034768DFFF38A50411DB9C8B /* Products */,
EE5B50D80A9B757700B8BC5F /* FriBidiTest-Info.plist */,
);
@@ -192,6 +201,17 @@
name = "Other Sources";
sourceTree = "<group>";
};
+ 9719EEE9134128D00030317B /* xcconfigs */ = {
+ isa = PBXGroup;
+ children = (
+ 9719EEF0134129210030317B /* FriBidi.xcconfig */,
+ 9719EEEE134129210030317B /* Release.xcconfig */,
+ 9719EEED134129210030317B /* Release-Debug.xcconfig */,
+ 9719EEEC134129210030317B /* Debug.xcconfig */,
+ );
+ name = xcconfigs;
+ sourceTree = "<group>";
+ };
EE5B4FE80A9B6C5200B8BC5F /* fribidi */ = {
isa = PBXGroup;
children = (
@@ -322,6 +342,10 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
+ 9719EEF2134129210030317B /* Debug.xcconfig in Resources */,
+ 9719EEF3134129210030317B /* Release-Debug.xcconfig in Resources */,
+ 9719EEF4134129210030317B /* Release.xcconfig in Resources */,
+ 9719EEF6134129210030317B /* FriBidi.xcconfig in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -369,10 +393,12 @@
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = FriBidi_Prefix.pch;
+ GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
INFOPLIST_FILE = Info.plist;
LD_DYLIB_INSTALL_NAME = "@rpath/FriBidi.framework/Versions/A/FriBidi";
PRODUCT_NAME = FriBidi;
SDKROOT = macosx10.6;
+ VALID_ARCHS = "i386 x86_64";
WRAPPER_EXTENSION = framework;
};
name = Debug;
@@ -386,6 +412,7 @@
GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = FriBidi_Prefix.pch;
+ GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
INFOPLIST_FILE = Info.plist;
LD_DYLIB_INSTALL_NAME = "@rpath/FriBidi.framework/Versions/A/FriBidi";
PRODUCT_NAME = FriBidi;
@@ -396,6 +423,7 @@
};
1DEB91B208733DA50010E9CD /* Debug */ = {
isa = XCBuildConfiguration;
+ baseConfigurationReference = 9719EEEC134129210030317B /* Debug.xcconfig */;
buildSettings = {
ARCHS = "$(NATIVE_ARCH_ACTUAL)";
GCC_PREPROCESSOR_DEFINITIONS = HAVE_CONFIG_H;
@@ -409,6 +437,7 @@
};
1DEB91B308733DA50010E9CD /* Release */ = {
isa = XCBuildConfiguration;
+ baseConfigurationReference = 9719EEEE134129210030317B /* Release.xcconfig */;
buildSettings = {
APPLY_RULES_IN_COPY_FILES = YES;
ARCHS = (
@@ -426,6 +455,7 @@
};
346637AD0D415806006C9034 /* Release-Debug */ = {
isa = XCBuildConfiguration;
+ baseConfigurationReference = 9719EEED134129210030317B /* Release-Debug.xcconfig */;
buildSettings = {
APPLY_RULES_IN_COPY_FILES = YES;
ARCHS = (
@@ -450,6 +480,7 @@
GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = FriBidi_Prefix.pch;
+ GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
INFOPLIST_FILE = Info.plist;
LD_DYLIB_INSTALL_NAME = "@rpath/FriBidi.framework/Versions/A/FriBidi";
PRODUCT_NAME = FriBidi;
diff -r d2e2842de122 -r 33aad553ecf4 Frameworks/FriBidi Framework/Release-Debug.xcconfig
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/Frameworks/FriBidi Framework/Release-Debug.xcconfig Tue Mar 29 00:27:47 2011 +0300
@@ -0,0 +1,12 @@
+#include "FriBidi.xcconfig"
+
+DYLIB_COMPATIBILITY_VERSION = 1
+FRAMEWORK_VERSION = A
+DYLIB_CURRENT_VERSION = 1
+GCC_PREFIX_HEADER = FriBidi_Prefix.pch
+INFOPLIST_FILE = Info.plist
+GCC_PRECOMPILE_PREFIX_HEADER = YES
+LD_DYLIB_INSTALL_NAME = @rpath/FriBidi.framework/Versions/A/FriBidi
+PRODUCT_NAME = FriBidi
+WRAPPER_EXTENSION = framework
+GCC_GENERATE_DEBUGGING_SYMBOLS = NO
diff -r d2e2842de122 -r 33aad553ecf4 Frameworks/FriBidi Framework/Release.xcconfig
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/Frameworks/FriBidi Framework/Release.xcconfig Tue Mar 29 00:27:47 2011 +0300
@@ -0,0 +1,12 @@
+#include "FriBidi.xcconfig"
+
+DYLIB_COMPATIBILITY_VERSION = 1
+FRAMEWORK_VERSION = A
+DYLIB_CURRENT_VERSION = 1
+GCC_PREFIX_HEADER = FriBidi_Prefix.pch
+INFOPLIST_FILE = Info.plist
+GCC_PRECOMPILE_PREFIX_HEADER = YES
+LD_DYLIB_INSTALL_NAME = @rpath/FriBidi.framework/Versions/A/FriBidi
+PRODUCT_NAME = FriBidi
+WRAPPER_EXTENSION = framework
+GCC_GENERATE_DEBUGGING_SYMBOLS = NO
diff -r d2e2842de122 -r 33aad553ecf4 Frameworks/RBSplitView/RB.xcconfig
--- a/Frameworks/RBSplitView/RB.xcconfig Mon Mar 28 23:00:00 2011 +0200
+++ b/Frameworks/RBSplitView/RB.xcconfig Tue Mar 29 00:27:47 2011 +0300
@@ -5,6 +5,7 @@
PREBINDING = NO
ZERO_LINK = NO
LINK_WITH_STANDARD_LIBRARIES = YES
+GCC_VERSION = com.apple.compilers.llvm.clang.1_0
GCC_OPTIMIZATION_LEVEL = s
GCC_REUSE_STRINGS = YES
GCC_TREAT_WARNINGS_AS_ERRORS = YES
diff -r d2e2842de122 -r 33aad553ecf4 Frameworks/RBSplitView/RBSplitView.xcodeproj/project.pbxproj
--- a/Frameworks/RBSplitView/RBSplitView.xcodeproj/project.pbxproj Mon Mar 28 23:00:00 2011 +0200
+++ b/Frameworks/RBSplitView/RBSplitView.xcodeproj/project.pbxproj Tue Mar 29 00:27:47 2011 +0300
@@ -392,7 +392,11 @@
};
buildConfigurationList = D50F206F08A01A630073A261 /* Build configuration list for PBXProject "RBSplitView" */;
compatibilityVersion = "Xcode 3.1";
+ developmentRegion = English;
hasScannedForEncodings = 1;
+ knownRegions = (
+ en,
+ );
mainGroup = 0259C574FE90428111CA0C5A /* RBSplitView */;
projectDirPath = "";
projectRoot = "";
diff -r d2e2842de122 -r 33aad553ecf4 Plists/Info.plist
--- a/Plists/Info.plist Mon Mar 28 23:00:00 2011 +0200
+++ b/Plists/Info.plist Tue Mar 29 00:27:47 2011 +0300
@@ -473,7 +473,7 @@
<key>LSApplicationCategoryType</key>
<string>public.app-category.social-networking</string>
<key>LSMinimumSystemVersion</key>
- <string>10.5.8</string>
+ <string>10.6.0</string>
<key>LSMinimumSystemVersionByArchitecture</key>
<dict>
<key>x86_64</key>
diff -r d2e2842de122 -r 33aad553ecf4 xcconfigs/Adium.xcconfig
--- a/xcconfigs/Adium.xcconfig Mon Mar 28 23:00:00 2011 +0200
+++ b/xcconfigs/Adium.xcconfig Tue Mar 29 00:27:47 2011 +0300
@@ -10,6 +10,5 @@
LD_RUNPATH_SEARCH_PATHS = @executable_path/../Frameworks
HEADER_SEARCH_PATHS = $(HEADER_SEARCH_PATHS_QUOTED_FOR_TARGET_1) $(HEADER_SEARCH_PATHS_QUOTED_FOR_TARGET_2) $(HEADER_SEARCH_PATHS_QUOTED_FOR_TARGET_3) $(HEADER_SEARCH_PATHS_QUOTED_FOR_TARGET_4)
OTHER_CFLAGS = $(CFLAGS) -fno-builtin-strndup
-OTHER_LDFLAGS[arch=ppc] = -framework QuickTime
OTHER_LDFLAGS[arch=i386] = -framework QuickTime
OTHER_LDFLAGS[arch=x86_64] = -framework QTKit
diff -r d2e2842de122 -r 33aad553ecf4 xcconfigs/Base.xcconfig
--- a/xcconfigs/Base.xcconfig Mon Mar 28 23:00:00 2011 +0200
+++ b/xcconfigs/Base.xcconfig Tue Mar 29 00:27:47 2011 +0300
@@ -5,7 +5,7 @@
GCC_WARN_CHECK_SWITCH_STATEMENTS = YES
GCC_WARN_SHADOW = YES
GCC_C_LANGUAGE_STANDARD = gnu99
-GCC_VERSION = 4.2
+GCC_VERSION = com.apple.compilers.llvm.clang.1_0
SDKROOT = macosx10.6
MACOSX_DEPLOYMENT_TARGET = 10.6
GCC_WARN_ABOUT_MISSING_NEWLINE = YES
diff -r d2e2842de122 -r 33aad553ecf4 xcconfigs/Release.xcconfig
--- a/xcconfigs/Release.xcconfig Mon Mar 28 23:00:00 2011 +0200
+++ b/xcconfigs/Release.xcconfig Tue Mar 29 00:27:47 2011 +0300
@@ -1,5 +1,5 @@
#include "Base.xcconfig"
-ARCHS = x86_64 i386 ppc
+ARCHS = x86_64 i386
DEPLOYMENT_POSTPROCESSING = YES
APPLY_RULES_IN_COPY_FILES = YES
GCC_DEBUGGING_SYMBOLS = used
More information about the commits
mailing list