Skip to content

Commit 5f74817

Browse files
thomthomthomthom
committed
Eliminate two targets for Ruby 2.7.
Only a single 2.7 universal binary.
1 parent 193dbe1 commit 5f74817

File tree

1 file changed

+10
-122
lines changed

1 file changed

+10
-122
lines changed

‎Hello World/SUEX_HelloWorld.xcodeproj/project.pbxproj

Lines changed: 10 additions & 122 deletions
Original file line numberDiff line numberDiff line change
@@ -12,21 +12,16 @@
1212
33CDE7B918270A4800F7C6E8 /* RubyLib.h in Headers */ = {isa = PBXBuildFile; fileRef = 33CDE7B618270A4800F7C6E8 /* RubyLib.h */; };
1313
33CDE7BA18270A4800F7C6E8 /* RubyUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 33CDE7B718270A4800F7C6E8 /* RubyUtils.cpp */; };
1414
33CDE7BB18270A4800F7C6E8 /* RubyUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = 33CDE7B818270A4800F7C6E8 /* RubyUtils.h */; };
15-
CE6B4470211DA18D006A1F2E /* Ruby.Framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CE6B446F211DA18D006A1F2E /* Ruby.Framework */; };
16-
CEC02B4226C66FCE00934F5F /* SUEX_HelloWorld.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 33CDE7AF182705EB00F7C6E8 /* SUEX_HelloWorld.cpp */; };
17-
CEC02B4326C66FCE00934F5F /* RubyUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 33CDE7B718270A4800F7C6E8 /* RubyUtils.cpp */; };
18-
CEC02B4726C66FCE00934F5F /* RubyLib.h in Headers */ = {isa = PBXBuildFile; fileRef = 33CDE7B618270A4800F7C6E8 /* RubyLib.h */; };
19-
CEC02B4826C66FCE00934F5F /* RubyUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = 33CDE7B818270A4800F7C6E8 /* RubyUtils.h */; };
20-
CEC02B5726C66FF600934F5F /* Ruby.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CEC02B3F26C66FC100934F5F /* Ruby.framework */; };
2115
E939EB2221120EE20023B67B /* SUEX_HelloWorld.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 33CDE7AF182705EB00F7C6E8 /* SUEX_HelloWorld.cpp */; };
2216
E939EB2321120EE20023B67B /* RubyUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 33CDE7B718270A4800F7C6E8 /* RubyUtils.cpp */; };
2317
E939EB2821120EE20023B67B /* RubyLib.h in Headers */ = {isa = PBXBuildFile; fileRef = 33CDE7B618270A4800F7C6E8 /* RubyLib.h */; };
2418
E939EB2921120EE20023B67B /* RubyUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = 33CDE7B818270A4800F7C6E8 /* RubyUtils.h */; };
19+
E93B35442705ED4100A175B3 /* Ruby.Framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CE6B446F211DA18D006A1F2E /* Ruby.Framework */; };
20+
E93B35452705ED6400A175B3 /* Ruby.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CEC02B3F26C66FC100934F5F /* Ruby.framework */; };
2521
E99766C1252CB0AD00B1D8E9 /* SUEX_HelloWorld.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 33CDE7AF182705EB00F7C6E8 /* SUEX_HelloWorld.cpp */; };
2622
E99766C2252CB0AD00B1D8E9 /* RubyUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 33CDE7B718270A4800F7C6E8 /* RubyUtils.cpp */; };
2723
E99766C6252CB0AD00B1D8E9 /* RubyLib.h in Headers */ = {isa = PBXBuildFile; fileRef = 33CDE7B618270A4800F7C6E8 /* RubyLib.h */; };
2824
E99766C7252CB0AD00B1D8E9 /* RubyUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = 33CDE7B818270A4800F7C6E8 /* RubyUtils.h */; };
29-
E99766CE252CB1D500B1D8E9 /* Ruby.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E99766CD252CB1D500B1D8E9 /* Ruby.framework */; };
3025
E9EA8AC81DAFC10D0029551B /* SUEX_HelloWorld.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 33CDE7AF182705EB00F7C6E8 /* SUEX_HelloWorld.cpp */; };
3126
E9EA8AC91DAFC10D0029551B /* RubyUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 33CDE7B718270A4800F7C6E8 /* RubyUtils.cpp */; };
3227
E9EA8ACD1DAFC10D0029551B /* RubyLib.h in Headers */ = {isa = PBXBuildFile; fileRef = 33CDE7B618270A4800F7C6E8 /* RubyLib.h */; };
@@ -45,10 +40,8 @@
4540
CE1590E81847A5F10084B06D /* Ruby.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Ruby.framework; path = ../ThirdParty/lib/mac/1.8/Ruby.framework; sourceTree = "<group>"; };
4641
CE6B446F211DA18D006A1F2E /* Ruby.Framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Ruby.Framework; sourceTree = "<group>"; };
4742
CEC02B3F26C66FC100934F5F /* Ruby.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Ruby.framework; path = "../ThirdParty/lib/mac/2.7-universal/Ruby.framework"; sourceTree = "<group>"; };
48-
CEC02B4C26C66FCE00934F5F /* SUEX_HelloWorld.bundle */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = SUEX_HelloWorld.bundle; sourceTree = BUILT_PRODUCTS_DIR; };
4943
E939EB2D21120EE20023B67B /* SUEX_HelloWorld.bundle */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = SUEX_HelloWorld.bundle; sourceTree = BUILT_PRODUCTS_DIR; };
5044
E99766CB252CB0AD00B1D8E9 /* SUEX_HelloWorld.bundle */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = SUEX_HelloWorld.bundle; sourceTree = BUILT_PRODUCTS_DIR; };
51-
E99766CD252CB1D500B1D8E9 /* Ruby.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Ruby.framework; path = ../ThirdParty/lib/mac/2.7/Ruby.framework; sourceTree = "<group>"; };
5245
E9EA8AD21DAFC10D0029551B /* SUEX_HelloWorld.bundle */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = SUEX_HelloWorld.bundle; sourceTree = BUILT_PRODUCTS_DIR; };
5346
E9EA8AD41DAFC2510029551B /* Ruby.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Ruby.framework; path = ../ThirdParty/lib/mac/2.2/Ruby.framework; sourceTree = "<group>"; };
5447
/* End PBXFileReference section */
@@ -62,27 +55,19 @@
6255
);
6356
runOnlyForDeploymentPostprocessing = 0;
6457
};
65-
CEC02B4426C66FCE00934F5F /* Frameworks */ = {
66-
isa = PBXFrameworksBuildPhase;
67-
buildActionMask = 2147483647;
68-
files = (
69-
CEC02B5726C66FF600934F5F /* Ruby.framework in Frameworks */,
70-
);
71-
runOnlyForDeploymentPostprocessing = 0;
72-
};
7358
E939EB2421120EE20023B67B /* Frameworks */ = {
7459
isa = PBXFrameworksBuildPhase;
7560
buildActionMask = 2147483647;
7661
files = (
77-
CE6B4470211DA18D006A1F2E /* Ruby.Framework in Frameworks */,
62+
E93B35442705ED4100A175B3 /* Ruby.Framework in Frameworks */,
7863
);
7964
runOnlyForDeploymentPostprocessing = 0;
8065
};
8166
E99766C3252CB0AD00B1D8E9 /* Frameworks */ = {
8267
isa = PBXFrameworksBuildPhase;
8368
buildActionMask = 2147483647;
8469
files = (
85-
E99766CE252CB1D500B1D8E9 /* Ruby.framework in Frameworks */,
70+
E93B35452705ED6400A175B3 /* Ruby.framework in Frameworks */,
8671
);
8772
runOnlyForDeploymentPostprocessing = 0;
8873
};
@@ -115,16 +100,14 @@
115100
E9EA8AD21DAFC10D0029551B /* SUEX_HelloWorld.bundle */,
116101
E939EB2D21120EE20023B67B /* SUEX_HelloWorld.bundle */,
117102
E99766CB252CB0AD00B1D8E9 /* SUEX_HelloWorld.bundle */,
118-
CEC02B4C26C66FCE00934F5F /* SUEX_HelloWorld.bundle */,
119103
);
120104
name = Products;
121105
sourceTree = "<group>";
122106
};
123107
33CDE7B11827091E00F7C6E8 /* ThirdParty Frameworks */ = {
124108
isa = PBXGroup;
125109
children = (
126-
CEC02B3E26C66F9900934F5F /* Ruby 2.7 (Universal) */,
127-
E99766CC252CB17000B1D8E9 /* Ruby 2.7 */,
110+
CEC02B3E26C66F9900934F5F /* Ruby 2.7 */,
128111
E939EB2E211211400023B67B /* Ruby 2.5 */,
129112
E9EA8AD31DAFC23A0029551B /* Ruby 2.2 */,
130113
CE405E9418476E2800A77187 /* Ruby 2.0 */,
@@ -160,12 +143,12 @@
160143
name = "Ruby 1.8";
161144
sourceTree = "<group>";
162145
};
163-
CEC02B3E26C66F9900934F5F /* Ruby 2.7 (Universal) */ = {
146+
CEC02B3E26C66F9900934F5F /* Ruby 2.7 */ = {
164147
isa = PBXGroup;
165148
children = (
166149
CEC02B3F26C66FC100934F5F /* Ruby.framework */,
167150
);
168-
name = "Ruby 2.7 (Universal)";
151+
name = "Ruby 2.7";
169152
sourceTree = "<group>";
170153
};
171154
E939EB2E211211400023B67B /* Ruby 2.5 */ = {
@@ -177,14 +160,6 @@
177160
path = ../ThirdParty/lib/mac/2.5;
178161
sourceTree = "<group>";
179162
};
180-
E99766CC252CB17000B1D8E9 /* Ruby 2.7 */ = {
181-
isa = PBXGroup;
182-
children = (
183-
E99766CD252CB1D500B1D8E9 /* Ruby.framework */,
184-
);
185-
name = "Ruby 2.7";
186-
sourceTree = "<group>";
187-
};
188163
E9EA8AD31DAFC23A0029551B /* Ruby 2.2 */ = {
189164
isa = PBXGroup;
190165
children = (
@@ -205,15 +180,6 @@
205180
);
206181
runOnlyForDeploymentPostprocessing = 0;
207182
};
208-
CEC02B4626C66FCE00934F5F /* Headers */ = {
209-
isa = PBXHeadersBuildPhase;
210-
buildActionMask = 2147483647;
211-
files = (
212-
CEC02B4726C66FCE00934F5F /* RubyLib.h in Headers */,
213-
CEC02B4826C66FCE00934F5F /* RubyUtils.h in Headers */,
214-
);
215-
runOnlyForDeploymentPostprocessing = 0;
216-
};
217183
E939EB2721120EE20023B67B /* Headers */ = {
218184
isa = PBXHeadersBuildPhase;
219185
buildActionMask = 2147483647;
@@ -261,23 +227,6 @@
261227
productReference = 33CDE5E5182703B200F7C6E8 /* SUEX_HelloWorld.bundle */;
262228
productType = "com.apple.product-type.library.dynamic";
263229
};
264-
CEC02B4026C66FCE00934F5F /* Ruby 2.7 Universal */ = {
265-
isa = PBXNativeTarget;
266-
buildConfigurationList = CEC02B4926C66FCE00934F5F /* Build configuration list for PBXNativeTarget "Ruby 2.7 Universal" */;
267-
buildPhases = (
268-
CEC02B4126C66FCE00934F5F /* Sources */,
269-
CEC02B4426C66FCE00934F5F /* Frameworks */,
270-
CEC02B4626C66FCE00934F5F /* Headers */,
271-
);
272-
buildRules = (
273-
);
274-
dependencies = (
275-
);
276-
name = "Ruby 2.7 Universal";
277-
productName = "Hello World";
278-
productReference = CEC02B4C26C66FCE00934F5F /* SUEX_HelloWorld.bundle */;
279-
productType = "com.apple.product-type.library.dynamic";
280-
};
281230
E939EB2021120EE20023B67B /* Ruby 2.5 */ = {
282231
isa = PBXNativeTarget;
283232
buildConfigurationList = E939EB2A21120EE20023B67B /* Build configuration list for PBXNativeTarget "Ruby 2.5" */;
@@ -335,7 +284,7 @@
335284
33CDE5DC182703B100F7C6E8 /* Project object */ = {
336285
isa = PBXProject;
337286
attributes = {
338-
LastUpgradeCheck = 1240;
287+
LastUpgradeCheck = 1250;
339288
ORGANIZATIONNAME = SketchUp;
340289
};
341290
buildConfigurationList = 33CDE5DF182703B100F7C6E8 /* Build configuration list for PBXProject "SUEX_HelloWorld" */;
@@ -351,7 +300,6 @@
351300
projectDirPath = "";
352301
projectRoot = "";
353302
targets = (
354-
CEC02B4026C66FCE00934F5F /* Ruby 2.7 Universal */,
355303
E99766BF252CB0AD00B1D8E9 /* Ruby 2.7 */,
356304
E939EB2021120EE20023B67B /* Ruby 2.5 */,
357305
E9EA8AC61DAFC10D0029551B /* Ruby 2.2 */,
@@ -370,15 +318,6 @@
370318
);
371319
runOnlyForDeploymentPostprocessing = 0;
372320
};
373-
CEC02B4126C66FCE00934F5F /* Sources */ = {
374-
isa = PBXSourcesBuildPhase;
375-
buildActionMask = 2147483647;
376-
files = (
377-
CEC02B4226C66FCE00934F5F /* SUEX_HelloWorld.cpp in Sources */,
378-
CEC02B4326C66FCE00934F5F /* RubyUtils.cpp in Sources */,
379-
);
380-
runOnlyForDeploymentPostprocessing = 0;
381-
};
382321
E939EB2121120EE20023B67B /* Sources */ = {
383322
isa = PBXSourcesBuildPhase;
384323
buildActionMask = 2147483647;
@@ -549,46 +488,6 @@
549488
};
550489
name = Release;
551490
};
552-
CEC02B4A26C66FCE00934F5F /* Debug */ = {
553-
isa = XCBuildConfiguration;
554-
buildSettings = {
555-
CLANG_ENABLE_OBJC_WEAK = YES;
556-
CONFIGURATION_BUILD_DIR = "$(SRCROOT)/../Debug (2.7-universal)";
557-
CONFIGURATION_TEMP_DIR = "$(PROJECT_TEMP_DIR)/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)/2.7-universal";
558-
DYLIB_COMPATIBILITY_VERSION = "";
559-
DYLIB_CURRENT_VERSION = "";
560-
FRAMEWORK_SEARCH_PATHS = (
561-
"$(inherited)",
562-
"\"$(SRCROOT)/../ThirdParty/lib/mac/2.7-universal\"",
563-
);
564-
HEADER_SEARCH_PATHS = (
565-
../ThirdParty/include/ruby/2.7/mac,
566-
"../ThirdParty/include/ruby/2.7/mac/x86_64-darwin14",
567-
);
568-
MACOSX_DEPLOYMENT_TARGET = 11.0;
569-
};
570-
name = Debug;
571-
};
572-
CEC02B4B26C66FCE00934F5F /* Release */ = {
573-
isa = XCBuildConfiguration;
574-
buildSettings = {
575-
CLANG_ENABLE_OBJC_WEAK = YES;
576-
CONFIGURATION_BUILD_DIR = "$(SRCROOT)/../Release (2.7-universal)";
577-
CONFIGURATION_TEMP_DIR = "$(PROJECT_TEMP_DIR)/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)/2.7-universal";
578-
DYLIB_COMPATIBILITY_VERSION = "";
579-
DYLIB_CURRENT_VERSION = "";
580-
FRAMEWORK_SEARCH_PATHS = (
581-
"$(inherited)",
582-
"\"$(SRCROOT)/../ThirdParty/lib/mac/2.7-universal\"",
583-
);
584-
HEADER_SEARCH_PATHS = (
585-
../ThirdParty/include/ruby/2.7/mac,
586-
"../ThirdParty/include/ruby/2.7/mac/x86_64-darwin14",
587-
);
588-
MACOSX_DEPLOYMENT_TARGET = 11.0;
589-
};
590-
name = Release;
591-
};
592491
E939EB2B21120EE20023B67B /* Debug */ = {
593492
isa = XCBuildConfiguration;
594493
buildSettings = {
@@ -641,14 +540,13 @@
641540
DYLIB_CURRENT_VERSION = "";
642541
FRAMEWORK_SEARCH_PATHS = (
643542
"$(inherited)",
644-
"\"$(SRCROOT)/../ThirdParty/lib/mac/2.7\"",
543+
"\"$(SRCROOT)/../ThirdParty/lib/mac/2.7-universal\"",
645544
);
646545
HEADER_SEARCH_PATHS = (
647546
../ThirdParty/include/ruby/2.7/mac,
648547
"../ThirdParty/include/ruby/2.7/mac/x86_64-darwin14",
649548
);
650549
MACOSX_DEPLOYMENT_TARGET = 10.13;
651-
VALID_ARCHS = x86_64;
652550
};
653551
name = Debug;
654552
};
@@ -662,14 +560,13 @@
662560
DYLIB_CURRENT_VERSION = "";
663561
FRAMEWORK_SEARCH_PATHS = (
664562
"$(inherited)",
665-
"\"$(SRCROOT)/../ThirdParty/lib/mac/2.7\"",
563+
"\"$(SRCROOT)/../ThirdParty/lib/mac/2.7-universal\"",
666564
);
667565
HEADER_SEARCH_PATHS = (
668566
../ThirdParty/include/ruby/2.7/mac,
669567
"../ThirdParty/include/ruby/2.7/mac/x86_64-darwin14",
670568
);
671569
MACOSX_DEPLOYMENT_TARGET = 10.13;
672-
VALID_ARCHS = x86_64;
673570
};
674571
name = Release;
675572
};
@@ -736,15 +633,6 @@
736633
defaultConfigurationIsVisible = 0;
737634
defaultConfigurationName = Release;
738635
};
739-
CEC02B4926C66FCE00934F5F /* Build configuration list for PBXNativeTarget "Ruby 2.7 Universal" */ = {
740-
isa = XCConfigurationList;
741-
buildConfigurations = (
742-
CEC02B4A26C66FCE00934F5F /* Debug */,
743-
CEC02B4B26C66FCE00934F5F /* Release */,
744-
);
745-
defaultConfigurationIsVisible = 0;
746-
defaultConfigurationName = Release;
747-
};
748636
E939EB2A21120EE20023B67B /* Build configuration list for PBXNativeTarget "Ruby 2.5" */ = {
749637
isa = XCConfigurationList;
750638
buildConfigurations = (

0 commit comments

Comments
 (0)