Commits

Tuukka Norri  committed be7d995

Separate configurations for gcc, clang
- Also removed an unneeded WEAK_IMPORT_ATTRIBUTE.

  • Participants
  • Parent commits 6a5c3b2

Comments (0)

Files changed (23)

File BaseTenAssistant/Sources/MKCAlternativeDataCellColumn.h

 @interface MKCAlternativeDataCellColumn : NSTableColumn 
 {
 }
-
 @end

File Resources/Info.plist

 	<string>${PRODUCT_NAME}</string>
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
-	<key>CFBundleShortVersionString</key>
-	<string>1</string>
 	<key>NSPrincipalClass</key>
 	<string></string>
 </dict>

File Sources/BXDatabaseContext.m

 {
 	BXDeprecationLog ();
 	NSError* localError = nil;
-	NSDictionary* retval = [mObjectModel entitiesBySchemaAndName: mDatabaseInterface reload: reload error: &localError];
+	NSDictionary* retval = [mObjectModel entitiesBySchemaAndName: self reload: reload error: &localError];
 	BXHandleError (outError, localError);
 	return retval;
 }

File Sources/BXPGClearLocksHandler.h

 
 #import <Foundation/Foundation.h>
 #import "BXPGAdditions.h"
-#import "BXPGNotificationHandler.h";
+#import "BXPGNotificationHandler.h"
 
 
 @interface BXPGClearLocksHandler : BXPGNotificationHandler

File Sources/BXPGLockHandler.h

 
 #import <Foundation/Foundation.h>
 #import "BXPGAdditions.h"
-#import "BXPGTableNotificationHandler.h";
+#import "BXPGTableNotificationHandler.h"
 
 
 @interface BXPGLockHandler : BXPGTableNotificationHandler

File Sources/BXPGQueryHandler.m

 	BXPGRelationshipFromItem* fromItem = [mapper firstFromItem];
 	
 	BXRelationshipDescription* rel = [fromItem relationship];	
-	NSArray* conditions = [rel BXPGVisitRelationship: self fromItem: fromItem];
+	NSArray* conditions = [rel BXPGVisitRelationship: (id) self fromItem: fromItem];
 	[[visitor currentFrame] addObjectsFromArray: conditions];
 	NSString* joined = [[visitor currentFrame] componentsJoinedByString: @" AND "];
 	[visitor removeFrame];

File Sources/BXSystemEventNotifier.m

 #import "BXValidationLock.h"
 
 #import "../BaseTenAppKit/Sources/BXAppKitSystemEventNotifier.h"
-Class BXAppKitSystemEventNotifierClass;
+Class BXAppKitSystemEventNotifierClass = Nil;
 
 
 
 	if (! tooLate)
 	{
 		tooLate = YES;
-		BXAppKitSystemEventNotifierClass = NSClassFromString (@"BXAppKitSystemEventNotifierClass");
+		BXAppKitSystemEventNotifierClass = NSClassFromString (@"BXAppKitSystemEventNotifier");
 	}
 }
 

File common-xcconfig/MacOSX10.4.xcconfig

+#include "gcc.xcconfig"
+
 GCC_VERSION_ppc = 4.0
 GCC_VERSION_i386 = 4.0
 GCC_VERSION_ppc64 = 4.2

File common-xcconfig/MacOSX10.5-6-clang.xcconfig

+#include "clang.xcconfig"
+
+GCC_VERSION = com.apple.compilers.llvm.clang.1_0
+
+MACOSX_DEPLOYMENT_TARGET_ppc = 10.5
+MACOSX_DEPLOYMENT_TARGET_i386 = 10.5
+MACOSX_DEPLOYMENT_TARGET_ppc64 = 10.5
+MACOSX_DEPLOYMENT_TARGET_x86_64 = 10.5
+MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(CURRENT_ARCH))
+
+SDKROOT_ppc = $(DEVELOPER_SDK_DIR)/MacOSX10.6.sdk
+SDKROOT_i386 = $(DEVELOPER_SDK_DIR)/MacOSX10.6.sdk
+SDKROOT_ppc64 = $(DEVELOPER_SDK_DIR)/MacOSX10.5.sdk
+SDKROOT_x86_64 = $(DEVELOPER_SDK_DIR)/MacOSX10.6.sdk
+SDKROOT = $(SDKROOT_$(CURRENT_ARCH))

