-
Notifications
You must be signed in to change notification settings - Fork 122
Restore macOS map SDK; clean up iOS, macOS changelogs #178
Conversation
Restored macOS make targets, including the genstrings target shared between iOS and macOS. Updated macOS build settings to align with current CMake build system.
Fixed make warnings about duplicate commands getting overridden.
iOS and macOS once again share most build settings.
OUTPUT=$(OUTPUT) ./platform/macos/scripts/document.sh | ||
|
||
.PHONY: genstrings | ||
genstrings: |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This make rule got removed along with all the other macOS rules at some point, but it’s actually important for keeping both the iOS and macOS map SDKs in sync with Transifex.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
cc @tmpsantos @mapbox/gl-native @brunoabinader
circle.yml
Outdated
@@ -202,7 +202,7 @@ commands: | |||
steps: | |||
- run: | |||
name: Install macOS dependencies | |||
command: brew install cmake ccache | |||
command: brew install cmake ccache pkg-config |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
// AppKit incorrectly uses calibrated RGB when exporting HTML, so input | ||
// calibrated RGB to ensure round-tripping. | ||
// <rdar://problem/46115233> <http://www.openradar.me/46115233> | ||
NSColor *redColor = [NSColor colorWithCalibratedRed:1 green:0 blue:0 alpha:1]; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is a reprise of mapbox/mapbox-gl-native#13387 that’s now possible because CircleCI is running a newer version of macOS.
But not mbgl.
AppKit incorrectly uses calibrated RGB when exporting HTML, so input calibrated RGB to ensure round-tripping.
Thanks for doing this @1ec5 ! |
This PR restores the macOS map SDK that had previously been maintained in the Mapbox GL Native monorepo.
The macOS build has over a hundred warnings due to a CMake misconfiguration in gl-native, which will be fixed by mapbox/mapbox-gl-native#16228. That PR doesn’t strictly block this one, however.
This PR also cleans up the changelogs for both iOS and macOS. The overgrown “master” section of the macOS changelog has been reorganized and copyedited. The iOS changelog now reflects the iOS map SDK v5.5.1 release and incorporates some of the same copyediting as the macOS changelog.
Fixes mapbox/mapbox-gl-native#13386.
/cc @mapbox/maps-ios