diff --git a/xcode/generator/generator.xcodeproj/project.pbxproj b/xcode/generator/generator.xcodeproj/project.pbxproj index 1223dd5477..ec28ee1a1e 100644 --- a/xcode/generator/generator.xcodeproj/project.pbxproj +++ b/xcode/generator/generator.xcodeproj/project.pbxproj @@ -48,8 +48,6 @@ 675340861A3F2A7400A0A8C3 /* tesselator.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675340531A3F2A7400A0A8C3 /* tesselator.hpp */; }; 675340871A3F2A7400A0A8C3 /* unpack_mwm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 675340541A3F2A7400A0A8C3 /* unpack_mwm.cpp */; }; 675340881A3F2A7400A0A8C3 /* unpack_mwm.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675340551A3F2A7400A0A8C3 /* unpack_mwm.hpp */; }; - 675340891A3F2A7400A0A8C3 /* update_generator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 675340561A3F2A7400A0A8C3 /* update_generator.cpp */; }; - 6753408A1A3F2A7400A0A8C3 /* update_generator.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675340571A3F2A7400A0A8C3 /* update_generator.hpp */; }; 6753408B1A3F2A7400A0A8C3 /* ways_merger.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675340581A3F2A7400A0A8C3 /* ways_merger.hpp */; }; 6753408C1A3F2A7400A0A8C3 /* world_map_generator.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675340591A3F2A7400A0A8C3 /* world_map_generator.hpp */; }; 6753408D1A3F2A7400A0A8C3 /* osm_element.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6753405A1A3F2A7400A0A8C3 /* osm_element.cpp */; }; @@ -102,8 +100,6 @@ 675340531A3F2A7400A0A8C3 /* tesselator.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = tesselator.hpp; sourceTree = ""; }; 675340541A3F2A7400A0A8C3 /* unpack_mwm.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = unpack_mwm.cpp; sourceTree = ""; }; 675340551A3F2A7400A0A8C3 /* unpack_mwm.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = unpack_mwm.hpp; sourceTree = ""; }; - 675340561A3F2A7400A0A8C3 /* update_generator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = update_generator.cpp; sourceTree = ""; }; - 675340571A3F2A7400A0A8C3 /* update_generator.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = update_generator.hpp; sourceTree = ""; }; 675340581A3F2A7400A0A8C3 /* ways_merger.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = ways_merger.hpp; sourceTree = ""; }; 675340591A3F2A7400A0A8C3 /* world_map_generator.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = world_map_generator.hpp; sourceTree = ""; }; 6753405A1A3F2A7400A0A8C3 /* osm_element.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = osm_element.cpp; sourceTree = ""; }; @@ -186,8 +182,6 @@ 675340531A3F2A7400A0A8C3 /* tesselator.hpp */, 675340541A3F2A7400A0A8C3 /* unpack_mwm.cpp */, 675340551A3F2A7400A0A8C3 /* unpack_mwm.hpp */, - 675340561A3F2A7400A0A8C3 /* update_generator.cpp */, - 675340571A3F2A7400A0A8C3 /* update_generator.hpp */, 675340581A3F2A7400A0A8C3 /* ways_merger.hpp */, 675340591A3F2A7400A0A8C3 /* world_map_generator.hpp */, 6753405A1A3F2A7400A0A8C3 /* osm_element.cpp */, @@ -225,7 +219,6 @@ 675340861A3F2A7400A0A8C3 /* tesselator.hpp in Headers */, 6753405F1A3F2A7400A0A8C3 /* borders_loader.hpp in Headers */, 675340801A3F2A7400A0A8C3 /* polygonizer.hpp in Headers */, - 6753408A1A3F2A7400A0A8C3 /* update_generator.hpp in Headers */, 675340941C5231BA002CF0D9 /* search_index_builder.hpp in Headers */, 675340821A3F2A7400A0A8C3 /* routing_generator.hpp in Headers */, 675340841A3F2A7400A0A8C3 /* statistics.hpp in Headers */, @@ -298,7 +291,6 @@ files = ( 6753406C1A3F2A7400A0A8C3 /* feature_generator.cpp in Sources */, 6753407A1A3F2A7400A0A8C3 /* osm_id.cpp in Sources */, - 675340891A3F2A7400A0A8C3 /* update_generator.cpp in Sources */, 675340871A3F2A7400A0A8C3 /* unpack_mwm.cpp in Sources */, 670B84BC1A8CDB0000CE4492 /* osm_source.cpp in Sources */, 675340701A3F2A7400A0A8C3 /* feature_sorter.cpp in Sources */, diff --git a/xcode/storage/storage.xcodeproj/project.pbxproj b/xcode/storage/storage.xcodeproj/project.pbxproj index d59dcd84f6..d83d9bb734 100644 --- a/xcode/storage/storage.xcodeproj/project.pbxproj +++ b/xcode/storage/storage.xcodeproj/project.pbxproj @@ -12,6 +12,7 @@ 34B093261C61F9BA0066F4C3 /* app_store.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 34B093211C61F9BA0066F4C3 /* app_store.hpp */; }; 34C9BCFC1C6CCF85000DC38D /* country_name_getter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 34C9BCFA1C6CCF85000DC38D /* country_name_getter.cpp */; }; 34C9BCFD1C6CCF85000DC38D /* country_name_getter.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 34C9BCFB1C6CCF85000DC38D /* country_name_getter.hpp */; }; + 671182CE1C7E06B400CB8177 /* storage_3levels_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 671182CC1C7E069C00CB8177 /* storage_3levels_tests.cpp */; }; 67247FCF1C60BA8A00EDE56A /* fake_map_files_downloader.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 67247FC51C60BA8A00EDE56A /* fake_map_files_downloader.hpp */; }; 67247FD41C60BA8A00EDE56A /* task_runner.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 67247FCA1C60BA8A00EDE56A /* task_runner.hpp */; }; 67247FD61C60BA8A00EDE56A /* test_map_files_downloader.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 67247FCC1C60BA8A00EDE56A /* test_map_files_downloader.hpp */; }; @@ -28,7 +29,6 @@ 6753430F1A3F5A2600A0A8C3 /* country.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675342F81A3F5A2600A0A8C3 /* country.hpp */; }; 675343161A3F5A2600A0A8C3 /* index.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 675342FF1A3F5A2600A0A8C3 /* index.cpp */; }; 675343171A3F5A2600A0A8C3 /* index.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675343001A3F5A2600A0A8C3 /* index.hpp */; }; - 675343181A3F5A2600A0A8C3 /* simple_tree.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675343011A3F5A2600A0A8C3 /* simple_tree.hpp */; }; 675343191A3F5A2600A0A8C3 /* storage_defines.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675343021A3F5A2600A0A8C3 /* storage_defines.hpp */; }; 6753431A1A3F5A2600A0A8C3 /* storage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 675343031A3F5A2600A0A8C3 /* storage.cpp */; }; 6753431B1A3F5A2600A0A8C3 /* storage.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675343041A3F5A2600A0A8C3 /* storage.hpp */; }; @@ -156,6 +156,7 @@ 34C9BCFA1C6CCF85000DC38D /* country_name_getter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = country_name_getter.cpp; sourceTree = ""; }; 34C9BCFB1C6CCF85000DC38D /* country_name_getter.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = country_name_getter.hpp; sourceTree = ""; }; 670D05A81B0E04450013A7AC /* defaults.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = defaults.xcconfig; path = ../defaults.xcconfig; sourceTree = ""; }; + 671182CC1C7E069C00CB8177 /* storage_3levels_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = storage_3levels_tests.cpp; sourceTree = ""; }; 67247FC31C60BA8A00EDE56A /* country_info_getter_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = country_info_getter_test.cpp; sourceTree = ""; }; 67247FC41C60BA8A00EDE56A /* fake_map_files_downloader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = fake_map_files_downloader.cpp; sourceTree = ""; }; 67247FC51C60BA8A00EDE56A /* fake_map_files_downloader.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = fake_map_files_downloader.hpp; sourceTree = ""; }; @@ -215,7 +216,6 @@ 675342F81A3F5A2600A0A8C3 /* country.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = country.hpp; sourceTree = ""; }; 675342FF1A3F5A2600A0A8C3 /* index.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = index.cpp; sourceTree = ""; }; 675343001A3F5A2600A0A8C3 /* index.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = index.hpp; sourceTree = ""; }; - 675343011A3F5A2600A0A8C3 /* simple_tree.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = simple_tree.hpp; sourceTree = ""; }; 675343021A3F5A2600A0A8C3 /* storage_defines.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = storage_defines.hpp; sourceTree = ""; }; 675343031A3F5A2600A0A8C3 /* storage.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = storage.cpp; sourceTree = ""; }; 675343041A3F5A2600A0A8C3 /* storage.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = storage.hpp; sourceTree = ""; }; @@ -398,6 +398,7 @@ 672480071C60CE3D00EDE56A /* storage_integration_tests */ = { isa = PBXGroup; children = ( + 671182CC1C7E069C00CB8177 /* storage_3levels_tests.cpp */, 676C83C01C637FAE00DC9603 /* storage_downloading_tests.cpp */, 676C83C11C637FAE00DC9603 /* storage_update_tests.cpp */, 6724800D1C60CE7300EDE56A /* migrate_tests.cpp */, @@ -454,7 +455,6 @@ 675342F81A3F5A2600A0A8C3 /* country.hpp */, 675342FF1A3F5A2600A0A8C3 /* index.cpp */, 675343001A3F5A2600A0A8C3 /* index.hpp */, - 675343011A3F5A2600A0A8C3 /* simple_tree.hpp */, 675343021A3F5A2600A0A8C3 /* storage_defines.hpp */, 675343031A3F5A2600A0A8C3 /* storage.cpp */, 675343041A3F5A2600A0A8C3 /* storage.hpp */, @@ -501,7 +501,6 @@ 675343191A3F5A2600A0A8C3 /* storage_defines.hpp in Headers */, 67247FD41C60BA8A00EDE56A /* task_runner.hpp in Headers */, 6753430F1A3F5A2600A0A8C3 /* country.hpp in Headers */, - 675343181A3F5A2600A0A8C3 /* simple_tree.hpp in Headers */, 34B093261C61F9BA0066F4C3 /* app_store.hpp in Headers */, 6753430A1A3F5A2600A0A8C3 /* country_decl.hpp in Headers */, 678338D61C723B1A00FD6263 /* helpers.hpp in Headers */, @@ -686,11 +685,9 @@ 67F90B741C6A277900CD458E /* storage_tests.cpp in Sources */, 67F90B731C6A277900CD458E /* simple_tree_test.cpp in Sources */, 67F90B761C6A277900CD458E /* test_map_files_downloader.cpp in Sources */, - 678338681C6CF17B00FD6263 /* country_name_getter_test.cpp in Sources */, 67F90B711C6A277900CD458E /* fake_map_files_downloader.cpp in Sources */, 67F90B701C6A277900CD458E /* country_info_getter_test.cpp in Sources */, 67F90B721C6A277900CD458E /* queued_country_tests.cpp in Sources */, - 678338671C6CF17600FD6263 /* helpers.cpp in Sources */, 67F90B751C6A277900CD458E /* task_runner.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -699,6 +696,7 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( + 671182CE1C7E06B400CB8177 /* storage_3levels_tests.cpp in Sources */, 67F90BCE1C6A2A1E00CD458E /* storage_update_tests.cpp in Sources */, 67F90BD21C6A2A2200CD458E /* testingmain.cpp in Sources */, 67F90BCD1C6A2A1E00CD458E /* storage_downloading_tests.cpp in Sources */,