File common-xcconfig/MacOSX10.5-6-gcc.xcconfig

+#include "gcc.xcconfig"
+
+// Architecture specifics are required by the PostgreSQL build script.
+GCC_VERSION_ppc = 4.2
+GCC_VERSION_i386 = 4.2
+GCC_VERSION_ppc64 = 4.2
+GCC_VERSION_x86_64 = 4.2
+GCC_VERSION = 4.2
+
+MACOSX_DEPLOYMENT_TARGET_ppc = 10.5
+MACOSX_DEPLOYMENT_TARGET_i386 = 10.5
+MACOSX_DEPLOYMENT_TARGET_ppc64 = 10.5
+MACOSX_DEPLOYMENT_TARGET_x86_64 = 10.5
+MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(CURRENT_ARCH))
+
+SDKROOT_ppc = $(DEVELOPER_SDK_DIR)/MacOSX10.6.sdk
+SDKROOT_i386 = $(DEVELOPER_SDK_DIR)/MacOSX10.6.sdk
+SDKROOT_ppc64 = $(DEVELOPER_SDK_DIR)/MacOSX10.5.sdk
+SDKROOT_x86_64 = $(DEVELOPER_SDK_DIR)/MacOSX10.6.sdk
+SDKROOT = $(SDKROOT_$(CURRENT_ARCH))

File common-xcconfig/MacOSX10.5-6.xcconfig

-// Architecture specifics are required by the PostgreSQL build script.
-GCC_VERSION_ppc = 4.2
-GCC_VERSION_i386 = 4.2
-GCC_VERSION_ppc64 = 4.2
-GCC_VERSION_x86_64 = 4.2
-GCC_VERSION = 4.2
-
-MACOSX_DEPLOYMENT_TARGET_ppc = 10.5
-MACOSX_DEPLOYMENT_TARGET_i386 = 10.5
-MACOSX_DEPLOYMENT_TARGET_ppc64 = 10.5
-MACOSX_DEPLOYMENT_TARGET_x86_64 = 10.5
-MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(CURRENT_ARCH))
-
-SDKROOT_ppc = $(DEVELOPER_SDK_DIR)/MacOSX10.6.sdk
-SDKROOT_i386 = $(DEVELOPER_SDK_DIR)/MacOSX10.6.sdk
-SDKROOT_ppc64 = $(DEVELOPER_SDK_DIR)/MacOSX10.5.sdk
-SDKROOT_x86_64 = $(DEVELOPER_SDK_DIR)/MacOSX10.6.sdk
-SDKROOT = $(SDKROOT_$(CURRENT_ARCH))

File common-xcconfig/MacOSX10.5.xcconfig

+#include "gcc.xcconfig"
+
 // Architecture specifics are required by the PostgreSQL build script.
 GCC_VERSION_ppc = 4.2
 GCC_VERSION_i386 = 4.2

File common-xcconfig/clang.xcconfig

+OTHER_CFLAGS = $(DOCUMENTATION_CFLAGS) -fblocks //-fcatch-undefined-behavior
+CLANG_WARNING_CFLAGS = -Werror -Wno-format

File common-xcconfig/common.xcconfig

 GCC_INLINES_ARE_PRIVATE_EXTERN = YES
 GCC_MODEL_TUNING = G5
 GCC_ONE_BYTE_BOOL = NO
-GCC_PRECOMPILE_PREFIX_HEADER = YES
 GCC_REUSE_STRINGS = YES
 GCC_SHORT_ENUMS = NO
-GCC_SYMBOLS_PRIVATE_EXTERN = NO
-GCC_TREAT_WARNINGS_AS_ERRORS = YES
 GCC_USE_GCC3_PFE_SUPPORT = YES
 GCC_OBJC_CALL_CXX_CDTORS = YES
 GCC_WARN_HIDDEN_VIRTUAL_FUNCTIONS = YES
 PREBINDING = NO
 SKIP_INSTALL = YES
 ZERO_LINK = NO
