forked from organicmaps/organicmaps-tmp
[new downloader] Switch suffixes for files using in migration from 'migrate' to 'obsolete'
This commit is contained in:
parent
3fde46a7d0
commit
0339e0a905
36 changed files with 11056 additions and 11052 deletions
|
@ -1 +0,0 @@
|
|||
../../data/countries_migrate.txt
|
1
android/assets/countries_obsolete.txt
Symbolic link
1
android/assets/countries_obsolete.txt
Symbolic link
|
@ -0,0 +1 @@
|
|||
../../data/countries_obsolete.txt
|
|
@ -1 +0,0 @@
|
|||
../../data/packed_polygons_migrate.bin
|
1
android/assets/packed_polygons_obsolete.bin
Symbolic link
1
android/assets/packed_polygons_obsolete.bin
Symbolic link
|
@ -0,0 +1 @@
|
|||
../../data/packed_polygons_obsolete.bin
|
|
@ -1 +0,0 @@
|
|||
../../../data/WorldCoasts_migrate.mwm
|
1
android/flavors/mwm-ttf-assets/WorldCoasts_obsolete.mwm
Symbolic link
1
android/flavors/mwm-ttf-assets/WorldCoasts_obsolete.mwm
Symbolic link
|
@ -0,0 +1 @@
|
|||
../../../data/WorldCoasts_obsolete.mwm
|
|
@ -7,7 +7,7 @@ cp ../data/classificator.txt assets/
|
|||
cp ../data/colors.txt assets/
|
||||
cp ../data/copyright.html assets/
|
||||
cp ../data/countries.txt assets/
|
||||
cp ../data/countries_migrate.txt assets/
|
||||
cp ../data/countries_obsolete.txt assets/
|
||||
cp ../data/drules_proto_dark.bin assets/
|
||||
cp ../data/drules_proto_clear.bin assets/
|
||||
cp ../data/drules_proto_legacy.bin assets/
|
||||
|
@ -17,7 +17,7 @@ cp ../data/fonts_blacklist.txt assets/
|
|||
cp ../data/fonts_whitelist.txt assets/
|
||||
cp ../data/languages.txt assets/
|
||||
cp ../data/packed_polygons.bin assets/
|
||||
cp ../data/packed_polygons_migrate.bin assets/
|
||||
cp ../data/packed_polygons_obsolete.bin assets/
|
||||
cp ../data/patterns.txt assets/
|
||||
cp ../data/types.txt assets/
|
||||
cp ../data/unicode_blocks.txt assets/
|
||||
|
@ -55,7 +55,7 @@ cp ../data/06_code2000.ttf flavors/mwm-ttf-assets/
|
|||
cp ../data/07_roboto_medium.ttf flavors/mwm-ttf-assets/
|
||||
cp ../data/World.mwm flavors/mwm-ttf-assets/
|
||||
cp ../data/WorldCoasts.mwm flavors/mwm-ttf-assets/
|
||||
cp ../data/WorldCoasts_migrate.mwm flavors/mwm-ttf-assets/
|
||||
cp ../data/WorldCoasts_obsolete.mwm flavors/mwm-ttf-assets/
|
||||
|
||||
rm -rf res/values-zh-rHK/
|
||||
mkdir res\\values-zh-rHK
|
||||
|
|
Binary file not shown.
Binary file not shown.
10625
data/countries.txt
10625
data/countries.txt
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
2439
data/countries_obsolete.txt
Normal file
2439
data/countries_obsolete.txt
Normal file
File diff suppressed because it is too large
Load diff
Binary file not shown.
Binary file not shown.
BIN
data/packed_polygons_obsolete.bin
Normal file
BIN
data/packed_polygons_obsolete.bin
Normal file
Binary file not shown.
|
@ -51,11 +51,11 @@
|
|||
#define CELL2FEATURE_TMP_EXT ".c2f.tmp"
|
||||
|
||||
#define COUNTRIES_FILE "countries.txt"
|
||||
#define COUNTRIES_MIGRATE_FILE "countries_migrate.txt"
|
||||
#define COUNTRIES_OBSOLETE_FILE "countries_obsolete.txt"
|
||||
|
||||
#define WORLD_FILE_NAME "World"
|
||||
#define WORLD_COASTS_FILE_NAME "WorldCoasts"
|
||||
#define WORLD_COASTS_MIGRATE_FILE_NAME "WorldCoasts_migrate"
|
||||
#define WORLD_COASTS_OBSOLETE_FILE_NAME "WorldCoasts_obsolete"
|
||||
|
||||
#define SETTINGS_FILE_NAME "settings.ini"
|
||||
|
||||
|
@ -63,7 +63,7 @@
|
|||
|
||||
#define PACKED_POLYGONS_INFO_TAG "info"
|
||||
#define PACKED_POLYGONS_FILE "packed_polygons.bin"
|
||||
#define PACKED_POLYGONS_MIGRATE_FILE "packed_polygons_migrate.bin"
|
||||
#define PACKED_POLYGONS_OBSOLETE_FILE "packed_polygons_obsolete.bin"
|
||||
|
||||
#define EXTERNAL_RESOURCES_FILE "external_resources.txt"
|
||||
|
||||
|
|
|
@ -83,12 +83,6 @@
|
|||
342CC5F21C2D7730005F3FE5 /* MWMAuthorizationLoginViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 342CC5F01C2D7730005F3FE5 /* MWMAuthorizationLoginViewController.mm */; };
|
||||
342EE4111C43DAA7009F6A49 /* MWMAuthorizationWebViewLoginViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 342EE4101C43DAA7009F6A49 /* MWMAuthorizationWebViewLoginViewController.mm */; };
|
||||
342EE4121C43DAA7009F6A49 /* MWMAuthorizationWebViewLoginViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 342EE4101C43DAA7009F6A49 /* MWMAuthorizationWebViewLoginViewController.mm */; };
|
||||
342F53991C529AF100229014 /* countries_migrate.txt in Resources */ = {isa = PBXBuildFile; fileRef = 342F53961C529AF100229014 /* countries_migrate.txt */; };
|
||||
342F539A1C529AF100229014 /* countries_migrate.txt in Resources */ = {isa = PBXBuildFile; fileRef = 342F53961C529AF100229014 /* countries_migrate.txt */; };
|
||||
342F539B1C529AF100229014 /* packed_polygons_migrate.bin in Resources */ = {isa = PBXBuildFile; fileRef = 342F53971C529AF100229014 /* packed_polygons_migrate.bin */; };
|
||||
342F539C1C529AF100229014 /* packed_polygons_migrate.bin in Resources */ = {isa = PBXBuildFile; fileRef = 342F53971C529AF100229014 /* packed_polygons_migrate.bin */; };
|
||||
342F539D1C529AF100229014 /* WorldCoasts_migrate.mwm in Resources */ = {isa = PBXBuildFile; fileRef = 342F53981C529AF100229014 /* WorldCoasts_migrate.mwm */; };
|
||||
342F539E1C529AF100229014 /* WorldCoasts_migrate.mwm in Resources */ = {isa = PBXBuildFile; fileRef = 342F53981C529AF100229014 /* WorldCoasts_migrate.mwm */; };
|
||||
342FDDE51C6C9071000038A0 /* MWMMapDownloaderDataSource.mm in Sources */ = {isa = PBXBuildFile; fileRef = 342FDDE41C6C9071000038A0 /* MWMMapDownloaderDataSource.mm */; };
|
||||
342FDDE61C6C9071000038A0 /* MWMMapDownloaderDataSource.mm in Sources */ = {isa = PBXBuildFile; fileRef = 342FDDE41C6C9071000038A0 /* MWMMapDownloaderDataSource.mm */; };
|
||||
3438CDF41B85F1170051AA78 /* MWMConsole.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3438CDF31B85F1170051AA78 /* MWMConsole.mm */; };
|
||||
|
@ -300,6 +294,12 @@
|
|||
560634F21B78806100F3D670 /* MWMTextToSpeech.mm in Sources */ = {isa = PBXBuildFile; fileRef = 560634F11B78806100F3D670 /* MWMTextToSpeech.mm */; };
|
||||
56C74C391C74A3BC00B71B9F /* MWMInputEmailValidator.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34ABA62F1C2D58F300FE1BEC /* MWMInputEmailValidator.mm */; };
|
||||
56D545631C74A41900E3719C /* Framework.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 34479C751C60C6130065D261 /* Framework.cpp */; };
|
||||
671182E11C7F0DD400CB8177 /* countries_obsolete.txt in Resources */ = {isa = PBXBuildFile; fileRef = 671182DE1C7F0DD400CB8177 /* countries_obsolete.txt */; };
|
||||
671182E21C7F0DD400CB8177 /* packed_polygons_obsolete.bin in Resources */ = {isa = PBXBuildFile; fileRef = 671182DF1C7F0DD400CB8177 /* packed_polygons_obsolete.bin */; };
|
||||
671182E31C7F0DD400CB8177 /* WorldCoasts_obsolete.mwm in Resources */ = {isa = PBXBuildFile; fileRef = 671182E01C7F0DD400CB8177 /* WorldCoasts_obsolete.mwm */; };
|
||||
671182E41C7F0DD800CB8177 /* WorldCoasts_obsolete.mwm in Resources */ = {isa = PBXBuildFile; fileRef = 671182E01C7F0DD400CB8177 /* WorldCoasts_obsolete.mwm */; };
|
||||
671182E51C7F0DDB00CB8177 /* packed_polygons_obsolete.bin in Resources */ = {isa = PBXBuildFile; fileRef = 671182DF1C7F0DD400CB8177 /* packed_polygons_obsolete.bin */; };
|
||||
671182E61C7F0DDD00CB8177 /* countries_obsolete.txt in Resources */ = {isa = PBXBuildFile; fileRef = 671182DE1C7F0DD400CB8177 /* countries_obsolete.txt */; };
|
||||
6741A9421BF340DE002C974C /* sound-strings in Resources */ = {isa = PBXBuildFile; fileRef = 5605022E1B6211E100169CAD /* sound-strings */; };
|
||||
6741A9431BF340DE002C974C /* MWMPlacePageDescriptionView.xib in Resources */ = {isa = PBXBuildFile; fileRef = F67BC26E1B254B1F00FE1D7B /* MWMPlacePageDescriptionView.xib */; };
|
||||
6741A9441BF340DE002C974C /* PlacePageBookmarkCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 342BB7AA1BC7CC5C00DF6443 /* PlacePageBookmarkCell.xib */; };
|
||||
|
@ -870,9 +870,6 @@
|
|||
342E75A11B302FCC00A8635F /* MWMPlacePageViewManagerDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMPlacePageViewManagerDelegate.h; sourceTree = "<group>"; };
|
||||
342EE40F1C43DAA7009F6A49 /* MWMAuthorizationWebViewLoginViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMAuthorizationWebViewLoginViewController.h; sourceTree = "<group>"; };
|
||||
342EE4101C43DAA7009F6A49 /* MWMAuthorizationWebViewLoginViewController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMAuthorizationWebViewLoginViewController.mm; sourceTree = "<group>"; };
|
||||
342F53961C529AF100229014 /* countries_migrate.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = countries_migrate.txt; path = ../../data/countries_migrate.txt; sourceTree = "<group>"; };
|
||||
342F53971C529AF100229014 /* packed_polygons_migrate.bin */ = {isa = PBXFileReference; lastKnownFileType = archive.macbinary; name = packed_polygons_migrate.bin; path = ../../data/packed_polygons_migrate.bin; sourceTree = "<group>"; };
|
||||
342F53981C529AF100229014 /* WorldCoasts_migrate.mwm */ = {isa = PBXFileReference; lastKnownFileType = file; name = WorldCoasts_migrate.mwm; path = ../../data/WorldCoasts_migrate.mwm; sourceTree = "<group>"; };
|
||||
342FDDE31C6C9071000038A0 /* MWMMapDownloaderDataSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMMapDownloaderDataSource.h; sourceTree = "<group>"; };
|
||||
342FDDE41C6C9071000038A0 /* MWMMapDownloaderDataSource.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMMapDownloaderDataSource.mm; sourceTree = "<group>"; };
|
||||
3434D7701BD12AEA00C77E44 /* th */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = th; path = th.lproj/InfoPlist.strings; sourceTree = "<group>"; };
|
||||
|
@ -1139,6 +1136,9 @@
|
|||
5605022E1B6211E100169CAD /* sound-strings */ = {isa = PBXFileReference; lastKnownFileType = folder; name = "sound-strings"; path = "../../data/sound-strings"; sourceTree = "<group>"; };
|
||||
560634F01B78804C00F3D670 /* MWMTextToSpeech.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMTextToSpeech.h; sourceTree = "<group>"; };
|
||||
560634F11B78806100F3D670 /* MWMTextToSpeech.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMTextToSpeech.mm; sourceTree = "<group>"; };
|
||||
671182DE1C7F0DD400CB8177 /* countries_obsolete.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = countries_obsolete.txt; path = ../../data/countries_obsolete.txt; sourceTree = "<group>"; };
|
||||
671182DF1C7F0DD400CB8177 /* packed_polygons_obsolete.bin */ = {isa = PBXFileReference; lastKnownFileType = archive.macbinary; name = packed_polygons_obsolete.bin; path = ../../data/packed_polygons_obsolete.bin; sourceTree = "<group>"; };
|
||||
671182E01C7F0DD400CB8177 /* WorldCoasts_obsolete.mwm */ = {isa = PBXFileReference; lastKnownFileType = file; name = WorldCoasts_obsolete.mwm; path = ../../data/WorldCoasts_obsolete.mwm; sourceTree = "<group>"; };
|
||||
6741AA5D1BF340DE002C974C /* xcMAPS.ME.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = xcMAPS.ME.app; sourceTree = BUILT_PRODUCTS_DIR; };
|
||||
6741AA5F1BF34185002C974C /* defaults.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = defaults.xcconfig; path = ../../xcode/defaults.xcconfig; sourceTree = "<group>"; };
|
||||
6741AAA21BF356B9002C974C /* libagg.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libagg.a; path = "../../../omim-xcode-build/Debug/libagg.a"; sourceTree = BUILT_PRODUCTS_DIR; };
|
||||
|
@ -2771,6 +2771,9 @@
|
|||
FA065FC61286143F00FEA989 /* External Resources */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
671182DE1C7F0DD400CB8177 /* countries_obsolete.txt */,
|
||||
671182DF1C7F0DD400CB8177 /* packed_polygons_obsolete.bin */,
|
||||
671182E01C7F0DD400CB8177 /* WorldCoasts_obsolete.mwm */,
|
||||
9DA46A101C47E95700EF52BA /* drules_proto_legacy.bin */,
|
||||
9DA46A111C47E95700EF52BA /* resources-6plus_legacy */,
|
||||
9DA46A041C47E92100EF52BA /* resources-hdpi_legacy */,
|
||||
|
@ -2814,9 +2817,6 @@
|
|||
FA46DA2B12D4166E00968C36 /* countries.txt */,
|
||||
FA85F632145DDDC20090E1A0 /* packed_polygons.bin */,
|
||||
EE026F0511D6AC0D00645242 /* classificator.txt */,
|
||||
342F53961C529AF100229014 /* countries_migrate.txt */,
|
||||
342F53971C529AF100229014 /* packed_polygons_migrate.bin */,
|
||||
342F53981C529AF100229014 /* WorldCoasts_migrate.mwm */,
|
||||
);
|
||||
name = "External Resources";
|
||||
sourceTree = "<group>";
|
||||
|
@ -3024,6 +3024,7 @@
|
|||
34B82ACB1B8465C100180497 /* MWMSearchCategoryCell.xib in Resources */,
|
||||
34CC4C0F1B82069C00E44C1F /* MWMSearchTabbedCollectionViewCell.xib in Resources */,
|
||||
FA46DA2C12D4166E00968C36 /* countries.txt in Resources */,
|
||||
671182E21C7F0DD400CB8177 /* packed_polygons_obsolete.bin in Resources */,
|
||||
4A23D15C1B8B4DD700D4EB6F /* resources-6plus_clear in Resources */,
|
||||
341F99DB1C6B1165001C67B8 /* MWMMapDownloaderPlaceTableViewCell.xib in Resources */,
|
||||
EE583CBB12F773F00042CBE3 /* unicode_blocks.txt in Resources */,
|
||||
|
@ -3064,8 +3065,6 @@
|
|||
9DA46A141C47E95700EF52BA /* resources-6plus_legacy in Resources */,
|
||||
B0DFE6311A1B78A200B6C35E /* LocalNotifications.plist in Resources */,
|
||||
34B82ABB1B837FFD00180497 /* MWMSearchHistoryRequestCell.xib in Resources */,
|
||||
342F539B1C529AF100229014 /* packed_polygons_migrate.bin in Resources */,
|
||||
342F53991C529AF100229014 /* countries_migrate.txt in Resources */,
|
||||
34F9FB921C43AF2400F71201 /* MWMStreetEditorEditTableViewCell.xib in Resources */,
|
||||
34B6CF5D1BBBFC6B009203C6 /* LaunchScreen.storyboard in Resources */,
|
||||
3476B8DC1BFDD30B00874594 /* tts-how-to-set-up-voice.html in Resources */,
|
||||
|
@ -3085,6 +3084,7 @@
|
|||
97A5967F19B9CD47007A963F /* copyright.html in Resources */,
|
||||
34B82ADF1B84A4A000180497 /* MWMSearchCommonCell.xib in Resources */,
|
||||
F6A750BB1BE8C7BA00981B41 /* MWMSearchHistoryMyPositionCell.xib in Resources */,
|
||||
671182E31C7F0DD400CB8177 /* WorldCoasts_obsolete.mwm in Resources */,
|
||||
4A7D89C51B2EBF3B00AC843E /* resources-6plus_dark in Resources */,
|
||||
FA459EB414327AF700B5BB3C /* WorldCoasts.mwm in Resources */,
|
||||
FA85F633145DDDC20090E1A0 /* packed_polygons.bin in Resources */,
|
||||
|
@ -3107,6 +3107,7 @@
|
|||
34634B1B1BB42D270013573C /* MWMBottomMenuCollectionViewLandscapeCell.xib in Resources */,
|
||||
347FDDA11BB59B4E00871410 /* Mapsme.storyboard in Resources */,
|
||||
3438CDF91B8616760051AA78 /* MWMSearchShowOnMapCell.xib in Resources */,
|
||||
671182E11C7F0DD400CB8177 /* countries_obsolete.txt in Resources */,
|
||||
4A300ED41C6DCFD400140018 /* countries-strings in Resources */,
|
||||
34BAB6EE1BB2DFCE00DB941B /* MWMBottomMenuCollectionViewPortraitCell.xib in Resources */,
|
||||
3401CD7F1C3CF1BE0028C6F8 /* MWMEditorSwitchTableViewCell.xib in Resources */,
|
||||
|
@ -3117,7 +3118,6 @@
|
|||
34B82AC51B84608600180497 /* MWMSearchHistoryClearCell.xib in Resources */,
|
||||
F6BB6CC01BB17D7000DF1DF2 /* MWMRoutePointCell.xib in Resources */,
|
||||
349A357B1B53D4C9009677EE /* MWMCircularProgress.xib in Resources */,
|
||||
342F539D1C529AF100229014 /* WorldCoasts_migrate.mwm in Resources */,
|
||||
F6CB21621AEE902B00FB8963 /* PlacePageLinkCell.xib in Resources */,
|
||||
3401CD781C3CED1E0028C6F8 /* MWMEditorSelectTableViewCell.xib in Resources */,
|
||||
349A35841B53E967009677EE /* MWMDownloadMapRequest.xib in Resources */,
|
||||
|
@ -3149,6 +3149,7 @@
|
|||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
676507611C10559B00830BB3 /* colors.txt in Resources */,
|
||||
671182E51C7F0DDB00CB8177 /* packed_polygons_obsolete.bin in Resources */,
|
||||
676507601C10559800830BB3 /* patterns.txt in Resources */,
|
||||
6741A9421BF340DE002C974C /* sound-strings in Resources */,
|
||||
6741A9431BF340DE002C974C /* MWMPlacePageDescriptionView.xib in Resources */,
|
||||
|
@ -3176,6 +3177,7 @@
|
|||
6741A9541BF340DE002C974C /* 02_droidsans-fallback.ttf in Resources */,
|
||||
341F99DC1C6B1165001C67B8 /* MWMMapDownloaderPlaceTableViewCell.xib in Resources */,
|
||||
6741A9551BF340DE002C974C /* resources-xxhdpi_dark in Resources */,
|
||||
671182E61C7F0DDD00CB8177 /* countries_obsolete.txt in Resources */,
|
||||
347FD86E1C60B2CE002FB65E /* MWMOpeningHoursAddScheduleTableViewCell.xib in Resources */,
|
||||
9DA46A0D1C47E92100EF52BA /* resources-xhdpi_legacy in Resources */,
|
||||
9DA46A0F1C47E92100EF52BA /* resources-xxhdpi_legacy in Resources */,
|
||||
|
@ -3198,9 +3200,7 @@
|
|||
6741A9641BF340DE002C974C /* MWMSearchDownloadViewController.xib in Resources */,
|
||||
347FD8881C60B2CE002FB65E /* MWMOpeningHoursTimeSelectorTableViewCell.xib in Resources */,
|
||||
9DA46A151C47E95700EF52BA /* resources-6plus_legacy in Resources */,
|
||||
342F539C1C529AF100229014 /* packed_polygons_migrate.bin in Resources */,
|
||||
347FD8721C60B2CE002FB65E /* MWMOpeningHoursAllDayTableViewCell.xib in Resources */,
|
||||
342F539A1C529AF100229014 /* countries_migrate.txt in Resources */,
|
||||
34F9FB931C43AF2400F71201 /* MWMStreetEditorEditTableViewCell.xib in Resources */,
|
||||
6741A9651BF340DE002C974C /* LocalNotifications.plist in Resources */,
|
||||
6741A9661BF340DE002C974C /* MWMSearchHistoryRequestCell.xib in Resources */,
|
||||
|
@ -3249,11 +3249,11 @@
|
|||
340C21141C3FFE3100111D22 /* MWMCuisineEditorTableViewCell.xib in Resources */,
|
||||
6741A9871BF340DE002C974C /* drules_proto_clear.bin in Resources */,
|
||||
6741A9881BF340DE002C974C /* MWMAPIBarView.xib in Resources */,
|
||||
671182E41C7F0DD800CB8177 /* WorldCoasts_obsolete.mwm in Resources */,
|
||||
347FD87A1C60B2CE002FB65E /* MWMOpeningHoursDaysSelectorTableViewCell.xib in Resources */,
|
||||
6741A9891BF340DE002C974C /* MWMSearchHistoryClearCell.xib in Resources */,
|
||||
347FD86A1C60B2CE002FB65E /* MWMOpeningHoursAddClosedTableViewCell.xib in Resources */,
|
||||
6741A98A1BF340DE002C974C /* MWMRoutePointCell.xib in Resources */,
|
||||
342F539E1C529AF100229014 /* WorldCoasts_migrate.mwm in Resources */,
|
||||
6741A98B1BF340DE002C974C /* MWMCircularProgress.xib in Resources */,
|
||||
6741A98C1BF340DE002C974C /* PlacePageLinkCell.xib in Resources */,
|
||||
6741A98D1BF340DE002C974C /* MWMDownloadMapRequest.xib in Resources */,
|
||||
|
|
|
@ -282,7 +282,7 @@ void Framework::Migrate(bool keepDownloaded)
|
|||
}
|
||||
|
||||
Framework::Framework()
|
||||
: m_storage(platform::migrate::NeedMigrate() ? COUNTRIES_FILE : COUNTRIES_MIGRATE_FILE)
|
||||
: m_storage(platform::migrate::NeedMigrate() ? COUNTRIES_OBSOLETE_FILE : COUNTRIES_FILE)
|
||||
, m_bmManager(*this)
|
||||
, m_fixedSearchResults(0)
|
||||
, m_lastReportedCountry(kInvalidCountryId)
|
||||
|
|
|
@ -254,7 +254,7 @@ void FindAllLocalMapsAndCleanup(int64_t latestVersion, string const & dataDir,
|
|||
// World and WorldCoasts can be stored in app bundle or in resources
|
||||
// directory, thus it's better to get them via Platform.
|
||||
for (string const & file : { WORLD_FILE_NAME,
|
||||
(migrate::NeedMigrate() ? WORLD_COASTS_FILE_NAME : WORLD_COASTS_MIGRATE_FILE_NAME) })
|
||||
(migrate::NeedMigrate() ? WORLD_COASTS_OBSOLETE_FILE_NAME : WORLD_COASTS_FILE_NAME) })
|
||||
{
|
||||
auto i = localFiles.begin();
|
||||
for (; i != localFiles.end(); ++i)
|
||||
|
|
|
@ -37,7 +37,7 @@ bool IsResource(string const & file, string const & ext)
|
|||
if (ext == DATA_FILE_EXTENSION)
|
||||
{
|
||||
return (strings::StartsWith(file, WORLD_COASTS_FILE_NAME) ||
|
||||
strings::StartsWith(file, WORLD_COASTS_MIGRATE_FILE_NAME) ||
|
||||
strings::StartsWith(file, WORLD_COASTS_OBSOLETE_FILE_NAME) ||
|
||||
strings::StartsWith(file, WORLD_FILE_NAME));
|
||||
}
|
||||
else if (ext == BOOKMARKS_FILE_EXTENSION ||
|
||||
|
|
|
@ -295,7 +295,7 @@ UNIT_TEST(LocalCountryFile_AllLocalFilesLookup)
|
|||
worldFound = true;
|
||||
TEST_NOT_EQUAL(0, file.GetVersion(), (file));
|
||||
}
|
||||
if (file.GetCountryName() == WORLD_COASTS_FILE_NAME)
|
||||
if (file.GetCountryName() == WORLD_COASTS_OBSOLETE_FILE_NAME)
|
||||
{
|
||||
worldCoastsFound = true;
|
||||
TEST_NOT_EQUAL(0, file.GetVersion(), (file));
|
||||
|
|
|
@ -119,7 +119,7 @@ uint64_t ReadVersionFromHeader(platform::LocalCountryFile const & mwm)
|
|||
vector<string> specialFiles = {
|
||||
WORLD_FILE_NAME,
|
||||
WORLD_COASTS_FILE_NAME,
|
||||
WORLD_COASTS_MIGRATE_FILE_NAME
|
||||
WORLD_COASTS_OBSOLETE_FILE_NAME
|
||||
};
|
||||
for (auto const & name : specialFiles)
|
||||
{
|
||||
|
|
|
@ -190,8 +190,8 @@ unique_ptr<CountryInfoGetter> CountryInfoReader::CreateCountryInfoReaderTwoCompo
|
|||
{
|
||||
try
|
||||
{
|
||||
CountryInfoReader * result = new CountryInfoReader(platform.GetReader(PACKED_POLYGONS_FILE),
|
||||
platform.GetReader(COUNTRIES_FILE));
|
||||
CountryInfoReader * result = new CountryInfoReader(platform.GetReader(PACKED_POLYGONS_OBSOLETE_FILE),
|
||||
platform.GetReader(COUNTRIES_OBSOLETE_FILE));
|
||||
return unique_ptr<CountryInfoReader>(result);
|
||||
}
|
||||
catch (RootException const & e)
|
||||
|
@ -208,8 +208,8 @@ unique_ptr<CountryInfoGetter> CountryInfoReader::CreateCountryInfoReaderOneCompo
|
|||
try
|
||||
{
|
||||
CountryInfoReader * result =
|
||||
new CountryInfoReader(platform.GetReader(PACKED_POLYGONS_MIGRATE_FILE),
|
||||
platform.GetReader(COUNTRIES_MIGRATE_FILE));
|
||||
new CountryInfoReader(platform.GetReader(PACKED_POLYGONS_FILE),
|
||||
platform.GetReader(COUNTRIES_FILE));
|
||||
return unique_ptr<CountryInfoReader>(result);
|
||||
}
|
||||
catch (RootException const & e)
|
||||
|
|
|
@ -183,7 +183,7 @@ void Storage::PrefetchMigrateData()
|
|||
{
|
||||
ASSERT_THREAD_CHECKER(m_threadChecker, ());
|
||||
|
||||
m_prefetchStorage.reset(new Storage(COUNTRIES_MIGRATE_FILE, "migrate"));
|
||||
m_prefetchStorage.reset(new Storage(COUNTRIES_FILE, "migrate"));
|
||||
m_prefetchStorage->Init([](LocalCountryFile const &){});
|
||||
if (!m_downloadingUrlsForTesting.empty())
|
||||
m_prefetchStorage->SetDownloadingUrlsForTesting(m_downloadingUrlsForTesting);
|
||||
|
@ -199,7 +199,7 @@ void Storage::Migrate(TCountriesVec const & existedCountries)
|
|||
m_countries.Clear();
|
||||
|
||||
TMapping mapping;
|
||||
LoadCountriesFile(COUNTRIES_MIGRATE_FILE, m_dataDir, &mapping);
|
||||
LoadCountriesFile(COUNTRIES_FILE, m_dataDir, &mapping);
|
||||
|
||||
vector<TCountryId> prefetchedMaps;
|
||||
m_prefetchStorage->GetLocalRealMaps(prefetchedMaps);
|
||||
|
@ -879,7 +879,7 @@ void Storage::GetOutdatedCountries(vector<Country const *> & countries) const
|
|||
string const name = GetCountryFile(countryId).GetName();
|
||||
TLocalFilePtr file = GetLatestLocalFile(countryId);
|
||||
if (file && file->GetVersion() != GetCurrentDataVersion() &&
|
||||
name != WORLD_COASTS_FILE_NAME && name != WORLD_COASTS_MIGRATE_FILE_NAME && name != WORLD_FILE_NAME)
|
||||
name != WORLD_COASTS_FILE_NAME && name != WORLD_COASTS_OBSOLETE_FILE_NAME && name != WORLD_FILE_NAME)
|
||||
{
|
||||
countries.push_back(&CountryLeafByCountryId(countryId));
|
||||
}
|
||||
|
|
|
@ -62,7 +62,7 @@ UNIT_TEST(SmallMwms_InterruptDownloadResumeDownload_Test)
|
|||
// Start download but interrupt it
|
||||
|
||||
{
|
||||
Storage storage(COUNTRIES_MIGRATE_FILE);
|
||||
Storage storage(COUNTRIES_FILE);
|
||||
TEST(version::IsSingleMwm(storage.GetCurrentDataVersion()), ());
|
||||
|
||||
auto onProgressFn = [](TCountryId const & countryId, TLocalAndRemoteSize const & mapSize)
|
||||
|
@ -85,7 +85,7 @@ UNIT_TEST(SmallMwms_InterruptDownloadResumeDownload_Test)
|
|||
// Continue download
|
||||
|
||||
{
|
||||
Storage storage(COUNTRIES_MIGRATE_FILE);
|
||||
Storage storage(COUNTRIES_FILE);
|
||||
|
||||
auto onProgressFn = [](TCountryId const & countryId, TLocalAndRemoteSize const & mapSize)
|
||||
{
|
||||
|
|
|
@ -255,7 +255,7 @@ void TestDownloadDelete(bool downloadOneByOne, bool deleteOneByOne)
|
|||
{
|
||||
WritableDirChanger writableDirChanger(kMapTestDir);
|
||||
|
||||
Storage storage(COUNTRIES_MIGRATE_FILE);
|
||||
Storage storage(COUNTRIES_FILE);
|
||||
|
||||
TEST(version::IsSingleMwm(storage.GetCurrentDataVersion()), ());
|
||||
string const version = strings::to_string(storage.GetCurrentDataVersion());
|
||||
|
|
|
@ -44,7 +44,7 @@ UNIT_TEST(StorageDownloadNodeAndDeleteNodeTests)
|
|||
{
|
||||
WritableDirChanger writableDirChanger(kMapTestDir);
|
||||
|
||||
Storage storage(COUNTRIES_MIGRATE_FILE);
|
||||
Storage storage(COUNTRIES_FILE);
|
||||
TEST(version::IsSingleMwm(storage.GetCurrentDataVersion()), ());
|
||||
|
||||
auto ChangeCountryFunction = [&](TCountryId const & countryId)
|
||||
|
|
|
@ -24,7 +24,7 @@ string const kTestWebServer = "http://new-search.mapswithme.com/";
|
|||
|
||||
string const kMapTestDir = "map-tests";
|
||||
|
||||
string const kCountriesTxtFile = COUNTRIES_MIGRATE_FILE;
|
||||
string const kCountriesTxtFile = COUNTRIES_FILE;
|
||||
|
||||
string const kMwmVersion1 = "160126";
|
||||
size_t const kCountriesTxtFileSize1 = 131201;
|
||||
|
|
|
@ -115,7 +115,7 @@ UNIT_TEST(CountryInfoGetter_HitsInTheMiddleOfNowhere)
|
|||
UNIT_TEST(CountryInfoGetter_GetLimitRectForLeafSingleMwm)
|
||||
{
|
||||
auto const getter = CreateCountryInfoGetterMigrate();
|
||||
Storage storage(COUNTRIES_MIGRATE_FILE);
|
||||
Storage storage(COUNTRIES_FILE);
|
||||
if (!version::IsSingleMwm(storage.GetCurrentDataVersion()))
|
||||
return;
|
||||
|
||||
|
|
|
@ -523,7 +523,7 @@ UNIT_TEST(StorageTest_SingleCountryDownloading)
|
|||
|
||||
UNIT_TEST(StorageTest_TwoCountriesDownloading)
|
||||
{
|
||||
Storage storage;
|
||||
Storage storage(COUNTRIES_OBSOLETE_FILE);
|
||||
TaskRunner runner;
|
||||
InitStorage(storage, runner);
|
||||
|
||||
|
@ -550,7 +550,7 @@ UNIT_TEST(StorageTest_TwoCountriesDownloading)
|
|||
|
||||
UNIT_TEST(StorageTest_DeleteTwoVersionsOfTheSameCountry)
|
||||
{
|
||||
Storage storage;
|
||||
Storage storage(COUNTRIES_OBSOLETE_FILE);
|
||||
bool const isSingleMwm = version::IsSingleMwm(storage.GetCurrentDataVersion());
|
||||
if (isSingleMwm)
|
||||
storage.SetCurrentDataVersionForTesting(version::FOR_TESTING_SINGLE_MWM_LATEST);
|
||||
|
@ -702,7 +702,7 @@ UNIT_TEST(StorageTest_DeletePendingCountry)
|
|||
|
||||
UNIT_TEST(StorageTest_DownloadTwoCountriesAndDeleteSingleMwm)
|
||||
{
|
||||
Storage storage;
|
||||
Storage storage(COUNTRIES_OBSOLETE_FILE);
|
||||
if (!version::IsSingleMwm(storage.GetCurrentDataVersion()))
|
||||
return;
|
||||
|
||||
|
@ -832,7 +832,7 @@ UNIT_TEST(StorageTest_CancelDownloadingWhenAlmostDone)
|
|||
|
||||
UNIT_TEST(StorageTest_DeleteCountrySingleMwm)
|
||||
{
|
||||
Storage storage(COUNTRIES_MIGRATE_FILE, kMapTestDir);
|
||||
Storage storage(COUNTRIES_FILE, kMapTestDir);
|
||||
TaskRunner runner;
|
||||
InitStorage(storage, runner);
|
||||
|
||||
|
@ -998,7 +998,7 @@ UNIT_TEST(StorageTest_HasCountryId)
|
|||
|
||||
UNIT_TEST(StorageTest_DownloadedMapTests)
|
||||
{
|
||||
Storage storage(COUNTRIES_MIGRATE_FILE);
|
||||
Storage storage(COUNTRIES_FILE);
|
||||
|
||||
TaskRunner runner;
|
||||
InitStorage(storage, runner);
|
||||
|
@ -1127,7 +1127,7 @@ UNIT_TEST(StorageTest_TwoInstance)
|
|||
string const writableDir = platform.WritableDir();
|
||||
|
||||
string const testDir1 = string("testdir1");
|
||||
Storage storage1(COUNTRIES_FILE, testDir1);
|
||||
Storage storage1(COUNTRIES_OBSOLETE_FILE, testDir1);
|
||||
platform::tests_support::ScopedDir removeTestDir1(testDir1);
|
||||
UNUSED_VALUE(removeTestDir1);
|
||||
string const versionDir1 =
|
||||
|
@ -1138,7 +1138,7 @@ UNIT_TEST(StorageTest_TwoInstance)
|
|||
InitStorage(storage1, runner1);
|
||||
|
||||
string const testDir2 = string("testdir2");
|
||||
Storage storage2(COUNTRIES_MIGRATE_FILE, testDir2);
|
||||
Storage storage2(COUNTRIES_FILE, testDir2);
|
||||
platform::tests_support::ScopedDir removeTestDir2(testDir2);
|
||||
UNUSED_VALUE(removeTestDir2);
|
||||
string const versionDir2 =
|
||||
|
@ -1347,7 +1347,7 @@ UNIT_TEST(StorageTest_ForEachAncestorExceptForTheRoot)
|
|||
|
||||
UNIT_TEST(StorageTest_CalcLimitRect)
|
||||
{
|
||||
Storage storage(COUNTRIES_MIGRATE_FILE);
|
||||
Storage storage(COUNTRIES_FILE);
|
||||
if (!version::IsSingleMwm(storage.GetCurrentDataVersion()))
|
||||
return;
|
||||
|
||||
|
|
|
@ -147,7 +147,6 @@ MERGE_INTERVAL=${MERGE_INTERVAL:-40}
|
|||
NODE_STORAGE=${NODE_STORAGE:-${NS:-mem}}
|
||||
ASYNC_PBF=${ASYNC_PBF-}
|
||||
KEEP_INTDIR=${KEEP_INTDIR-1}
|
||||
MIGRATE=${MIGRATE-1}
|
||||
# nproc is linux-only
|
||||
if [ "$(uname -s)" == "Darwin" ]; then
|
||||
CPUS="$(sysctl -n hw.ncpu)"
|
||||
|
@ -444,13 +443,6 @@ if [ "$MODE" == "resources" ]; then
|
|||
"$SCRIPTS_PATH/../python/hierarchy_to_countries.py" --target "$TARGET" --hierarchy "$DATA_PATH/hierarchy.txt" --version "$COUNTRIES_VERSION" \
|
||||
--legacy --sort --names "$DATA_PATH/mwm_names_en.txt" --output "$TARGET/countries.txt" >> "$PLANET_LOG" 2>&1
|
||||
|
||||
# Migration suffix
|
||||
if [ -n "$MIGRATE" ]; then
|
||||
mv "$TARGET/countries.txt" "$TARGET/countries_migrate.txt"
|
||||
mv "$TARGET/WorldCoasts.mwm" "$TARGET/WorldCoasts_migrate.mwm"
|
||||
cp "$DATA_PATH/WorldCoasts.mwm" "$TARGET"
|
||||
fi
|
||||
|
||||
# A quick fix: chmodding to a+rw all generated files
|
||||
for file in "$TARGET"/*.mwm*; do
|
||||
chmod 0666 "$file"
|
||||
|
|
|
@ -16,6 +16,9 @@
|
|||
670D05991B0CBD5A0013A7AC /* draw_widget.hpp in Sources */ = {isa = PBXBuildFile; fileRef = 675345711A404CB200A0A8C3 /* draw_widget.hpp */; };
|
||||
670D059A1B0CBD5B0013A7AC /* mainwindow.hpp in Sources */ = {isa = PBXBuildFile; fileRef = 675345761A404CB200A0A8C3 /* mainwindow.hpp */; };
|
||||
670D059B1B0CBD5B0013A7AC /* proxystyle.hpp in Sources */ = {isa = PBXBuildFile; fileRef = 6753457A1A404CB200A0A8C3 /* proxystyle.hpp */; };
|
||||
671182DB1C7F0D8C00CB8177 /* countries_obsolete.txt in Resources */ = {isa = PBXBuildFile; fileRef = 671182D81C7F0D8C00CB8177 /* countries_obsolete.txt */; };
|
||||
671182DC1C7F0D8C00CB8177 /* packed_polygons_obsolete.bin in Resources */ = {isa = PBXBuildFile; fileRef = 671182D91C7F0D8C00CB8177 /* packed_polygons_obsolete.bin */; };
|
||||
671182DD1C7F0D8C00CB8177 /* WorldCoasts_obsolete.mwm in Resources */ = {isa = PBXBuildFile; fileRef = 671182DA1C7F0D8C00CB8177 /* WorldCoasts_obsolete.mwm */; };
|
||||
6714E5E41BD13F67008AB603 /* drules_proto_clear.bin in CopyFiles */ = {isa = PBXBuildFile; fileRef = 6714E5DE1BD13F67008AB603 /* drules_proto_clear.bin */; };
|
||||
6714E5E61BD13F67008AB603 /* drules_proto_dark.bin in CopyFiles */ = {isa = PBXBuildFile; fileRef = 6714E5E01BD13F67008AB603 /* drules_proto_dark.bin */; };
|
||||
6714E6021BD14016008AB603 /* resources-mdpi_clear in Resources */ = {isa = PBXBuildFile; fileRef = 6714E6001BD14016008AB603 /* resources-mdpi_clear */; };
|
||||
|
@ -79,9 +82,6 @@
|
|||
675340A01C5289E0002CF0D9 /* osm_auth_dialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6753409D1C5289E0002CF0D9 /* osm_auth_dialog.cpp */; };
|
||||
675340A11C528A1C002CF0D9 /* editor_dialog.hpp in Sources */ = {isa = PBXBuildFile; fileRef = 6753409C1C5289E0002CF0D9 /* editor_dialog.hpp */; };
|
||||
675340A21C528A1C002CF0D9 /* osm_auth_dialog.hpp in Sources */ = {isa = PBXBuildFile; fileRef = 6753409E1C5289E0002CF0D9 /* osm_auth_dialog.hpp */; };
|
||||
675340A61C528F02002CF0D9 /* countries_migrate.txt in CopyFiles */ = {isa = PBXBuildFile; fileRef = 675340A31C528F02002CF0D9 /* countries_migrate.txt */; };
|
||||
675340A71C528F02002CF0D9 /* packed_polygons_migrate.bin in CopyFiles */ = {isa = PBXBuildFile; fileRef = 675340A41C528F02002CF0D9 /* packed_polygons_migrate.bin */; };
|
||||
675340A81C528F02002CF0D9 /* WorldCoasts_migrate.mwm in CopyFiles */ = {isa = PBXBuildFile; fileRef = 675340A51C528F02002CF0D9 /* WorldCoasts_migrate.mwm */; };
|
||||
675345861A404CB200A0A8C3 /* about.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6753456C1A404CB200A0A8C3 /* about.cpp */; };
|
||||
675345881A404CB200A0A8C3 /* draw_widget.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 675345701A404CB200A0A8C3 /* draw_widget.cpp */; };
|
||||
675345891A404CB200A0A8C3 /* info_dialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 675345721A404CB200A0A8C3 /* info_dialog.cpp */; };
|
||||
|
@ -142,9 +142,6 @@
|
|||
dstPath = "";
|
||||
dstSubfolderSpec = 7;
|
||||
files = (
|
||||
675340A61C528F02002CF0D9 /* countries_migrate.txt in CopyFiles */,
|
||||
675340A71C528F02002CF0D9 /* packed_polygons_migrate.bin in CopyFiles */,
|
||||
675340A81C528F02002CF0D9 /* WorldCoasts_migrate.mwm in CopyFiles */,
|
||||
67A461A71C2172C400B18739 /* 07_roboto_medium.ttf in CopyFiles */,
|
||||
6714E5E41BD13F67008AB603 /* drules_proto_clear.bin in CopyFiles */,
|
||||
6714E5E61BD13F67008AB603 /* drules_proto_dark.bin in CopyFiles */,
|
||||
|
@ -176,6 +173,9 @@
|
|||
|
||||
/* Begin PBXFileReference section */
|
||||
670D05BC1B0E10640013A7AC /* defaults.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = defaults.xcconfig; path = ../defaults.xcconfig; sourceTree = "<group>"; };
|
||||
671182D81C7F0D8C00CB8177 /* countries_obsolete.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = countries_obsolete.txt; sourceTree = "<group>"; };
|
||||
671182D91C7F0D8C00CB8177 /* packed_polygons_obsolete.bin */ = {isa = PBXFileReference; lastKnownFileType = archive.macbinary; path = packed_polygons_obsolete.bin; sourceTree = "<group>"; };
|
||||
671182DA1C7F0D8C00CB8177 /* WorldCoasts_obsolete.mwm */ = {isa = PBXFileReference; lastKnownFileType = file; path = WorldCoasts_obsolete.mwm; sourceTree = "<group>"; };
|
||||
6714E5DE1BD13F67008AB603 /* drules_proto_clear.bin */ = {isa = PBXFileReference; lastKnownFileType = archive.macbinary; path = drules_proto_clear.bin; sourceTree = "<group>"; };
|
||||
6714E5E01BD13F67008AB603 /* drules_proto_dark.bin */ = {isa = PBXFileReference; lastKnownFileType = archive.macbinary; path = drules_proto_dark.bin; sourceTree = "<group>"; };
|
||||
6714E6001BD14016008AB603 /* resources-mdpi_clear */ = {isa = PBXFileReference; lastKnownFileType = folder; path = "resources-mdpi_clear"; sourceTree = "<group>"; };
|
||||
|
@ -241,9 +241,6 @@
|
|||
6753409C1C5289E0002CF0D9 /* editor_dialog.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = editor_dialog.hpp; sourceTree = "<group>"; };
|
||||
6753409D1C5289E0002CF0D9 /* osm_auth_dialog.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = osm_auth_dialog.cpp; sourceTree = "<group>"; };
|
||||
6753409E1C5289E0002CF0D9 /* osm_auth_dialog.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = osm_auth_dialog.hpp; sourceTree = "<group>"; };
|
||||
675340A31C528F02002CF0D9 /* countries_migrate.txt */ = {isa = PBXFileReference; lastKnownFileType = text; path = countries_migrate.txt; sourceTree = "<group>"; };
|
||||
675340A41C528F02002CF0D9 /* packed_polygons_migrate.bin */ = {isa = PBXFileReference; lastKnownFileType = archive.macbinary; path = packed_polygons_migrate.bin; sourceTree = "<group>"; };
|
||||
675340A51C528F02002CF0D9 /* WorldCoasts_migrate.mwm */ = {isa = PBXFileReference; lastKnownFileType = file; path = WorldCoasts_migrate.mwm; sourceTree = "<group>"; };
|
||||
675345491A404C6100A0A8C3 /* MapsMe.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = MapsMe.app; sourceTree = BUILT_PRODUCTS_DIR; };
|
||||
6753454D1A404C6100A0A8C3 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
|
||||
6753456C1A404CB200A0A8C3 /* about.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = about.cpp; sourceTree = "<group>"; };
|
||||
|
@ -389,15 +386,15 @@
|
|||
6729A5C91A693045007D5872 /* Resources */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
671182D81C7F0D8C00CB8177 /* countries_obsolete.txt */,
|
||||
671182D91C7F0D8C00CB8177 /* packed_polygons_obsolete.bin */,
|
||||
671182DA1C7F0D8C00CB8177 /* WorldCoasts_obsolete.mwm */,
|
||||
9DA46A1A1C47E9E200EF52BA /* drules_proto_legacy.bin */,
|
||||
9DA46A1B1C47E9E200EF52BA /* resources-hdpi_legacy */,
|
||||
9DA46A1C1C47E9E200EF52BA /* resources-ldpi_legacy */,
|
||||
9DA46A1D1C47E9E200EF52BA /* resources-mdpi_legacy */,
|
||||
9DA46A1E1C47E9E200EF52BA /* resources-xhdpi_legacy */,
|
||||
9DA46A1F1C47E9E200EF52BA /* resources-xxhdpi_legacy */,
|
||||
675340A31C528F02002CF0D9 /* countries_migrate.txt */,
|
||||
675340A41C528F02002CF0D9 /* packed_polygons_migrate.bin */,
|
||||
675340A51C528F02002CF0D9 /* WorldCoasts_migrate.mwm */,
|
||||
677A2DE71C0DDD7C00635A00 /* resources-default */,
|
||||
6714E5DE1BD13F67008AB603 /* drules_proto_clear.bin */,
|
||||
6714E5E01BD13F67008AB603 /* drules_proto_dark.bin */,
|
||||
|
@ -559,11 +556,14 @@
|
|||
677A2DEB1C0DDDBE00635A00 /* resources-default in Resources */,
|
||||
6714E6031BD14016008AB603 /* resources-mdpi_dark in Resources */,
|
||||
9DA46A231C47E9E200EF52BA /* resources-mdpi_legacy in Resources */,
|
||||
671182DD1C7F0D8C00CB8177 /* WorldCoasts_obsolete.mwm in Resources */,
|
||||
9DA46A251C47E9E200EF52BA /* resources-xxhdpi_legacy in Resources */,
|
||||
6714E6021BD14016008AB603 /* resources-mdpi_clear in Resources */,
|
||||
9DA46A241C47E9E200EF52BA /* resources-xhdpi_legacy in Resources */,
|
||||
6729A6681A69394D007D5872 /* resources.qrc in Resources */,
|
||||
9DA46A201C47E9E200EF52BA /* drules_proto_legacy.bin in Resources */,
|
||||
671182DC1C7F0D8C00CB8177 /* packed_polygons_obsolete.bin in Resources */,
|
||||
671182DB1C7F0D8C00CB8177 /* countries_obsolete.txt in Resources */,
|
||||
9DA46A221C47E9E200EF52BA /* resources-ldpi_legacy in Resources */,
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
|
|
|
@ -9,6 +9,8 @@
|
|||
/* Begin PBXBuildFile section */
|
||||
670E39441C46C76900E9C0A6 /* sunrise_sunset.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670E39421C46C76900E9C0A6 /* sunrise_sunset.cpp */; };
|
||||
670E39451C46C76900E9C0A6 /* sunrise_sunset.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 670E39431C46C76900E9C0A6 /* sunrise_sunset.hpp */; };
|
||||
671182F01C807C0A00CB8177 /* gmtime.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 671182EE1C807C0A00CB8177 /* gmtime.cpp */; };
|
||||
671182F11C807C0A00CB8177 /* gmtime.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 671182EF1C807C0A00CB8177 /* gmtime.hpp */; };
|
||||
674A7E2E1C0DB03D003D48E1 /* timegm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 674A7E2C1C0DB03D003D48E1 /* timegm.cpp */; };
|
||||
674A7E2F1C0DB03D003D48E1 /* timegm.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 674A7E2D1C0DB03D003D48E1 /* timegm.hpp */; };
|
||||
675341CB1A3F57E400A0A8C3 /* array_adapters.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675341851A3F57E400A0A8C3 /* array_adapters.hpp */; };
|
||||
|
@ -77,6 +79,8 @@
|
|||
670D05AA1B0E057B0013A7AC /* defaults.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = defaults.xcconfig; path = ../defaults.xcconfig; sourceTree = "<group>"; };
|
||||
670E39421C46C76900E9C0A6 /* sunrise_sunset.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = sunrise_sunset.cpp; sourceTree = "<group>"; };
|
||||
670E39431C46C76900E9C0A6 /* sunrise_sunset.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = sunrise_sunset.hpp; sourceTree = "<group>"; };
|
||||
671182EE1C807C0A00CB8177 /* gmtime.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = gmtime.cpp; sourceTree = "<group>"; };
|
||||
671182EF1C807C0A00CB8177 /* gmtime.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = gmtime.hpp; sourceTree = "<group>"; };
|
||||
674A7E2C1C0DB03D003D48E1 /* timegm.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = timegm.cpp; sourceTree = "<group>"; };
|
||||
674A7E2D1C0DB03D003D48E1 /* timegm.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = timegm.hpp; sourceTree = "<group>"; };
|
||||
675341771A3F57BF00A0A8C3 /* libbase.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libbase.a; sourceTree = BUILT_PRODUCTS_DIR; };
|
||||
|
@ -171,6 +175,8 @@
|
|||
675341791A3F57BF00A0A8C3 /* base */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
671182EE1C807C0A00CB8177 /* gmtime.cpp */,
|
||||
671182EF1C807C0A00CB8177 /* gmtime.hpp */,
|
||||
670E39421C46C76900E9C0A6 /* sunrise_sunset.cpp */,
|
||||
670E39431C46C76900E9C0A6 /* sunrise_sunset.hpp */,
|
||||
674A7E2C1C0DB03D003D48E1 /* timegm.cpp */,
|
||||
|
@ -262,6 +268,7 @@
|
|||
675341E21A3F57E400A0A8C3 /* macros.hpp in Headers */,
|
||||
6753420D1A3F57E400A0A8C3 /* threaded_priority_queue.hpp in Headers */,
|
||||
675341EF1A3F57E400A0A8C3 /* rolling_hash.hpp in Headers */,
|
||||
671182F11C807C0A00CB8177 /* gmtime.hpp in Headers */,
|
||||
675342021A3F57E400A0A8C3 /* string_utils.hpp in Headers */,
|
||||
675341E41A3F57E400A0A8C3 /* matrix.hpp in Headers */,
|
||||
675341D81A3F57E400A0A8C3 /* condition.hpp in Headers */,
|
||||
|
@ -372,6 +379,7 @@
|
|||
6753420A1A3F57E400A0A8C3 /* threaded_container.cpp in Sources */,
|
||||
675341FF1A3F57E400A0A8C3 /* string_format.cpp in Sources */,
|
||||
675341DF1A3F57E400A0A8C3 /* logging.cpp in Sources */,
|
||||
671182F01C807C0A00CB8177 /* gmtime.cpp in Sources */,
|
||||
675341D71A3F57E400A0A8C3 /* condition.cpp in Sources */,
|
||||
67B52B601AD3C84E00664C17 /* thread_checker.cpp in Sources */,
|
||||
675341E71A3F57E400A0A8C3 /* normalize_unicode.cpp in Sources */,
|
||||
|
|
|
@ -13,6 +13,7 @@
|
|||
56EB1EDF1C6B6E6C0022D831 /* mwm_traits.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 56EB1EDB1C6B6E6C0022D831 /* mwm_traits.hpp */; };
|
||||
670E8C761BB318AB00094197 /* platform_ios.mm in Sources */ = {isa = PBXBuildFile; fileRef = 670E8C741BB318AB00094197 /* platform_ios.mm */; };
|
||||
670E8C911BB31A2F00094197 /* ios_video_timer.mm in Sources */ = {isa = PBXBuildFile; fileRef = 670E8C901BB31A2F00094197 /* ios_video_timer.mm */; };
|
||||
671182F31C80AC4200CB8177 /* WorldCoasts_obsolete.mwm in Resources */ = {isa = PBXBuildFile; fileRef = 671182F21C80AC3D00CB8177 /* WorldCoasts_obsolete.mwm */; };
|
||||
671C62061AE9014C00076BD0 /* measurement_utils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 671C62041AE9014C00076BD0 /* measurement_utils.cpp */; };
|
||||
671C62071AE9014C00076BD0 /* measurement_utils.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 671C62051AE9014C00076BD0 /* measurement_utils.hpp */; };
|
||||
67247FFD1C60BD6500EDE56A /* write_dir_changer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 67247FFB1C60BD6500EDE56A /* write_dir_changer.cpp */; };
|
||||
|
@ -101,6 +102,7 @@
|
|||
670D05A71B0E03BF0013A7AC /* defaults.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = defaults.xcconfig; path = ../defaults.xcconfig; sourceTree = "<group>"; };
|
||||
670E8C741BB318AB00094197 /* platform_ios.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = platform_ios.mm; sourceTree = "<group>"; };
|
||||
670E8C901BB31A2F00094197 /* ios_video_timer.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ios_video_timer.mm; sourceTree = "<group>"; };
|
||||
671182F21C80AC3D00CB8177 /* WorldCoasts_obsolete.mwm */ = {isa = PBXFileReference; lastKnownFileType = file; path = WorldCoasts_obsolete.mwm; sourceTree = "<group>"; };
|
||||
671C62041AE9014C00076BD0 /* measurement_utils.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = measurement_utils.cpp; sourceTree = "<group>"; };
|
||||
671C62051AE9014C00076BD0 /* measurement_utils.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = measurement_utils.hpp; sourceTree = "<group>"; };
|
||||
67247FFB1C60BD6500EDE56A /* write_dir_changer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = write_dir_changer.cpp; sourceTree = "<group>"; };
|
||||
|
@ -355,6 +357,7 @@
|
|||
678338A91C6DF4BD00FD6263 /* Resources */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
671182F21C80AC3D00CB8177 /* WorldCoasts_obsolete.mwm */,
|
||||
678338B01C6E016700FD6263 /* World.mwm */,
|
||||
678338B11C6E016700FD6263 /* WorldCoasts.mwm */,
|
||||
678338AB1C6DF50700FD6263 /* classificator.txt */,
|
||||
|
@ -511,6 +514,7 @@
|
|||
files = (
|
||||
678338AD1C6DF51D00FD6263 /* classificator.txt in Resources */,
|
||||
678338AE1C6DF51D00FD6263 /* minsk-pass.mwm in Resources */,
|
||||
671182F31C80AC4200CB8177 /* WorldCoasts_obsolete.mwm in Resources */,
|
||||
678338AF1C6DF51D00FD6263 /* resources-ldpi_legacy in Resources */,
|
||||
678338B21C6E016F00FD6263 /* WorldCoasts.mwm in Resources */,
|
||||
678338B31C6E017200FD6263 /* World.mwm in Resources */,
|
||||
|
|
|
@ -19,6 +19,9 @@
|
|||
670EE5731B664796001E8064 /* pedestrian_directions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670EE56F1B664796001E8064 /* pedestrian_directions.cpp */; };
|
||||
670EE5741B664796001E8064 /* pedestrian_directions.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 670EE5701B664796001E8064 /* pedestrian_directions.hpp */; };
|
||||
670EE5751B664796001E8064 /* router.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 670EE5711B664796001E8064 /* router.cpp */; };
|
||||
671182EA1C7F0E2100CB8177 /* WorldCoasts_obsolete.mwm in Resources */ = {isa = PBXBuildFile; fileRef = 671182E91C7F0E1F00CB8177 /* WorldCoasts_obsolete.mwm */; };
|
||||
671182EC1C7F0E3200CB8177 /* packed_polygons_obsolete.bin in Resources */ = {isa = PBXBuildFile; fileRef = 671182E81C7F0E1F00CB8177 /* packed_polygons_obsolete.bin */; };
|
||||
671182ED1C7F0E3500CB8177 /* countries_obsolete.txt in Resources */ = {isa = PBXBuildFile; fileRef = 671182E71C7F0E1F00CB8177 /* countries_obsolete.txt */; };
|
||||
671F58BD1B874EC80032311E /* followed_polyline.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 671F58BB1B874EC80032311E /* followed_polyline.cpp */; };
|
||||
671F58BE1B874EC80032311E /* followed_polyline.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 671F58BC1B874EC80032311E /* followed_polyline.hpp */; };
|
||||
6741AA9C1BF35331002C974C /* turns_notification_manager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6741AA9A1BF35331002C974C /* turns_notification_manager.cpp */; };
|
||||
|
@ -144,12 +147,9 @@
|
|||
67BD35F51C69F447003AA26F /* types.txt in Resources */ = {isa = PBXBuildFile; fileRef = 6742AD551C68C7C1009CB89E /* types.txt */; };
|
||||
67BD35F61C69F447003AA26F /* classificator.txt in Resources */ = {isa = PBXBuildFile; fileRef = 6742AD531C68BB14009CB89E /* classificator.txt */; };
|
||||
67BD35F71C69F447003AA26F /* sound-strings in Resources */ = {isa = PBXBuildFile; fileRef = 6742AD611C68F747009CB89E /* sound-strings */; };
|
||||
67BD35FA1C69F49A003AA26F /* packed_polygons_migrate.bin in Resources */ = {isa = PBXBuildFile; fileRef = 67BD35F81C69F474003AA26F /* packed_polygons_migrate.bin */; };
|
||||
67BD35FB1C69F49A003AA26F /* packed_polygons.bin in Resources */ = {isa = PBXBuildFile; fileRef = 67BD35F91C69F474003AA26F /* packed_polygons.bin */; };
|
||||
67BD35FE1C69F4BC003AA26F /* countries_migrate.txt in Resources */ = {isa = PBXBuildFile; fileRef = 67BD35FC1C69F4AC003AA26F /* countries_migrate.txt */; };
|
||||
67BD35FF1C69F4BC003AA26F /* countries.txt in Resources */ = {isa = PBXBuildFile; fileRef = 67BD35FD1C69F4AC003AA26F /* countries.txt */; };
|
||||
67BD36031C69F51C003AA26F /* World.mwm in Resources */ = {isa = PBXBuildFile; fileRef = 67BD36001C69F513003AA26F /* World.mwm */; };
|
||||
67BD36041C69F51C003AA26F /* WorldCoasts_migrate.mwm in Resources */ = {isa = PBXBuildFile; fileRef = 67BD36011C69F513003AA26F /* WorldCoasts_migrate.mwm */; };
|
||||
67BD36051C69F51C003AA26F /* WorldCoasts.mwm in Resources */ = {isa = PBXBuildFile; fileRef = 67BD36021C69F513003AA26F /* WorldCoasts.mwm */; };
|
||||
67C7D4291B4EB48F00FE41AA /* car_model.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 67C7D4211B4EB48F00FE41AA /* car_model.cpp */; };
|
||||
67C7D42A1B4EB48F00FE41AA /* car_model.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 67C7D4221B4EB48F00FE41AA /* car_model.hpp */; };
|
||||
|
@ -189,6 +189,9 @@
|
|||
670EE56F1B664796001E8064 /* pedestrian_directions.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = pedestrian_directions.cpp; sourceTree = "<group>"; };
|
||||
670EE5701B664796001E8064 /* pedestrian_directions.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = pedestrian_directions.hpp; sourceTree = "<group>"; };
|
||||
670EE5711B664796001E8064 /* router.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = router.cpp; sourceTree = "<group>"; };
|
||||
671182E71C7F0E1F00CB8177 /* countries_obsolete.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = countries_obsolete.txt; sourceTree = "<group>"; };
|
||||
671182E81C7F0E1F00CB8177 /* packed_polygons_obsolete.bin */ = {isa = PBXFileReference; lastKnownFileType = archive.macbinary; path = packed_polygons_obsolete.bin; sourceTree = "<group>"; };
|
||||
671182E91C7F0E1F00CB8177 /* WorldCoasts_obsolete.mwm */ = {isa = PBXFileReference; lastKnownFileType = file; path = WorldCoasts_obsolete.mwm; sourceTree = "<group>"; };
|
||||
671F58BB1B874EC80032311E /* followed_polyline.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = followed_polyline.cpp; sourceTree = "<group>"; };
|
||||
671F58BC1B874EC80032311E /* followed_polyline.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = followed_polyline.hpp; sourceTree = "<group>"; };
|
||||
6741AA9A1BF35331002C974C /* turns_notification_manager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = turns_notification_manager.cpp; sourceTree = "<group>"; };
|
||||
|
@ -292,12 +295,9 @@
|
|||
67BD35E01C69F198003AA26F /* libopening_hours.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libopening_hours.a; path = "../../../omim-xcode-build/Debug/libopening_hours.a"; sourceTree = "<group>"; };
|
||||
67BD35E11C69F198003AA26F /* libsdf_image.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libsdf_image.a; path = "../../../omim-xcode-build/Debug/libsdf_image.a"; sourceTree = "<group>"; };
|
||||
67BD35E21C69F198003AA26F /* libstb_image.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libstb_image.a; path = "../../../omim-xcode-build/Debug/libstb_image.a"; sourceTree = "<group>"; };
|
||||
67BD35F81C69F474003AA26F /* packed_polygons_migrate.bin */ = {isa = PBXFileReference; lastKnownFileType = archive.macbinary; path = packed_polygons_migrate.bin; sourceTree = "<group>"; };
|
||||
67BD35F91C69F474003AA26F /* packed_polygons.bin */ = {isa = PBXFileReference; lastKnownFileType = archive.macbinary; path = packed_polygons.bin; sourceTree = "<group>"; };
|
||||
67BD35FC1C69F4AC003AA26F /* countries_migrate.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = countries_migrate.txt; sourceTree = "<group>"; };
|
||||
67BD35FD1C69F4AC003AA26F /* countries.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = countries.txt; sourceTree = "<group>"; };
|
||||
67BD36001C69F513003AA26F /* World.mwm */ = {isa = PBXFileReference; lastKnownFileType = file; path = World.mwm; sourceTree = "<group>"; };
|
||||
67BD36011C69F513003AA26F /* WorldCoasts_migrate.mwm */ = {isa = PBXFileReference; lastKnownFileType = file; path = WorldCoasts_migrate.mwm; sourceTree = "<group>"; };
|
||||
67BD36021C69F513003AA26F /* WorldCoasts.mwm */ = {isa = PBXFileReference; lastKnownFileType = file; path = WorldCoasts.mwm; sourceTree = "<group>"; };
|
||||
67C7D4211B4EB48F00FE41AA /* car_model.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = car_model.cpp; sourceTree = "<group>"; };
|
||||
67C7D4221B4EB48F00FE41AA /* car_model.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = car_model.hpp; sourceTree = "<group>"; };
|
||||
|
@ -486,12 +486,12 @@
|
|||
6742AD511C68BAEE009CB89E /* Resources */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
671182E71C7F0E1F00CB8177 /* countries_obsolete.txt */,
|
||||
671182E81C7F0E1F00CB8177 /* packed_polygons_obsolete.bin */,
|
||||
671182E91C7F0E1F00CB8177 /* WorldCoasts_obsolete.mwm */,
|
||||
67BD36001C69F513003AA26F /* World.mwm */,
|
||||
67BD36011C69F513003AA26F /* WorldCoasts_migrate.mwm */,
|
||||
67BD36021C69F513003AA26F /* WorldCoasts.mwm */,
|
||||
67BD35FC1C69F4AC003AA26F /* countries_migrate.txt */,
|
||||
67BD35FD1C69F4AC003AA26F /* countries.txt */,
|
||||
67BD35F81C69F474003AA26F /* packed_polygons_migrate.bin */,
|
||||
67BD35F91C69F474003AA26F /* packed_polygons.bin */,
|
||||
6742AD571C68C7F6009CB89E /* drules_proto_clear.bin */,
|
||||
6742AD581C68C7F6009CB89E /* drules_proto_dark.bin */,
|
||||
|
@ -778,18 +778,18 @@
|
|||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
67BD36031C69F51C003AA26F /* World.mwm in Resources */,
|
||||
67BD36041C69F51C003AA26F /* WorldCoasts_migrate.mwm in Resources */,
|
||||
67BD36051C69F51C003AA26F /* WorldCoasts.mwm in Resources */,
|
||||
67BD35FE1C69F4BC003AA26F /* countries_migrate.txt in Resources */,
|
||||
67BD35FF1C69F4BC003AA26F /* countries.txt in Resources */,
|
||||
67BD35FA1C69F49A003AA26F /* packed_polygons_migrate.bin in Resources */,
|
||||
67BD35FB1C69F49A003AA26F /* packed_polygons.bin in Resources */,
|
||||
671182EA1C7F0E2100CB8177 /* WorldCoasts_obsolete.mwm in Resources */,
|
||||
67BD35F01C69F447003AA26F /* drules_proto_clear.bin in Resources */,
|
||||
67BD35F11C69F447003AA26F /* drules_proto_dark.bin in Resources */,
|
||||
67BD35F21C69F447003AA26F /* drules_proto_legacy.bin in Resources */,
|
||||
671182ED1C7F0E3500CB8177 /* countries_obsolete.txt in Resources */,
|
||||
67BD35F31C69F447003AA26F /* drules_proto-bw.bin in Resources */,
|
||||
67BD35F41C69F447003AA26F /* drules_proto.bin in Resources */,
|
||||
67BD35F51C69F447003AA26F /* types.txt in Resources */,
|
||||
671182EC1C7F0E3200CB8177 /* packed_polygons_obsolete.bin in Resources */,
|
||||
67BD35F61C69F447003AA26F /* classificator.txt in Resources */,
|
||||
67BD35F71C69F447003AA26F /* sound-strings in Resources */,
|
||||
);
|
||||
|
|
|
@ -13,6 +13,12 @@
|
|||
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 */; };
|
||||
671182D21C7F0D5D00CB8177 /* WorldCoasts_obsolete.mwm in Resources */ = {isa = PBXBuildFile; fileRef = 671182D11C7F0D5400CB8177 /* WorldCoasts_obsolete.mwm */; };
|
||||
671182D31C7F0D5D00CB8177 /* WorldCoasts_obsolete.mwm in Resources */ = {isa = PBXBuildFile; fileRef = 671182D11C7F0D5400CB8177 /* WorldCoasts_obsolete.mwm */; };
|
||||
671182D41C7F0D6400CB8177 /* packed_polygons_obsolete.bin in Resources */ = {isa = PBXBuildFile; fileRef = 671182D01C7F0D5400CB8177 /* packed_polygons_obsolete.bin */; };
|
||||
671182D51C7F0D6500CB8177 /* packed_polygons_obsolete.bin in Resources */ = {isa = PBXBuildFile; fileRef = 671182D01C7F0D5400CB8177 /* packed_polygons_obsolete.bin */; };
|
||||
671182D61C7F0D6800CB8177 /* countries_obsolete.txt in Resources */ = {isa = PBXBuildFile; fileRef = 671182CF1C7F0D5400CB8177 /* countries_obsolete.txt */; };
|
||||
671182D71C7F0D6900CB8177 /* countries_obsolete.txt in Resources */ = {isa = PBXBuildFile; fileRef = 671182CF1C7F0D5400CB8177 /* countries_obsolete.txt */; };
|
||||
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 */; };
|
||||
|
@ -35,11 +41,9 @@
|
|||
678338D41C723B1A00FD6263 /* country_name_getter_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 678338D11C723B1A00FD6263 /* country_name_getter_test.cpp */; };
|
||||
678338D51C723B1A00FD6263 /* helpers.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 678338D21C723B1A00FD6263 /* helpers.cpp */; };
|
||||
678338D61C723B1A00FD6263 /* helpers.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 678338D31C723B1A00FD6263 /* helpers.hpp */; };
|
||||
678338D71C72460300FD6263 /* packed_polygons_migrate.bin in Resources */ = {isa = PBXBuildFile; fileRef = 676C84171C6388A100DC9603 /* packed_polygons_migrate.bin */; };
|
||||
678338D81C72460700FD6263 /* packed_polygons.bin in Resources */ = {isa = PBXBuildFile; fileRef = 676C84151C63888200DC9603 /* packed_polygons.bin */; };
|
||||
678338D91C72460700FD6263 /* categories.txt in Resources */ = {isa = PBXBuildFile; fileRef = 676C83F91C63884300DC9603 /* categories.txt */; };
|
||||
678338DA1C72460700FD6263 /* classificator.txt in Resources */ = {isa = PBXBuildFile; fileRef = 676C83FA1C63884300DC9603 /* classificator.txt */; };
|
||||
678338DB1C72460700FD6263 /* countries_migrate.txt in Resources */ = {isa = PBXBuildFile; fileRef = 676C83FB1C63884300DC9603 /* countries_migrate.txt */; };
|
||||
678338DC1C72460700FD6263 /* countries.txt in Resources */ = {isa = PBXBuildFile; fileRef = 676C83FC1C63884300DC9603 /* countries.txt */; };
|
||||
678338DD1C72460700FD6263 /* drules_proto_clear.bin in Resources */ = {isa = PBXBuildFile; fileRef = 676C83FD1C63884300DC9603 /* drules_proto_clear.bin */; };
|
||||
678338DE1C72460700FD6263 /* drules_proto_dark.bin in Resources */ = {isa = PBXBuildFile; fileRef = 676C83FE1C63884300DC9603 /* drules_proto_dark.bin */; };
|
||||
|
@ -49,7 +53,6 @@
|
|||
678338E21C72460700FD6263 /* patterns.txt in Resources */ = {isa = PBXBuildFile; fileRef = 676C84021C63884300DC9603 /* patterns.txt */; };
|
||||
678338E31C72460700FD6263 /* types.txt in Resources */ = {isa = PBXBuildFile; fileRef = 676C84031C63884300DC9603 /* types.txt */; };
|
||||
678338E41C72460700FD6263 /* World.mwm in Resources */ = {isa = PBXBuildFile; fileRef = 676C84041C63884300DC9603 /* World.mwm */; };
|
||||
678338E51C72460700FD6263 /* WorldCoasts_migrate.mwm in Resources */ = {isa = PBXBuildFile; fileRef = 676C84051C63884300DC9603 /* WorldCoasts_migrate.mwm */; };
|
||||
678338E61C72460700FD6263 /* WorldCoasts.mwm in Resources */ = {isa = PBXBuildFile; fileRef = 676C84061C63884300DC9603 /* WorldCoasts.mwm */; };
|
||||
67AF4A001BC579DD0048B1ED /* country_info_getter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 67AF49FE1BC579DD0048B1ED /* country_info_getter.cpp */; };
|
||||
67AF4A011BC579DD0048B1ED /* country_info_getter.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 67AF49FF1BC579DD0048B1ED /* country_info_getter.hpp */; };
|
||||
|
@ -131,11 +134,9 @@
|
|||
67F90BF01C6A2A3100CD458E /* libplatform.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 67247FE31C60BBCE00EDE56A /* libplatform.a */; };
|
||||
67F90BF11C6A2A3400CD458E /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 67247FFF1C60BD7E00EDE56A /* libz.tbd */; };
|
||||
67F90BF21C6A2AAB00CD458E /* libstorage.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 675342E01A3F59EF00A0A8C3 /* libstorage.a */; };
|
||||
67F90BF31C6A2B3100CD458E /* packed_polygons_migrate.bin in Resources */ = {isa = PBXBuildFile; fileRef = 676C84171C6388A100DC9603 /* packed_polygons_migrate.bin */; };
|
||||
67F90BF41C6A2B3100CD458E /* packed_polygons.bin in Resources */ = {isa = PBXBuildFile; fileRef = 676C84151C63888200DC9603 /* packed_polygons.bin */; };
|
||||
67F90BF51C6A2B3100CD458E /* categories.txt in Resources */ = {isa = PBXBuildFile; fileRef = 676C83F91C63884300DC9603 /* categories.txt */; };
|
||||
67F90BF61C6A2B3100CD458E /* classificator.txt in Resources */ = {isa = PBXBuildFile; fileRef = 676C83FA1C63884300DC9603 /* classificator.txt */; };
|
||||
67F90BF71C6A2B3100CD458E /* countries_migrate.txt in Resources */ = {isa = PBXBuildFile; fileRef = 676C83FB1C63884300DC9603 /* countries_migrate.txt */; };
|
||||
67F90BF81C6A2B3100CD458E /* countries.txt in Resources */ = {isa = PBXBuildFile; fileRef = 676C83FC1C63884300DC9603 /* countries.txt */; };
|
||||
67F90BF91C6A2B3100CD458E /* drules_proto_clear.bin in Resources */ = {isa = PBXBuildFile; fileRef = 676C83FD1C63884300DC9603 /* drules_proto_clear.bin */; };
|
||||
67F90BFA1C6A2B3100CD458E /* drules_proto_dark.bin in Resources */ = {isa = PBXBuildFile; fileRef = 676C83FE1C63884300DC9603 /* drules_proto_dark.bin */; };
|
||||
|
@ -145,7 +146,6 @@
|
|||
67F90BFE1C6A2B3100CD458E /* patterns.txt in Resources */ = {isa = PBXBuildFile; fileRef = 676C84021C63884300DC9603 /* patterns.txt */; };
|
||||
67F90BFF1C6A2B3100CD458E /* types.txt in Resources */ = {isa = PBXBuildFile; fileRef = 676C84031C63884300DC9603 /* types.txt */; };
|
||||
67F90C001C6A2B3100CD458E /* World.mwm in Resources */ = {isa = PBXBuildFile; fileRef = 676C84041C63884300DC9603 /* World.mwm */; };
|
||||
67F90C011C6A2B3100CD458E /* WorldCoasts_migrate.mwm in Resources */ = {isa = PBXBuildFile; fileRef = 676C84051C63884300DC9603 /* WorldCoasts_migrate.mwm */; };
|
||||
67F90C021C6A2B3100CD458E /* WorldCoasts.mwm in Resources */ = {isa = PBXBuildFile; fileRef = 676C84061C63884300DC9603 /* WorldCoasts.mwm */; };
|
||||
/* End PBXBuildFile section */
|
||||
|
||||
|
@ -157,6 +157,9 @@
|
|||
34C9BCFB1C6CCF85000DC38D /* country_name_getter.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = country_name_getter.hpp; sourceTree = "<group>"; };
|
||||
670D05A81B0E04450013A7AC /* defaults.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = defaults.xcconfig; path = ../defaults.xcconfig; sourceTree = "<group>"; };
|
||||
671182CC1C7E069C00CB8177 /* storage_3levels_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = storage_3levels_tests.cpp; sourceTree = "<group>"; };
|
||||
671182CF1C7F0D5400CB8177 /* countries_obsolete.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = countries_obsolete.txt; sourceTree = "<group>"; };
|
||||
671182D01C7F0D5400CB8177 /* packed_polygons_obsolete.bin */ = {isa = PBXFileReference; lastKnownFileType = archive.macbinary; path = packed_polygons_obsolete.bin; sourceTree = "<group>"; };
|
||||
671182D11C7F0D5400CB8177 /* WorldCoasts_obsolete.mwm */ = {isa = PBXFileReference; lastKnownFileType = file; path = WorldCoasts_obsolete.mwm; sourceTree = "<group>"; };
|
||||
67247FC31C60BA8A00EDE56A /* country_info_getter_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = country_info_getter_test.cpp; sourceTree = "<group>"; };
|
||||
67247FC41C60BA8A00EDE56A /* fake_map_files_downloader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = fake_map_files_downloader.cpp; sourceTree = "<group>"; };
|
||||
67247FC51C60BA8A00EDE56A /* fake_map_files_downloader.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = fake_map_files_downloader.hpp; sourceTree = "<group>"; };
|
||||
|
@ -223,7 +226,6 @@
|
|||
676C83C11C637FAE00DC9603 /* storage_update_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = storage_update_tests.cpp; sourceTree = "<group>"; };
|
||||
676C83F91C63884300DC9603 /* categories.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = categories.txt; sourceTree = "<group>"; };
|
||||
676C83FA1C63884300DC9603 /* classificator.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = classificator.txt; sourceTree = "<group>"; };
|
||||
676C83FB1C63884300DC9603 /* countries_migrate.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = countries_migrate.txt; sourceTree = "<group>"; };
|
||||
676C83FC1C63884300DC9603 /* countries.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = countries.txt; sourceTree = "<group>"; };
|
||||
676C83FD1C63884300DC9603 /* drules_proto_clear.bin */ = {isa = PBXFileReference; lastKnownFileType = archive.macbinary; path = drules_proto_clear.bin; sourceTree = "<group>"; };
|
||||
676C83FE1C63884300DC9603 /* drules_proto_dark.bin */ = {isa = PBXFileReference; lastKnownFileType = archive.macbinary; path = drules_proto_dark.bin; sourceTree = "<group>"; };
|
||||
|
@ -233,10 +235,8 @@
|
|||
676C84021C63884300DC9603 /* patterns.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = patterns.txt; sourceTree = "<group>"; };
|
||||
676C84031C63884300DC9603 /* types.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = types.txt; sourceTree = "<group>"; };
|
||||
676C84041C63884300DC9603 /* World.mwm */ = {isa = PBXFileReference; lastKnownFileType = file; path = World.mwm; sourceTree = "<group>"; };
|
||||
676C84051C63884300DC9603 /* WorldCoasts_migrate.mwm */ = {isa = PBXFileReference; lastKnownFileType = file; path = WorldCoasts_migrate.mwm; sourceTree = "<group>"; };
|
||||
676C84061C63884300DC9603 /* WorldCoasts.mwm */ = {isa = PBXFileReference; lastKnownFileType = file; path = WorldCoasts.mwm; sourceTree = "<group>"; };
|
||||
676C84151C63888200DC9603 /* packed_polygons.bin */ = {isa = PBXFileReference; lastKnownFileType = archive.macbinary; path = packed_polygons.bin; sourceTree = "<group>"; };
|
||||
676C84171C6388A100DC9603 /* packed_polygons_migrate.bin */ = {isa = PBXFileReference; lastKnownFileType = archive.macbinary; path = packed_polygons_migrate.bin; sourceTree = "<group>"; };
|
||||
678338D11C723B1A00FD6263 /* country_name_getter_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = country_name_getter_test.cpp; sourceTree = "<group>"; };
|
||||
678338D21C723B1A00FD6263 /* helpers.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = helpers.cpp; sourceTree = "<group>"; };
|
||||
678338D31C723B1A00FD6263 /* helpers.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = helpers.hpp; sourceTree = "<group>"; };
|
||||
|
@ -466,11 +466,12 @@
|
|||
676C83F81C6387D000DC9603 /* Resources */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
676C84171C6388A100DC9603 /* packed_polygons_migrate.bin */,
|
||||
671182CF1C7F0D5400CB8177 /* countries_obsolete.txt */,
|
||||
671182D01C7F0D5400CB8177 /* packed_polygons_obsolete.bin */,
|
||||
671182D11C7F0D5400CB8177 /* WorldCoasts_obsolete.mwm */,
|
||||
676C84151C63888200DC9603 /* packed_polygons.bin */,
|
||||
676C83F91C63884300DC9603 /* categories.txt */,
|
||||
676C83FA1C63884300DC9603 /* classificator.txt */,
|
||||
676C83FB1C63884300DC9603 /* countries_migrate.txt */,
|
||||
676C83FC1C63884300DC9603 /* countries.txt */,
|
||||
676C83FD1C63884300DC9603 /* drules_proto_clear.bin */,
|
||||
676C83FE1C63884300DC9603 /* drules_proto_dark.bin */,
|
||||
|
@ -480,7 +481,6 @@
|
|||
676C84021C63884300DC9603 /* patterns.txt */,
|
||||
676C84031C63884300DC9603 /* types.txt */,
|
||||
676C84041C63884300DC9603 /* World.mwm */,
|
||||
676C84051C63884300DC9603 /* WorldCoasts_migrate.mwm */,
|
||||
676C84061C63884300DC9603 /* WorldCoasts.mwm */,
|
||||
);
|
||||
name = Resources;
|
||||
|
@ -614,18 +614,18 @@
|
|||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
678338D81C72460700FD6263 /* packed_polygons.bin in Resources */,
|
||||
678338D71C72460300FD6263 /* packed_polygons_migrate.bin in Resources */,
|
||||
678338E31C72460700FD6263 /* types.txt in Resources */,
|
||||
678338E61C72460700FD6263 /* WorldCoasts.mwm in Resources */,
|
||||
678338E51C72460700FD6263 /* WorldCoasts_migrate.mwm in Resources */,
|
||||
671182D51C7F0D6500CB8177 /* packed_polygons_obsolete.bin in Resources */,
|
||||
678338DA1C72460700FD6263 /* classificator.txt in Resources */,
|
||||
671182D31C7F0D5D00CB8177 /* WorldCoasts_obsolete.mwm in Resources */,
|
||||
678338DF1C72460700FD6263 /* drules_proto_legacy.bin in Resources */,
|
||||
678338E01C72460700FD6263 /* drules_proto-bw.bin in Resources */,
|
||||
678338DC1C72460700FD6263 /* countries.txt in Resources */,
|
||||
678338D91C72460700FD6263 /* categories.txt in Resources */,
|
||||
678338E21C72460700FD6263 /* patterns.txt in Resources */,
|
||||
678338E11C72460700FD6263 /* drules_proto.bin in Resources */,
|
||||
678338DB1C72460700FD6263 /* countries_migrate.txt in Resources */,
|
||||
671182D71C7F0D6900CB8177 /* countries_obsolete.txt in Resources */,
|
||||
678338DD1C72460700FD6263 /* drules_proto_clear.bin in Resources */,
|
||||
678338E41C72460700FD6263 /* World.mwm in Resources */,
|
||||
678338DE1C72460700FD6263 /* drules_proto_dark.bin in Resources */,
|
||||
|
@ -636,21 +636,21 @@
|
|||
isa = PBXResourcesBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
67F90BF31C6A2B3100CD458E /* packed_polygons_migrate.bin in Resources */,
|
||||
67F90BF41C6A2B3100CD458E /* packed_polygons.bin in Resources */,
|
||||
67F90BF51C6A2B3100CD458E /* categories.txt in Resources */,
|
||||
67F90BF61C6A2B3100CD458E /* classificator.txt in Resources */,
|
||||
67F90BF71C6A2B3100CD458E /* countries_migrate.txt in Resources */,
|
||||
671182D41C7F0D6400CB8177 /* packed_polygons_obsolete.bin in Resources */,
|
||||
67F90BF81C6A2B3100CD458E /* countries.txt in Resources */,
|
||||
671182D21C7F0D5D00CB8177 /* WorldCoasts_obsolete.mwm in Resources */,
|
||||
67F90BF91C6A2B3100CD458E /* drules_proto_clear.bin in Resources */,
|
||||
67F90BFA1C6A2B3100CD458E /* drules_proto_dark.bin in Resources */,
|
||||
67F90BFB1C6A2B3100CD458E /* drules_proto_legacy.bin in Resources */,
|
||||
67F90BFC1C6A2B3100CD458E /* drules_proto-bw.bin in Resources */,
|
||||
67F90BFD1C6A2B3100CD458E /* drules_proto.bin in Resources */,
|
||||
67F90BFE1C6A2B3100CD458E /* patterns.txt in Resources */,
|
||||
671182D61C7F0D6800CB8177 /* countries_obsolete.txt in Resources */,
|
||||
67F90BFF1C6A2B3100CD458E /* types.txt in Resources */,
|
||||
67F90C001C6A2B3100CD458E /* World.mwm in Resources */,
|
||||
67F90C011C6A2B3100CD458E /* WorldCoasts_migrate.mwm in Resources */,
|
||||
67F90C021C6A2B3100CD458E /* WorldCoasts.mwm in Resources */,
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
|
|
Loading…
Add table
Reference in a new issue