From 4a2c42fa64a7ecdfd9d38716333e31044be7812c Mon Sep 17 00:00:00 2001 From: Charlie Savage Date: Sun, 7 Jan 2024 12:25:49 -0800 Subject: [PATCH] Update xcode project. --- .../xcode/ruby-prof.xcodeproj/project.pbxproj | 60 ++++++++++--------- .../xcshareddata/xcschemes/ruby-prof.xcscheme | 8 +-- 2 files changed, 37 insertions(+), 31 deletions(-) diff --git a/ext/ruby_prof/xcode/ruby-prof.xcodeproj/project.pbxproj b/ext/ruby_prof/xcode/ruby-prof.xcodeproj/project.pbxproj index 00720a2f..170a68e1 100644 --- a/ext/ruby_prof/xcode/ruby-prof.xcodeproj/project.pbxproj +++ b/ext/ruby_prof/xcode/ruby-prof.xcodeproj/project.pbxproj @@ -3,12 +3,10 @@ archiveVersion = 1; classes = { }; - objectVersion = 50; + objectVersion = 54; objects = { /* Begin PBXBuildFile section */ - 8B0A595E25D0F18C0069FCD2 /* rp_aggregate_call_tree.c in Sources */ = {isa = PBXBuildFile; fileRef = 8B0A595825D0F18C0069FCD2 /* rp_aggregate_call_tree.c */; }; - 8B0A595F25D0F18C0069FCD2 /* rp_aggregate_call_tree.h in Headers */ = {isa = PBXBuildFile; fileRef = 8B0A595925D0F18C0069FCD2 /* rp_aggregate_call_tree.h */; }; 8B0A596025D0F18C0069FCD2 /* rp_call_trees.c in Sources */ = {isa = PBXBuildFile; fileRef = 8B0A595A25D0F18C0069FCD2 /* rp_call_trees.c */; }; 8B0A596125D0F18C0069FCD2 /* rp_call_tree.c in Sources */ = {isa = PBXBuildFile; fileRef = 8B0A595B25D0F18C0069FCD2 /* rp_call_tree.c */; }; 8B0A596225D0F18C0069FCD2 /* rp_call_trees.h in Headers */ = {isa = PBXBuildFile; fileRef = 8B0A595C25D0F18C0069FCD2 /* rp_call_trees.h */; }; @@ -17,8 +15,6 @@ 8B4E7E8C22B85D9400D53342 /* rp_profile.h in Headers */ = {isa = PBXBuildFile; fileRef = 8B4E7E8A22B85D9400D53342 /* rp_profile.h */; }; 8B4E7E8F22B85FD400D53342 /* rp_allocation.c in Sources */ = {isa = PBXBuildFile; fileRef = 8B4E7E8D22B85FD200D53342 /* rp_allocation.c */; }; 8B4E7E9022B85FD400D53342 /* rp_allocation.h in Headers */ = {isa = PBXBuildFile; fileRef = 8B4E7E8E22B85FD300D53342 /* rp_allocation.h */; }; - 8B64BCD4294F00700075D4FF /* libruby.3.1.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 8B64BCD3294F00700075D4FF /* libruby.3.1.dylib */; }; - 8B64BCD6294F08050075D4FF /* ruby_prof.bundle in CopyFiles */ = {isa = PBXBuildFile; fileRef = 8B6DDF9C22A22C8100F36350 /* ruby_prof.bundle */; }; 8B6DDFAB22A22C8D00F36350 /* rp_method.c in Sources */ = {isa = PBXBuildFile; fileRef = 8B6DDF2822A21EA800F36350 /* rp_method.c */; }; 8B6DDFAC22A22C8D00F36350 /* rp_method.h in Sources */ = {isa = PBXBuildFile; fileRef = 8B6DDF2F22A21EA900F36350 /* rp_method.h */; }; 8B6DDFAD22A22C8D00F36350 /* rp_stack.c in Sources */ = {isa = PBXBuildFile; fileRef = 8B6DDF2322A21EA800F36350 /* rp_stack.c */; }; @@ -33,16 +29,18 @@ 8BF8C18122EFFDEC000751A9 /* rp_measure_process_time.c in Sources */ = {isa = PBXBuildFile; fileRef = 8BF8C17B22EFFDEB000751A9 /* rp_measure_process_time.c */; }; 8BF8C18222EFFDEC000751A9 /* rp_measure_memory.c in Sources */ = {isa = PBXBuildFile; fileRef = 8BF8C17C22EFFDEB000751A9 /* rp_measure_memory.c */; }; 8BF8C18322EFFDEC000751A9 /* rp_measure_wall_time.c in Sources */ = {isa = PBXBuildFile; fileRef = 8BF8C17D22EFFDEC000751A9 /* rp_measure_wall_time.c */; }; + C70069A82B4B3B9700E37304 /* libruby.3.2.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = C70069A62B4B3B7700E37304 /* libruby.3.2.dylib */; }; + C70069A92B4B3F1700E37304 /* ruby_prof.bundle in CopyFiles */ = {isa = PBXBuildFile; fileRef = 8B6DDF9C22A22C8100F36350 /* ruby_prof.bundle */; }; /* End PBXBuildFile section */ /* Begin PBXCopyFilesBuildPhase section */ 8B64BCD5294F07C80075D4FF /* CopyFiles */ = { isa = PBXCopyFilesBuildPhase; buildActionMask = 2147483647; - dstPath = "/usr/local/src/ruby-prof/lib/3.1"; + dstPath = "/usr/local/src/ruby-prof/ext/ruby_prof"; dstSubfolderSpec = 0; files = ( - 8B64BCD6294F08050075D4FF /* ruby_prof.bundle in CopyFiles */, + C70069A92B4B3F1700E37304 /* ruby_prof.bundle in CopyFiles */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -50,8 +48,6 @@ /* Begin PBXFileReference section */ 8B08734E22AF9C2900840594 /* libruby.2.5.5.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libruby.2.5.5.dylib; path = ../../../../../lib/libruby.2.5.5.dylib; sourceTree = ""; }; - 8B0A595825D0F18C0069FCD2 /* rp_aggregate_call_tree.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = rp_aggregate_call_tree.c; path = ../rp_aggregate_call_tree.c; sourceTree = ""; }; - 8B0A595925D0F18C0069FCD2 /* rp_aggregate_call_tree.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = rp_aggregate_call_tree.h; path = ../rp_aggregate_call_tree.h; sourceTree = ""; }; 8B0A595A25D0F18C0069FCD2 /* rp_call_trees.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = rp_call_trees.c; path = ../rp_call_trees.c; sourceTree = ""; }; 8B0A595B25D0F18C0069FCD2 /* rp_call_tree.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = rp_call_tree.c; path = ../rp_call_tree.c; sourceTree = ""; }; 8B0A595C25D0F18C0069FCD2 /* rp_call_trees.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = rp_call_trees.h; path = ../rp_call_trees.h; sourceTree = ""; }; @@ -81,6 +77,9 @@ 8BF8C17B22EFFDEB000751A9 /* rp_measure_process_time.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = rp_measure_process_time.c; path = ../rp_measure_process_time.c; sourceTree = ""; }; 8BF8C17C22EFFDEB000751A9 /* rp_measure_memory.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = rp_measure_memory.c; path = ../rp_measure_memory.c; sourceTree = ""; }; 8BF8C17D22EFFDEC000751A9 /* rp_measure_wall_time.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = rp_measure_wall_time.c; path = ../rp_measure_wall_time.c; sourceTree = ""; }; + C70069A22B4B3B4000E37304 /* Caskroom */ = {isa = PBXFileReference; lastKnownFileType = folder; name = Caskroom; path = ../../../../../Caskroom; sourceTree = ""; }; + C70069A42B4B3B5000E37304 /* Cellar */ = {isa = PBXFileReference; lastKnownFileType = folder; name = Cellar; path = ../../../../../Cellar; sourceTree = ""; }; + C70069A62B4B3B7700E37304 /* libruby.3.2.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libruby.3.2.dylib; path = ../../../../../Cellar/ruby/3.2.1/lib/libruby.3.2.dylib; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -88,7 +87,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 8B64BCD4294F00700075D4FF /* libruby.3.1.dylib in Frameworks */, + C70069A82B4B3B9700E37304 /* libruby.3.2.dylib in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -98,8 +97,6 @@ 8B6DDF1022A21E8200F36350 = { isa = PBXGroup; children = ( - 8B0A595825D0F18C0069FCD2 /* rp_aggregate_call_tree.c */, - 8B0A595925D0F18C0069FCD2 /* rp_aggregate_call_tree.h */, 8B0A595B25D0F18C0069FCD2 /* rp_call_tree.c */, 8B0A595D25D0F18C0069FCD2 /* rp_call_tree.h */, 8B0A595A25D0F18C0069FCD2 /* rp_call_trees.c */, @@ -141,6 +138,9 @@ 8B6DDF4622A2227300F36350 /* Frameworks */ = { isa = PBXGroup; children = ( + C70069A62B4B3B7700E37304 /* libruby.3.2.dylib */, + C70069A42B4B3B5000E37304 /* Cellar */, + C70069A22B4B3B4000E37304 /* Caskroom */, 8B64BCD3294F00700075D4FF /* libruby.3.1.dylib */, 8B0A596725D0F2090069FCD2 /* libruby.2.7.dylib */, 8B08734E22AF9C2900840594 /* libruby.2.5.5.dylib */, @@ -180,7 +180,6 @@ isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( - 8B0A595F25D0F18C0069FCD2 /* rp_aggregate_call_tree.h in Headers */, 8BF8C17F22EFFDEC000751A9 /* rp_measurement.h in Headers */, 8B4E7E9022B85FD400D53342 /* rp_allocation.h in Headers */, 8B0A596225D0F18C0069FCD2 /* rp_call_trees.h in Headers */, @@ -216,7 +215,8 @@ 8B6DDF1122A21E8200F36350 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 1020; + BuildIndependentTargetsInParallel = YES; + LastUpgradeCheck = 1510; ORGANIZATIONNAME = "Charlie Savage"; TargetAttributes = { 8B6DDF9B22A22C8100F36350 = { @@ -230,6 +230,7 @@ hasScannedForEncodings = 0; knownRegions = ( en, + Base, ); mainGroup = 8B6DDF1022A21E8200F36350; productRefGroup = 8B6DDF1A22A21E8200F36350 /* Products */; @@ -258,7 +259,6 @@ 8B6DDFB022A22C8D00F36350 /* rp_thread.h in Sources */, 8BF8C18022EFFDEC000751A9 /* rp_measure_allocations.c in Sources */, 8B6DDFB122A22C8D00F36350 /* ruby_prof.c in Sources */, - 8B0A595E25D0F18C0069FCD2 /* rp_aggregate_call_tree.c in Sources */, 8B6DDFB222A22C8D00F36350 /* ruby_prof.h in Sources */, 8BF8C18322EFFDEC000751A9 /* rp_measure_wall_time.c in Sources */, 8B0A596125D0F18C0069FCD2 /* rp_call_tree.c in Sources */, @@ -295,6 +295,7 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = NO; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -303,9 +304,11 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_IDENTITY = "-"; COPY_PHASE_STRIP = NO; + DEAD_CODE_STRIPPING = YES; DEBUG_INFORMATION_FORMAT = dwarf; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; + ENABLE_USER_SCRIPT_SANDBOXING = YES; GCC_C_LANGUAGE_STANDARD = c99; GCC_DYNAMIC_NO_PIC = NO; GCC_NO_COMMON_BLOCKS = YES; @@ -321,11 +324,11 @@ GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; HEADER_SEARCH_PATHS = ( - "/usr/local/Cellar/ruby/3.1.2/include/ruby-3.1.0", - "/usr/local/Cellar/ruby/3.1.2/include/ruby-3.1.0/x86_64-darwin21/**", + "/usr/local/Cellar/ruby/3.2.1/include/ruby-3.2.0", + "/usr/local/Cellar/ruby/3.2.1/include/ruby-3.2.0/x86_64-darwin22", ); - LIBRARY_SEARCH_PATHS = /usr/local/Cellar/ruby/3.1.2/lib; - MACOSX_DEPLOYMENT_TARGET = 10.14; + LIBRARY_SEARCH_PATHS = /usr/local/Cellar/ruby/3.2.1/lib; + MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)"; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; ONLY_ACTIVE_ARCH = YES; @@ -358,6 +361,7 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = NO; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -366,9 +370,11 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_IDENTITY = "-"; COPY_PHASE_STRIP = NO; + DEAD_CODE_STRIPPING = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_USER_SCRIPT_SANDBOXING = YES; GCC_C_LANGUAGE_STANDARD = c99; GCC_NO_COMMON_BLOCKS = YES; GCC_PREPROCESSOR_DEFINITIONS = ( @@ -382,11 +388,11 @@ GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; HEADER_SEARCH_PATHS = ( - "/usr/local/Cellar/ruby/3.1.2/include/ruby-3.1.0", - "/usr/local/Cellar/ruby/3.1.2/include/ruby-3.1.0/x86_64-darwin21/**", + "/usr/local/Cellar/ruby/3.2.1/include/ruby-3.2.0", + "/usr/local/Cellar/ruby/3.2.1/include/ruby-3.2.0/x86_64-darwin22", ); - LIBRARY_SEARCH_PATHS = /usr/local/Cellar/ruby/3.1.2/lib; - MACOSX_DEPLOYMENT_TARGET = 10.14; + LIBRARY_SEARCH_PATHS = /usr/local/Cellar/ruby/3.2.1/lib; + MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)"; MTL_ENABLE_DEBUG_INFO = NO; MTL_FAST_MATH = YES; SDKROOT = macosx; @@ -397,9 +403,9 @@ isa = XCBuildConfiguration; buildSettings = { CODE_SIGN_STYLE = Automatic; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; + DEAD_CODE_STRIPPING = YES; EXECUTABLE_EXTENSION = bundle; + MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)"; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; }; @@ -409,9 +415,9 @@ isa = XCBuildConfiguration; buildSettings = { CODE_SIGN_STYLE = Automatic; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; + DEAD_CODE_STRIPPING = YES; EXECUTABLE_EXTENSION = bundle; + MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)"; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; }; diff --git a/ext/ruby_prof/xcode/ruby-prof.xcodeproj/xcshareddata/xcschemes/ruby-prof.xcscheme b/ext/ruby_prof/xcode/ruby-prof.xcodeproj/xcshareddata/xcschemes/ruby-prof.xcscheme index 60643de6..da64870a 100644 --- a/ext/ruby_prof/xcode/ruby-prof.xcodeproj/xcshareddata/xcschemes/ruby-prof.xcscheme +++ b/ext/ruby_prof/xcode/ruby-prof.xcodeproj/xcshareddata/xcschemes/ruby-prof.xcscheme @@ -1,6 +1,6 @@ + FilePath = "/usr/local/Cellar/ruby/3.2.1/bin/ruby"> + argument = "" + isEnabled = "NO">