summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorMinh Nguyễn <mxn@1ec5.org>2016-04-19 11:16:01 -0700
committerJohn Firebaugh <john.firebaugh@gmail.com>2016-04-19 16:28:30 -0700
commit606964707658b177099292e1d9f80ba6b4b964a1 (patch)
tree8b21b534b18c6b447845b01af30f83a5654c86b7 /Makefile
parent4bc4d35c602cc8f51db9491f4aae31facd6b7644 (diff)
downloadqtlocation-mapboxgl-606964707658b177099292e1d9f80ba6b4b964a1.tar.gz
[ios, osx] Override user workspace settings
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile8
1 files changed, 7 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index d11944ca44..f1b5fe9bad 100644
--- a/Makefile
+++ b/Makefile
@@ -26,6 +26,7 @@ default:
OSX_OUTPUT_PATH = build/osx
OSX_PROJ_PATH = $(OSX_OUTPUT_PATH)/platform/osx/platform.xcodeproj
OSX_WORK_PATH = platform/osx/osx.xcworkspace
+OSX_USER_DATA_PATH = $(OSX_WORK_PATH)/xcuserdata/$(USER).xcuserdatad
$(OSX_OUTPUT_PATH)/config.gypi: platform/osx/scripts/configure.sh .mason configure
MASON_PLATFORM=osx ./configure $< $@
@@ -42,7 +43,9 @@ osx: $(OSX_PROJ_PATH)
-configuration $(BUILDTYPE) \
-workspace $(OSX_WORK_PATH) -scheme CI build | xcpretty
-xproj: $(OSX_PROJ_PATH)
+xproj: $(OSX_PROJ_PATH) $(OSX_WORK_PATH)
+ mkdir -p "$(OSX_USER_DATA_PATH)"
+ cp platform/osx/WorkspaceSettings.xcsettings "$(OSX_USER_DATA_PATH)/WorkspaceSettings.xcsettings"
open $(OSX_WORK_PATH)
test-osx: osx node_modules/express
@@ -58,6 +61,7 @@ test-osx: osx node_modules/express
IOS_OUTPUT_PATH = build/ios
IOS_PROJ_PATH = $(IOS_OUTPUT_PATH)/platform/ios/platform.xcodeproj
IOS_WORK_PATH = platform/ios/ios.xcworkspace
+IOS_USER_DATA_PATH = $(IOS_WORK_PATH)/xcuserdata/$(USER).xcuserdatad
$(IOS_OUTPUT_PATH)/config.gypi: platform/ios/scripts/configure.sh .mason configure
MASON_PLATFORM=ios ./configure $< $@
@@ -77,6 +81,8 @@ ios: $(IOS_PROJ_PATH)
-workspace $(IOS_WORK_PATH) -scheme CI build | xcpretty
iproj: $(IOS_PROJ_PATH)
+ mkdir -p "$(IOS_USER_DATA_PATH)"
+ cp platform/ios/WorkspaceSettings.xcsettings "$(IOS_USER_DATA_PATH)/WorkspaceSettings.xcsettings"
open $(IOS_WORK_PATH)
test-ios: ios