-WARNING_CFLAGS = -Wall
-OTHER_CFLAGS = -DUSE_SSL -DXCODEBUILD_TARGET_NAME="$(TARGET_NAME)" -DXCODEBUILD_PROJECT_NAME="$(PROJECT_NAME)" -DXCODEBUILD_PROJECT_FILE_PATH="$(PROJECT_FILE_PATH)"
+WARNING_CFLAGS = -Wall $(CLANG_WARNING_CFLAGS)
+GCC_PREPROCESSOR_DEFINITIONS = USE_SSL XCODEBUILD_TARGET_NAME="$(TARGET_NAME)" XCODEBUILD_PROJECT_NAME="$(PROJECT_NAME)" XCODEBUILD_PROJECT_FILE_PATH="$(PROJECT_FILE_PATH)"
 OTHER_LDFLAGS = $(COVERAGE_LDFLAGS)
 IBC_PLUGINS = $(BUILT_PRODUCTS_DIR)/BaseTen.ibplugin

File common-xcconfig/gcc.xcconfig

+GCC_PRECOMPILE_PREFIX_HEADER = YES
+GCC_SYMBOLS_PRIVATE_EXTERN = NO
+GCC_TREAT_WARNINGS_AS_ERRORS = YES

File xcconfig/cldoc-documentation.xcconfig

+#include "../common-xcconfig/gc.xcconfig"
+#include "../common-xcconfig/debug.xcconfig"
+#include "../common-xcconfig/MacOSX10.5-6-clang.xcconfig"
+#include "common.xcconfig"
+
+DOCUMENTATION_CFLAGS = -emit-ast

File xcconfig/common.xcconfig

-#include "../common-xcconfig/MacOSX10.5-6.xcconfig"
 #include "../common-xcconfig/common.xcconfig"
 #include "../common-xcconfig/framework.xcconfig"
 

File xcconfig/coverage-gc.xcconfig

 #include "../common-xcconfig/gc.xcconfig"
 #include "../common-xcconfig/debug.xcconfig"
 #include "../common-xcconfig/coverage.xcconfig"
+#include "../common-xcconfig/MacOSX10.5-6-gcc.xcconfig"
 #include "common.xcconfig"

File xcconfig/coverage-non-gc.xcconfig

 #include "../common-xcconfig/non-gc.xcconfig"
 #include "../common-xcconfig/debug.xcconfig"
 #include "../common-xcconfig/coverage.xcconfig"
+#include "../common-xcconfig/MacOSX10.5-6-gcc.xcconfig"
 #include "common.xcconfig"

File xcconfig/debug-gc.xcconfig

 #include "../common-xcconfig/gc.xcconfig"
 #include "../common-xcconfig/debug.xcconfig"
+#include "../common-xcconfig/MacOSX10.5-6-gcc.xcconfig"
 #include "common.xcconfig"

File xcconfig/debug-non-gc.xcconfig

 #include "../common-xcconfig/non-gc.xcconfig"
 #include "../common-xcconfig/debug.xcconfig"
+#include "../common-xcconfig/MacOSX10.5-6-gcc.xcconfig"
 #include "common.xcconfig"

File xcconfig/release-gc.xcconfig

 #include "../common-xcconfig/gc.xcconfig"
 #include "../common-xcconfig/release.xcconfig"
+#include "../common-xcconfig/MacOSX10.5-6-gcc.xcconfig"
 #include "common.xcconfig"
 
 INSTALL_PATH = @executable_path/../Frameworks

File xcconfig/release-non-gc.xcconfig

 #include "../common-xcconfig/non-gc.xcconfig"
 #include "../common-xcconfig/release.xcconfig"
+#include "../common-xcconfig/MacOSX10.5-6-gcc.xcconfig"
 #include "common.xcconfig"
 
 INSTALL_PATH = @executable_path/../Frameworks