pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

Merge pull request #6076 from mpimenov/env-macos

Browse source 
[platform] Read resources and writable paths from environment on macOS.
This commit is contained in:
Ilya Zverev 2017-05-18 18:27:04 +03:00 • committed by GitHub
commit 677193eff5
1 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
platform/platform_mac.mm
View file

@ -1,5 +1,7 @@
#include "platform/platform.hpp"
#include "coding/file_name_utils.hpp"
#include "base/logging.hpp"
#include "std/target_os.hpp"
@ -24,7 +26,16 @@ Platform::Platform()
// get resources directory path
string const resourcesPath = [[[NSBundle mainBundle] resourcePath] UTF8String];
string const bundlePath = [[[NSBundle mainBundle] bundlePath] UTF8String];
if (resourcesPath == bundlePath)
char const * envResourcesDir = ::getenv("MWM_RESOURCES_DIR");
char const * envWritableDir = ::getenv("MWM_WRITABLE_DIR");
if (envResourcesDir && envWritableDir)
{
m_resourcesDir = envResourcesDir;
m_writableDir = envWritableDir;
}
else if (resourcesPath == bundlePath)
{
// we're the console app, probably unit test, and path is our directory
m_resourcesDir = bundlePath + "/../../data/";
@ -72,6 +83,9 @@ Platform::Platform()
}
}
m_resourcesDir = my::AddSlashIfNeeded(m_resourcesDir);
m_writableDir = my::AddSlashIfNeeded(m_writableDir);
m_settingsDir = m_writableDir;
NSString * tempDir = NSTemporaryDirectory();