Skip to content

Commit 928047b

Browse files
brentleyjonesbrentleyjones
committed
Use CcInfo for defines and local_defines
This also fixes some parsing issue with escaped `"`s. And an oddity(?) where `swift_library` sets defines for cc dependents.
1 parent f6db282 commit 928047b

File tree

9 files changed

+69
-123
lines changed

9 files changed

+69
-123
lines changed

‎examples/ios_app/test/fixtures/project.xcodeproj/project.pbxproj

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1321,6 +1321,7 @@
13211321
"__DATE__=\"redacted\"",
13221322
"__TIMESTAMP__=\"redacted\"",
13231323
"__TIME__=\"redacted\"",
1324+
AWESOME,
13241325
);
13251326
HEADER_SEARCH_PATHS = (
13261327
"$(PROJECT_DIR)/CoreUtilsObjC",
@@ -1406,6 +1407,7 @@
14061407
"__DATE__=\"redacted\"",
14071408
"__TIMESTAMP__=\"redacted\"",
14081409
"__TIME__=\"redacted\"",
1410+
AWESOME,
14091411
);
14101412
GENERATE_INFOPLIST_FILE = YES;
14111413
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
@@ -1628,6 +1630,7 @@
16281630
"__DATE__=\"redacted\"",
16291631
"__TIMESTAMP__=\"redacted\"",
16301632
"__TIME__=\"redacted\"",
1633+
AWESOME,
16311634
);
16321635
HEADER_SEARCH_PATHS = (
16331636
"$(PROJECT_DIR)/CoreUtilsObjC",

‎examples/ios_app/test/fixtures/spec.json

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -656,7 +656,8 @@
656656
"DEBUG",
657657
"__DATE__=\"redacted\"",
658658
"__TIMESTAMP__=\"redacted\"",
659-
"__TIME__=\"redacted\""
659+
"__TIME__=\"redacted\"",
660+
"AWESOME"
660661
],
661662
"IPHONEOS_DEPLOYMENT_TARGET": "15.0",
662663
"OTHER_CFLAGS": [
@@ -910,7 +911,8 @@
910911
"DEBUG",
911912
"__DATE__=\"redacted\"",
912913
"__TIMESTAMP__=\"redacted\"",
913-
"__TIME__=\"redacted\""
914+
"__TIME__=\"redacted\"",
915+
"AWESOME"
914916
],
915917
"IPHONEOS_DEPLOYMENT_TARGET": "15.0",
916918
"OTHER_CFLAGS": [
@@ -1239,7 +1241,8 @@
12391241
"DEBUG",
12401242
"__DATE__=\"redacted\"",
12411243
"__TIMESTAMP__=\"redacted\"",
1242-
"__TIME__=\"redacted\""
1244+
"__TIME__=\"redacted\"",
1245+
"AWESOME"
12431246
],
12441247
"IPHONEOS_DEPLOYMENT_TARGET": "15.0",
12451248
"OTHER_CFLAGS": [

‎test/fixtures/cc/project.xcodeproj/project.pbxproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -420,8 +420,8 @@
420420
"__DATE__=\"redacted\"",
421421
"__TIMESTAMP__=\"redacted\"",
422422
"__TIME__=\"redacted\"",
423-
"SECRET_2=\\\"World!\\\"",
424-
"EXTERNAL_SECRET_2=\\\"World?\\\"",
423+
"SECRET_2=\"World!\"",
424+
"EXTERNAL_SECRET_2=\"World?\"",
425425
);
426426
GENERATE_INFOPLIST_FILE = YES;
427427
MACOSX_DEPLOYMENT_TARGET = 11.0;
@@ -486,7 +486,7 @@
486486
"__DATE__=\"redacted\"",
487487
"__TIMESTAMP__=\"redacted\"",
488488
"__TIME__=\"redacted\"",
489-
"SECRET_3=\\\"Hello\\\"",
489+
"SECRET_3=\"Hello\"",
490490
);
491491
GENERATE_INFOPLIST_FILE = YES;
492492
HEADER_SEARCH_PATHS = (
@@ -543,7 +543,7 @@
543543
"__DATE__=\"redacted\"",
544544
"__TIMESTAMP__=\"redacted\"",
545545
"__TIME__=\"redacted\"",
546-
"EXTERNAL_SECRET_3=\\\"Goodbye\\\"",
546+
"EXTERNAL_SECRET_3=\"Goodbye\"",
547547
);
548548
GENERATE_INFOPLIST_FILE = YES;
549549
HEADER_SEARCH_PATHS = (

‎test/fixtures/cc/spec.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@
121121
"__DATE__=\"redacted\"",
122122
"__TIMESTAMP__=\"redacted\"",
123123
"__TIME__=\"redacted\"",
124-
"SECRET_3=\\\"Hello\\\""
124+
"SECRET_3=\"Hello\""
125125
],
126126
"MACOSX_DEPLOYMENT_TARGET": "11.0",
127127
"OTHER_CFLAGS": [
@@ -211,8 +211,8 @@
211211
"__DATE__=\"redacted\"",
212212
"__TIMESTAMP__=\"redacted\"",
213213
"__TIME__=\"redacted\"",
214-
"SECRET_2=\\\"World!\\\"",
215-
"EXTERNAL_SECRET_2=\\\"World?\\\""
214+
"SECRET_2=\"World!\"",
215+
"EXTERNAL_SECRET_2=\"World?\""
216216
],
217217
"MACOSX_DEPLOYMENT_TARGET": "11.0",
218218
"OTHER_CFLAGS": [
@@ -333,7 +333,7 @@
333333
"__DATE__=\"redacted\"",
334334
"__TIMESTAMP__=\"redacted\"",
335335
"__TIME__=\"redacted\"",
336-
"EXTERNAL_SECRET_3=\\\"Goodbye\\\""
336+
"EXTERNAL_SECRET_3=\"Goodbye\""
337337
],
338338
"MACOSX_DEPLOYMENT_TARGET": "11.0",
339339
"OTHER_CFLAGS": [

‎test/fixtures/command_line/project.xcodeproj/project.pbxproj

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -763,8 +763,8 @@
763763
"__DATE__=\"redacted\"",
764764
"__TIMESTAMP__=\"redacted\"",
765765
"__TIME__=\"redacted\"",
766-
"SECRET_3=\\\"Hello\\\"",
767-
"SECRET_2=\\\"World!\\\"",
766+
"SECRET_3=\"Hello\"",
767+
"SECRET_2=\"World!\"",
768768
);
769769
GENERATE_INFOPLIST_FILE = YES;
770770
MACOSX_DEPLOYMENT_TARGET = 12.0;
@@ -817,8 +817,8 @@
817817
"__DATE__=\"redacted\"",
818818
"__TIMESTAMP__=\"redacted\"",
819819
"__TIME__=\"redacted\"",
820-
"SECRET_3=\\\"Hello\\\"",
821-
"SECRET_2=\\\"World!\\\"",
820+
"SECRET_3=\"Hello\"",
821+
"SECRET_2=\"World!\"",
822822
);
823823
GENERATE_INFOPLIST_FILE = YES;
824824
MACOSX_DEPLOYMENT_TARGET = 11.0;
@@ -890,8 +890,8 @@
890890
"__DATE__=\"redacted\"",
891891
"__TIMESTAMP__=\"redacted\"",
892892
"__TIME__=\"redacted\"",
893-
"SECRET_3=\\\"Hello\\\"",
894-
"SECRET_2=\\\"World!\\\"",
893+
"SECRET_3=\"Hello\"",
894+
"SECRET_2=\"World!\"",
895895
);
896896
GENERATE_INFOPLIST_FILE = YES;
897897
MACOSX_DEPLOYMENT_TARGET = 11.0;
@@ -955,8 +955,8 @@
955955
"__DATE__=\"redacted\"",
956956
"__TIMESTAMP__=\"redacted\"",
957957
"__TIME__=\"redacted\"",
958-
"SECRET_3=\\\"Hello\\\"",
959-
"SECRET_2=\\\"World!\\\"",
958+
"SECRET_3=\"Hello\"",
959+
"SECRET_2=\"World!\"",
960960
);
961961
GENERATE_INFOPLIST_FILE = YES;
962962
HEADER_SEARCH_PATHS = (
@@ -1023,8 +1023,8 @@
10231023
"__DATE__=\"redacted\"",
10241024
"__TIMESTAMP__=\"redacted\"",
10251025
"__TIME__=\"redacted\"",
1026-
"SECRET_3=\\\"Hello\\\"",
1027-
"SECRET_2=\\\"World!\\\"",
1026+
"SECRET_3=\"Hello\"",
1027+
"SECRET_2=\"World!\"",
10281028
);
10291029
GENERATE_INFOPLIST_FILE = YES;
10301030
MACOSX_DEPLOYMENT_TARGET = 12.0;
@@ -1081,8 +1081,8 @@
10811081
"__DATE__=\"redacted\"",
10821082
"__TIMESTAMP__=\"redacted\"",
10831083
"__TIME__=\"redacted\"",
1084-
"SECRET_3=\\\"Hello\\\"",
1085-
"SECRET_2=\\\"World!\\\"",
1084+
"SECRET_3=\"Hello\"",
1085+
"SECRET_2=\"World!\"",
10861086
);
10871087
INFOPLIST_FILE = "$(PROJECT_FILE_PATH)/rules_xcodeproj/gen_dir/applebin_macos-darwin_x86_64-fastbuild-ST-8946c8252059/bin/examples/command_line/Tests/LibSwiftTests.__internal__.__test_bundle-intermediates/Info.xcode.plist";
10881088
MACOSX_DEPLOYMENT_TARGET = 11.0;

