Upgrading ITFoundation to Xcode 3.0 and the Mac OS X 10.5 SDK.

diff --git a/ITCategory-NSObject.m b/ITCategory-NSObject.m
index 36b59c5..ecd1a97 100644 (file)
--- a/ITCategory-NSObject.m
+++ b/ITCategory-NSObject.m
@@ -8,7 +8,7 @@
        NSMutableArray *tempArray;
        NSArray *resultArray;
        Class *classes;
        NSMutableArray *tempArray;
        NSArray *resultArray;
        Class *classes;

-       struct objc_class *superClass;
+       Class superClass;

        Class *current;
        int count, newCount, index;
        tempArray = [[NSMutableArray allocWithZone:nil] initWithCapacity:12];
        Class *current;
        int count, newCount, index;
        tempArray = [[NSMutableArray allocWithZone:nil] initWithCapacity:12];


@@ -35,14 +35,14 @@
                        const Class thisClass = [self class];
                        current = classes;
                        for (index = 0; index < count; ++index) {
                        const Class thisClass = [self class];
                        current = classes;
                        for (index = 0; index < count; ++index) {

-                               superClass = (*current)->super_class;
+                               superClass = class_getSuperclass((*current));

                                if (superClass) {
                                        do {
                                                if (superClass == thisClass) {
                                                        [tempArray addObject:*current];
                                                        break;
                                                }
                                if (superClass) {
                                        do {
                                                if (superClass == thisClass) {
                                                        [tempArray addObject:*current];
                                                        break;
                                                }

-                                               superClass = superClass->super_class;
+                                               superClass = class_getSuperclass(superClass);

                                        } while (superClass);
                                }
                                ++current;
                                        } while (superClass);
                                }
                                ++current;


@@ -87,7 +87,7 @@
                        current = classes;
 
                        for (index = 0; index < count; ++index) {
                        current = classes;
 
                        for (index = 0; index < count; ++index) {

-                               if ((*current)->super_class == thisClass) {
+                               if (class_getSuperclass((*current)) == thisClass) {

                                        [tempArray addObject:*current];
                                }
                                ++current;
                                        [tempArray addObject:*current];
                                }
                                ++current;

diff --git a/ITFoundation.xcodeproj/project.pbxproj b/ITFoundation.xcodeproj/project.pbxproj
index 67f071f..05cf1c7 100644 (file)
--- a/ITFoundation.xcodeproj/project.pbxproj
+++ b/ITFoundation.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
        archiveVersion = 1;
        classes = {
        };
        archiveVersion = 1;
        classes = {
        };

-       objectVersion = 42;
+       objectVersion = 44;

        objects = {
 
 /* Begin PBXBuildFile section */
        objects = {
 
 /* Begin PBXBuildFile section */


@@ -256,7 +256,7 @@
                0867D690FE84028FC02AAC07 /* Project object */ = {
                        isa = PBXProject;
                        buildConfigurationList = 7CC441C208A83AFA001BCF9B /* Build configuration list for PBXProject "ITFoundation" */;
                0867D690FE84028FC02AAC07 /* Project object */ = {
                        isa = PBXProject;
                        buildConfigurationList = 7CC441C208A83AFA001BCF9B /* Build configuration list for PBXProject "ITFoundation" */;

-                       compatibilityVersion = "Xcode 2.4";
+                       compatibilityVersion = "Xcode 3.0";

                        hasScannedForEncodings = 1;
                        mainGroup = 0867D691FE84028FC02AAC07 /* ITFoundation */;
                        productRefGroup = 034768DFFF38A50411DB9C8B /* Products */;
                        hasScannedForEncodings = 1;
                        mainGroup = 0867D691FE84028FC02AAC07 /* ITFoundation */;
                        productRefGroup = 034768DFFF38A50411DB9C8B /* Products */;


@@ -329,11 +329,6 @@
                                COPY_PHASE_STRIP = NO;
                                DYLIB_COMPATIBILITY_VERSION = 1;
                                DYLIB_CURRENT_VERSION = 1;
                                COPY_PHASE_STRIP = NO;
                                DYLIB_COMPATIBILITY_VERSION = 1;
                                DYLIB_CURRENT_VERSION = 1;

-                               FRAMEWORK_SEARCH_PATHS = (
-                                       "$(FRAMEWORK_SEARCH_PATHS)",
-                                       "$(SYSTEM_DEVELOPER_DIR)/SDKs/MacOSX10.4u.sdk/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks",
-                                       "$(SYSTEM_DEVELOPER_DIR)/SDKs/MacOSX10.4u.sdk/System/Library/Frameworks",
-                               );

                                FRAMEWORK_VERSION = A;
                                GCC_DYNAMIC_NO_PIC = NO;
                                GCC_ENABLE_FIX_AND_CONTINUE = YES;
                                FRAMEWORK_VERSION = A;
                                GCC_DYNAMIC_NO_PIC = NO;
                                GCC_ENABLE_FIX_AND_CONTINUE = YES;


@@ -345,7 +340,6 @@
                                INSTALL_PATH = "@executable_path/../Frameworks";
                                LIBRARY_STYLE = DYNAMIC;
                                MACH_O_TYPE = mh_dylib;
                                INSTALL_PATH = "@executable_path/../Frameworks";
                                LIBRARY_STYLE = DYNAMIC;
                                MACH_O_TYPE = mh_dylib;

-                               MACOSX_DEPLOYMENT_TARGET = 10.2;

                                OTHER_LDFLAGS = (
                                        "-seg1addr",
                                        0x15000000,
                                OTHER_LDFLAGS = (
                                        "-seg1addr",
                                        0x15000000,


@@ -362,11 +356,6 @@
                                COPY_PHASE_STRIP = YES;
                                DYLIB_COMPATIBILITY_VERSION = 1;
                                DYLIB_CURRENT_VERSION = 1;
                                COPY_PHASE_STRIP = YES;
                                DYLIB_COMPATIBILITY_VERSION = 1;
                                DYLIB_CURRENT_VERSION = 1;

-                               FRAMEWORK_SEARCH_PATHS = (
-                                       "$(FRAMEWORK_SEARCH_PATHS)",
-                                       "$(SYSTEM_DEVELOPER_DIR)/SDKs/MacOSX10.4u.sdk/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks",
-                                       "$(SYSTEM_DEVELOPER_DIR)/SDKs/MacOSX10.4u.sdk/System/Library/Frameworks",
-                               );

                                FRAMEWORK_VERSION = A;
                                GCC_ENABLE_FIX_AND_CONTINUE = NO;
                                GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
                                FRAMEWORK_VERSION = A;
                                GCC_ENABLE_FIX_AND_CONTINUE = NO;
                                GCC_GENERATE_DEBUGGING_SYMBOLS = NO;


@@ -376,7 +365,6 @@
                                INSTALL_PATH = "@executable_path/../Frameworks";
                                LIBRARY_STYLE = DYNAMIC;
                                MACH_O_TYPE = mh_dylib;
                                INSTALL_PATH = "@executable_path/../Frameworks";
                                LIBRARY_STYLE = DYNAMIC;
                                MACH_O_TYPE = mh_dylib;

-                               MACOSX_DEPLOYMENT_TARGET = 10.2;

                                OTHER_LDFLAGS = (
                                        "-seg1addr",
                                        0x15000000,
                                OTHER_LDFLAGS = (
                                        "-seg1addr",
                                        0x15000000,


@@ -387,70 +375,26 @@
                        };
                        name = Release;
                };
                        };
                        name = Release;
                };

-               7CC441C108A83AFA001BCF9B /* Default */ = {
-                       isa = XCBuildConfiguration;
-                       buildSettings = {
-                               DYLIB_COMPATIBILITY_VERSION = 1;
-                               DYLIB_CURRENT_VERSION = 1;
-                               FRAMEWORK_SEARCH_PATHS = (
-                                       "$(FRAMEWORK_SEARCH_PATHS)",
-                                       "$(SYSTEM_DEVELOPER_DIR)/SDKs/MacOSX10.4u.sdk/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks",
-                                       "$(SYSTEM_DEVELOPER_DIR)/SDKs/MacOSX10.4u.sdk/System/Library/Frameworks",
-                               );
-                               FRAMEWORK_VERSION = A;
-                               GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
-                               GCC_PRECOMPILE_PREFIX_HEADER = YES;
-                               GCC_PREFIX_HEADER = ITFoundation_Prefix.pch;
-                               INFOPLIST_FILE = Info.plist;
-                               INSTALL_PATH = "@executable_path/../Frameworks";
-                               LIBRARY_STYLE = DYNAMIC;
-                               MACH_O_TYPE = mh_dylib;
-                               MACOSX_DEPLOYMENT_TARGET = 10.2;
-                               OTHER_LDFLAGS = (
-                                       "-seg1addr",
-                                       0x15000000,
-                               );
-                               PRODUCT_NAME = ITFoundation;
-                               WRAPPER_EXTENSION = framework;
-                       };
-                       name = Default;
-               };

                7CC441C308A83AFA001BCF9B /* Debug */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
                7CC441C308A83AFA001BCF9B /* Debug */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {

-                               ARCHS = (
-                                       ppc,
-                                       i386,
-                               );
-                               MACOSX_DEPLOYMENT_TARGET = 10.2;
-                               SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
+                               ARCHS = "$(ONLY_ACTIVE_ARCH_PRE_XCODE_3_1)";
+                               MACOSX_DEPLOYMENT_TARGET = 10.5;
+                               ONLY_ACTIVE_ARCH_PRE_XCODE_3_1 = "$(NATIVE_ARCH_ACTUAL)";
+                               SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.5.sdk";

                        };
                        name = Debug;
                };
                7CC441C408A83AFA001BCF9B /* Release */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
                        };
                        name = Debug;
                };
                7CC441C408A83AFA001BCF9B /* Release */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {

-                               ARCHS = (
-                                       ppc,
-                                       i386,
-                               );
-                               MACOSX_DEPLOYMENT_TARGET = 10.2;
-                               SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
+                               ARCHS = "$(ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1)";
+                               ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1 = "x86_64 i386 ppc";
+                               MACOSX_DEPLOYMENT_TARGET = 10.5;
+                               SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.5.sdk";

                        };
                        name = Release;
                };
                        };
                        name = Release;
                };

-               7CC441C508A83AFA001BCF9B /* Default */ = {
-                       isa = XCBuildConfiguration;
-                       buildSettings = {
-                               ARCHS = (
-                                       ppc,
-                                       i386,
-                               );
-                               MACOSX_DEPLOYMENT_TARGET = 10.2;
-                               SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
-                       };
-                       name = Default;
-               };

 /* End XCBuildConfiguration section */
 
 /* Begin XCConfigurationList section */
 /* End XCBuildConfiguration section */
 
 /* Begin XCConfigurationList section */


@@ -459,20 +403,18 @@
                        buildConfigurations = (
                                7CC441BF08A83AFA001BCF9B /* Debug */,
                                7CC441C008A83AFA001BCF9B /* Release */,
                        buildConfigurations = (
                                7CC441BF08A83AFA001BCF9B /* Debug */,
                                7CC441C008A83AFA001BCF9B /* Release */,

-                               7CC441C108A83AFA001BCF9B /* Default */,

                        );
                        defaultConfigurationIsVisible = 0;
                        );
                        defaultConfigurationIsVisible = 0;

-                       defaultConfigurationName = Default;
+                       defaultConfigurationName = Release;

                };
                7CC441C208A83AFA001BCF9B /* Build configuration list for PBXProject "ITFoundation" */ = {
                        isa = XCConfigurationList;
                        buildConfigurations = (
                                7CC441C308A83AFA001BCF9B /* Debug */,
                                7CC441C408A83AFA001BCF9B /* Release */,
                };
                7CC441C208A83AFA001BCF9B /* Build configuration list for PBXProject "ITFoundation" */ = {
                        isa = XCConfigurationList;
                        buildConfigurations = (
                                7CC441C308A83AFA001BCF9B /* Debug */,
                                7CC441C408A83AFA001BCF9B /* Release */,

-                               7CC441C508A83AFA001BCF9B /* Default */,

                        );
                        defaultConfigurationIsVisible = 0;
                        );
                        defaultConfigurationIsVisible = 0;

-                       defaultConfigurationName = Default;
+                       defaultConfigurationName = Release;

                };
 /* End XCConfigurationList section */
        };
                };
 /* End XCConfigurationList section */
        };