Skip to content

Commit 6ea0fbd

Browse files
wilhuffwilhuff
authored
Manage resources with sync_project.rb (#3340)
* Sync resources Apply ignored files to target contents too. * Clean up macOS host app resources/roots.pem does not exist
1 parent 79627a2 commit 6ea0fbd

File tree

3 files changed

+19
-20
lines changed

3 files changed

+19
-20
lines changed

‎Firestore/Example/App/macOS/AppDelegate.m

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@
1515
*/
1616

1717
#import "AppDelegate.h"
18-
#import <FirebaseCore/FirebaseCore.h>
19-
#import <FirebaseFirestore/FirebaseFirestore.h>
2018

2119
@interface AppDelegate ()
2220

‎Firestore/Example/Firestore.xcodeproj/project.pbxproj

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -368,7 +368,6 @@
368368
6003F5B0195388D20070C39A /* XCTest.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6003F5AF195388D20070C39A /* XCTest.framework */; };
369369
6003F5B1195388D20070C39A /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6003F58D195388D20070C39A /* Foundation.framework */; };
370370
6003F5B2195388D20070C39A /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6003F591195388D20070C39A /* UIKit.framework */; };
371-
6003F5BA195388D20070C39A /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 6003F5B8195388D20070C39A /* InfoPlist.strings */; };
372371
60985657831B8DDE2C65AC8B /* FIRFieldsTests.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5492E06A202154D500B64F25 /* FIRFieldsTests.mm */; };
373372
60C72F86D2231B1B6592A5E6 /* filesystem_test.cc in Sources */ = {isa = PBXBuildFile; fileRef = F51859B394D01C0C507282F1 /* filesystem_test.cc */; };
374373
6161B5032047140C00A99DBB /* FIRFirestoreSourceTests.mm in Sources */ = {isa = PBXBuildFile; fileRef = 6161B5012047140400A99DBB /* FIRFirestoreSourceTests.mm */; };
@@ -616,7 +615,6 @@
616615
DE03B2D41F2149D600A30B9C /* XCTest.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6003F5AF195388D20070C39A /* XCTest.framework */; };
617616
DE03B2D51F2149D600A30B9C /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6003F591195388D20070C39A /* UIKit.framework */; };
618617
DE03B2D61F2149D600A30B9C /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6003F58D195388D20070C39A /* Foundation.framework */; };
619-
DE03B2DD1F2149D600A30B9C /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 6003F5B8195388D20070C39A /* InfoPlist.strings */; };
620618
DE03B3631F215E1A00A30B9C /* CAcert.pem in Resources */ = {isa = PBXBuildFile; fileRef = DE03B3621F215E1600A30B9C /* CAcert.pem */; };
621619
DE2EF0851F3D0B6E003D0CDC /* FSTArraySortedDictionaryTests.m in Sources */ = {isa = PBXBuildFile; fileRef = DE2EF07E1F3D0B6E003D0CDC /* FSTArraySortedDictionaryTests.m */; };
622620
DE2EF0861F3D0B6E003D0CDC /* FSTImmutableSortedDictionary+Testing.m in Sources */ = {isa = PBXBuildFile; fileRef = DE2EF0801F3D0B6E003D0CDC /* FSTImmutableSortedDictionary+Testing.m */; };
@@ -647,12 +645,14 @@
647645
EBE4A7B6A57BCE02B389E8A6 /* byte_string_test.cc in Sources */ = {isa = PBXBuildFile; fileRef = 5342CDDB137B4E93E2E85CCA /* byte_string_test.cc */; };
648646
EBFC611B1BF195D0EC710AF4 /* app_testing.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5467FB07203E6A44009C9584 /* app_testing.mm */; };
649647
EC160876D8A42166440E0B53 /* FIRCursorTests.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5492E070202154D600B64F25 /* FIRCursorTests.mm */; };
648+
EC531B460BAEB0FCE40D7C7B /* CAcert.pem in Resources */ = {isa = PBXBuildFile; fileRef = DE03B3621F215E1600A30B9C /* CAcert.pem */; };
650649
EC80A217F3D66EB0272B36B0 /* FSTLevelDBSpecTests.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5492E02C20213FFB00B64F25 /* FSTLevelDBSpecTests.mm */; };
651650
ED420D8F49DA5C41EEF93913 /* FIRSnapshotMetadataTests.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5492E04D202154AA00B64F25 /* FIRSnapshotMetadataTests.mm */; };
652651
ED4E2AC80CAF2A8FDDAC3DEE /* field_mask_test.cc in Sources */ = {isa = PBXBuildFile; fileRef = 549CCA5320A36E1F00BCEB75 /* field_mask_test.cc */; };
653652
EF3518F84255BAF3EBD317F6 /* exponential_backoff_test.cc in Sources */ = {isa = PBXBuildFile; fileRef = B6D1B68420E2AB1A00B35856 /* exponential_backoff_test.cc */; };
654653
F1661B1C5F3E30535FB65046 /* FSTArraySortedDictionaryTests.m in Sources */ = {isa = PBXBuildFile; fileRef = DE2EF07E1F3D0B6E003D0CDC /* FSTArraySortedDictionaryTests.m */; };
655654
F19B749671F2552E964422F7 /* FIRListenerRegistrationTests.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5492E06B202154D500B64F25 /* FIRListenerRegistrationTests.mm */; };
655+
F255C7CD0EB1970CB6740450 /* CAcert.pem in Resources */ = {isa = PBXBuildFile; fileRef = DE03B3621F215E1600A30B9C /* CAcert.pem */; };
656656
F3261CBFC169DB375A0D9492 /* FSTMockDatastore.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5492E02D20213FFC00B64F25 /* FSTMockDatastore.mm */; };
657657
F3F09BC931A717CEFF4E14B9 /* FIRFieldValueTests.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5492E04A202154AA00B64F25 /* FIRFieldValueTests.mm */; };
658658
F46394FAA186BC6D19213B59 /* FSTLevelDBLocalStoreTests.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5492E08F2021552B00B64F25 /* FSTLevelDBLocalStoreTests.mm */; };
@@ -1069,7 +1069,6 @@
10691069
DAFF0CFF21E64AC40062958F /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
10701070
DAFF0D0021E64AC40062958F /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
10711071
DAFF0D0221E64AC40062958F /* macOS.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = macOS.entitlements; sourceTree = "<group>"; };
1072-
DAFF0D0721E653460062958F /* roots.pem */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = roots.pem; path = ../../../../etc/roots.pem; sourceTree = "<group>"; };
10731072
DE03B2E91F2149D600A30B9C /* Firestore_IntegrationTests_iOS.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = Firestore_IntegrationTests_iOS.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
10741073
DE03B3621F215E1600A30B9C /* CAcert.pem */ = {isa = PBXFileReference; lastKnownFileType = text; path = CAcert.pem; sourceTree = "<group>"; };
10751074
DE0761F61F2FE68D003233AF /* BasicCompileTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BasicCompileTests.swift; sourceTree = "<group>"; };
@@ -1751,7 +1750,6 @@
17511750
DAFF0CF621E64AC30062958F /* macOS */ = {
17521751
isa = PBXGroup;
17531752
children = (
1754-
DAFF0D0621E652FD0062958F /* resources */,
17551753
DAFF0CF721E64AC30062958F /* AppDelegate.h */,
17561754
DAFF0CF821E64AC30062958F /* AppDelegate.m */,
17571755
DAFF0CFA21E64AC40062958F /* Assets.xcassets */,
@@ -1763,14 +1761,6 @@
17631761
path = macOS;
17641762
sourceTree = "<group>";
17651763
};
1766-
DAFF0D0621E652FD0062958F /* resources */ = {
1767-
isa = PBXGroup;
1768-
children = (
1769-
DAFF0D0721E653460062958F /* roots.pem */,
1770-
);
1771-
path = resources;
1772-
sourceTree = "<group>";
1773-
};
17741764
DE2EF06E1F3D07D7003D0CDC /* Immutable */ = {
17751765
isa = PBXGroup;
17761766
children = (
@@ -2357,13 +2347,15 @@
23572347
isa = PBXResourcesBuildPhase;
23582348
buildActionMask = 2147483647;
23592349
files = (
2350+
EC531B460BAEB0FCE40D7C7B /* CAcert.pem in Resources */,
23602351
);
23612352
runOnlyForDeploymentPostprocessing = 0;
23622353
};
23632354
54B8E4A8224BDC4100930F18 /* Resources */ = {
23642355
isa = PBXResourcesBuildPhase;
23652356
buildActionMask = 2147483647;
23662357
files = (
2358+
F255C7CD0EB1970CB6740450 /* CAcert.pem in Resources */,
23672359
);
23682360
runOnlyForDeploymentPostprocessing = 0;
23692361
};
@@ -2397,7 +2389,6 @@
23972389
isa = PBXResourcesBuildPhase;
23982390
buildActionMask = 2147483647;
23992391
files = (
2400-
6003F5BA195388D20070C39A /* InfoPlist.strings in Resources */,
24012392
54DA12A61F315EE100DD57A1 /* collection_spec_test.json in Resources */,
24022393
54DA12A71F315EE100DD57A1 /* existence_filter_spec_test.json in Resources */,
24032394
54DA12A81F315EE100DD57A1 /* limbo_spec_test.json in Resources */,
@@ -2437,7 +2428,6 @@
24372428
buildActionMask = 2147483647;
24382429
files = (
24392430
DE03B3631F215E1A00A30B9C /* CAcert.pem in Resources */,
2440-
DE03B2DD1F2149D600A30B9C /* InfoPlist.strings in Resources */,
24412431
);
24422432
runOnlyForDeploymentPostprocessing = 0;
24432433
};

‎scripts/sync_project.rb

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ def sync_firestore(test_only)
7474
# Files on the filesystem that should be ignored.
7575
s.ignore_files = [
7676
'CMakeLists.txt',
77+
'README.md',
7778
'InfoPlist.strings',
7879
'*.orig',
7980
'*.plist',
@@ -306,9 +307,18 @@ def diff(project_files, target)
306307
return diff
307308
end
308309

310+
# We're only managing synchronization of files in these phases.
311+
INTERESTING_PHASES = [
312+
Xcodeproj::Project::Object::PBXHeadersBuildPhase,
313+
Xcodeproj::Project::Object::PBXSourcesBuildPhase,
314+
Xcodeproj::Project::Object::PBXResourcesBuildPhase,
315+
]
316+
309317
# Finds all the files referred to by any phase in a target
310318
def each_target_file(target)
311319
target.build_phases.each do |phase|
320+
next if not INTERESTING_PHASES.include?(phase.class)
321+
312322
phase.files.each do |build_file|
313323
yield build_file.file_ref
314324
end
@@ -428,6 +438,10 @@ def find_project_files_after_removal(files, to_remove)
428438

429439
next if remove_paths.include?(file_ref.real_path)
430440

441+
path = file_ref.real_path
442+
next if @finder.ignore_basename?(path.basename)
443+
next if @finder.ignore_pathname?(path)
444+
431445
result.push(file_ref)
432446
end
433447
return result
@@ -509,9 +523,7 @@ def find_phase(target, path)
509523
#return target.headers_build_phase
510524
return nil
511525
else
512-
# TODO(wilhuff): sync resources (including JSON files for spec tests).
513-
#return target.resources_build_phase
514-
return nil
526+
return target.resources_build_phase
515527
end
516528
end
517529

@@ -808,7 +820,6 @@ def entries(path)
808820
return result
809821
end
810822

811-
private
812823
def ignore_basename?(basename)
813824
@ignore_basenames.each do |ignore|
814825
if basename.fnmatch(ignore)

0 commit comments

Comments
 (0)