Index: site/user/quick/macos.md |
diff --git a/site/user/quick/macos.md b/site/user/quick/macos.md |
index c9d09a3bf101d34307d5bc80f3fe422cf6ef8e7b..fd7c0944afd010a2b6b27cbaaf950622e2fe4c6b 100644 |
--- a/site/user/quick/macos.md |
+++ b/site/user/quick/macos.md |
@@ -4,34 +4,25 @@ Mac OS X |
Quickstart |
---------- |
-1. Install [XCode](http://developer.apple.com/xcode/). |
+First, install [XCode](https://developer.apple.com/xcode/). |
-2. Install depot tools. |
+<!--?prettify lang=sh?--> |
- <!--?prettify lang=sh?--> |
+ # Install depot tools. |
+ git clone 'https://chromium.googlesource.com/chromium/tools/depot_tools.git' |
+ export PATH="${PWD}/depot_tools:${PATH}" |
- git clone 'https://chromium.googlesource.com/chromium/tools/depot_tools.git' |
- export PATH="${PWD}/depot_tools:${PATH}" |
+ # Get Skia. |
+ git clone 'https://skia.googlesource.com/skia' |
+ cd skia |
-3. Get Skia. |
+ # Build. |
+ bin/sync-and-gyp |
+ ninja -C out/Debug |
- <!--?prettify lang=sh?--> |
- |
- git clone 'https://skia.googlesource.com/skia' |
- cd skia |
- |
-4. Build. |
- |
- <!--?prettify lang=sh?--> |
- |
- bin/sync-and-gyp && ninja -C out/Debug |
- |
-5. Run DM (the Skia test app) and SampleApp. |
- |
- <!--?prettify lang=sh?--> |
- |
- out/Debug/dm |
- open out/Debug/SampleApp.app |
+ # Run DM (the Skia test app) and SampleApp. |
+ out/Debug/dm |
+ out/Debug/SampleApp |
Prerequisites |
------------- |
@@ -47,7 +38,7 @@ Make sure the following have been installed: |
Check out the source code |
------------------------- |
-See the instructions [here](../download). |
+Follow the instructions [here](../download) for downloading the Skia source. |
Generate XCode projects |
----------------------- |
@@ -55,6 +46,19 @@ Generate XCode projects |
We use the open-source gyp tool to generate XCode projects (and analogous |
build scripts on other platforms) from our multiplatform "gyp" files. |
+Two Gyp generators are used on Mac OS: |
+ |
+* `ninja` - Run ninja yourself, without XCode project files, |
+ |
+* `xcode` - Generate a XCode project |
+ |
+To choose which ones to use, set the `GYP_GENERATORS` environment |
+variable to a comma-delimited list of generators before running |
+sync-and-gyp. The default value for `GYP_GENERATORS` is |
+`ninja,xcode`. For example to enable |
+ |
+ |
+ |
Before building, make sure that gyp knows to create an XCode project or ninja |
build files. If you leave GYP_GENERATORS undefined it will assume the |
following default: |
@@ -65,7 +69,7 @@ Or you can set it to `ninja` or `xcode` alone, if you like. |
You can then generate the Xcode projects and ninja build files by running: |
- ./gyp_skia |
+ python bin/sync-and-gyp |
Build and run tests from the command line |
----------------------------------------- |
@@ -73,26 +77,12 @@ Build and run tests from the command line |
ninja -C out/Debug dm |
out/Debug/dm |
-The usual mode you want for testing is Debug mode (SK_DEBUG is defined, and |
-debug symbols are included in the binary). If you would like to build the |
-Release version instead: |
- |
- ninja -C out/Release dm |
- out/Release/dm |
- |
-Build and run nanobench (performance tests) |
-------------------------------------------- |
- |
-In this case, we will build with the "Release" configuration, since we are running performance tests. |
- |
- ninja -C out/Release nanobench |
- out/Release/nanobench [ --skps path/to/*.skp ] |
Build and run SampleApp in the XCode IDE |
---------------------------------------- |
- * Run gyp_skia as described above. |
- * In the Finder, navigate to $SKIA_INSTALLDIR/trunk/out/gyp |
+ * Run `sync-and-gyp` as described above. |
+ * In the Finder, navigate to `$SKIA_INSTALLDIR/trunk/out/gyp` |
* Double-click SampleApp.xcodeproj ; this will launch XCode and open the SampleApp project |
* Click the “Build and Run” button in the top toolbar |
* Once the build is complete, you should see a window with lots of shaded text examples. To move through the sample app, use the following keypresses: |