‎test/fixtures/command_line/spec.json

Lines changed: 14 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,7 @@
5858
"DEBUG",
5959
"__DATE__=\"redacted\"",
6060
"__TIMESTAMP__=\"redacted\"",
61-
"__TIME__=\"redacted\"",
62-
"SECRET_3=\\\"Hello\\\"",
63-
"SECRET_2=\\\"World!\\\""
61+
"__TIME__=\"redacted\""
6462
],
6563
"MACOSX_DEPLOYMENT_TARGET": "11.0",
6664
"OTHER_CFLAGS": [
@@ -160,8 +158,8 @@
160158
"__DATE__=\"redacted\"",
161159
"__TIMESTAMP__=\"redacted\"",
162160
"__TIME__=\"redacted\"",
163-
"SECRET_3=\\\"Hello\\\"",
164-
"SECRET_2=\\\"World!\\\""
161+
"SECRET_3=\"Hello\"",
162+
"SECRET_2=\"World!\""
165163
],
166164
"MACOSX_DEPLOYMENT_TARGET": "11.0",
167165
"OTHER_CFLAGS": [
@@ -271,8 +269,8 @@
271269
"__DATE__=\"redacted\"",
272270
"__TIMESTAMP__=\"redacted\"",
273271
"__TIME__=\"redacted\"",
274-
"SECRET_3=\\\"Hello\\\"",
275-
"SECRET_2=\\\"World!\\\""
272+
"SECRET_3=\"Hello\"",
273+
"SECRET_2=\"World!\""
276274
],
277275
"MACOSX_DEPLOYMENT_TARGET": "11.0",
278276
"OTHER_CFLAGS": [
@@ -357,8 +355,8 @@
357355
"__DATE__=\"redacted\"",
358356
"__TIMESTAMP__=\"redacted\"",
359357
"__TIME__=\"redacted\"",
360-
"SECRET_3=\\\"Hello\\\"",
361-
"SECRET_2=\\\"World!\\\""
358+
"SECRET_3=\"Hello\"",
359+
"SECRET_2=\"World!\""
362360
],
363361
"MACOSX_DEPLOYMENT_TARGET": "12.0",
364362
"OTHER_CFLAGS": [
@@ -444,8 +442,8 @@
444442
"__DATE__=\"redacted\"",
445443
"__TIMESTAMP__=\"redacted\"",
446444
"__TIME__=\"redacted\"",
447-
"SECRET_3=\\\"Hello\\\"",
448-
"SECRET_2=\\\"World!\\\""
445+
"SECRET_3=\"Hello\"",
446+
"SECRET_2=\"World!\""
449447
],
450448
"MACOSX_DEPLOYMENT_TARGET": "11.0",
451449
"OTHER_CFLAGS": [
@@ -547,8 +545,8 @@
547545
"__DATE__=\"redacted\"",
548546
"__TIMESTAMP__=\"redacted\"",
549547
"__TIME__=\"redacted\"",
550-
"SECRET_3=\\\"Hello\\\"",
551-
"SECRET_2=\\\"World!\\\""
548+
"SECRET_3=\"Hello\"",
549+
"SECRET_2=\"World!\""
552550
],
553551
"MACOSX_DEPLOYMENT_TARGET": "12.0",
554552
"OTHER_CFLAGS": [
@@ -646,9 +644,7 @@
646644
"DEBUG",
647645
"__DATE__=\"redacted\"",
648646
"__TIMESTAMP__=\"redacted\"",
649-
"__TIME__=\"redacted\"",
650-
"SECRET_3=\\\"Hello\\\"",
651-
"SECRET_2=\\\"World!\\\""
647+
"__TIME__=\"redacted\""
652648
],
653649
"MACOSX_DEPLOYMENT_TARGET": "12.0",
654650
"OTHER_CFLAGS": [
@@ -742,8 +738,8 @@
742738
"__DATE__=\"redacted\"",
743739
"__TIMESTAMP__=\"redacted\"",
744740
"__TIME__=\"redacted\"",
745-
"SECRET_3=\\\"Hello\\\"",
746-
"SECRET_2=\\\"World!\\\""
741+
"SECRET_3=\"Hello\"",
742+
"SECRET_2=\"World!\""
747743
],
748744
"MACOSX_DEPLOYMENT_TARGET": "12.0",
749745
"OTHER_CFLAGS": [

‎tools/generator/src/Generator+ProcessTargetMerges.swift

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,12 @@ exist
5555
merged.isSwift = merging.isSwift
5656

5757
// Merge build settings
58-
merged.buildSettings["PRODUCT_MODULE_NAME"]
59-
= merging.buildSettings["PRODUCT_MODULE_NAME"]
58+
merged.buildSettings["PRODUCT_MODULE_NAME"] =
59+
merging.buildSettings["PRODUCT_MODULE_NAME"]
60+
merged.buildSettings["GCC_PREPROCESSOR_DEFINITIONS"] =
61+
merging.buildSettings["GCC_PREPROCESSOR_DEFINITIONS"]
62+
merged.buildSettings["SWIFT_ACTIVE_COMPILATION_CONDITIONS"] =
63+
merging.buildSettings["SWIFT_ACTIVE_COMPILATION_CONDITIONS"]
6064
merged.buildSettings.merge(merging.buildSettings) { l, _ in l }
6165

6266
// Update search paths

‎xcodeproj/internal/providers.bzl

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,6 @@ target_type = struct(
5757
XcodeProjInfo = provider(
5858
"Provides information needed to generate an Xcode project.",
5959
fields = {
60-
"defines": """\
61-
A value returned from `_process_defines()` that contains the defines set by
62-
this target that should be propagated to dependent targets.
63-
""",
6460
"dependencies": """\
6561
A `list` of target ids (see the `target` `struct`) that this target directly
6662
depends on.

0 commit comments

Comments
 (0)