| Index: site/user/quick/ios.md
|
| diff --git a/site/user/quick/ios.md b/site/user/quick/ios.md
|
| index a8c7fd8be2f45c6cff9fd76b4902fd347a767d82..5c98b3b17e5863bc14b83d83690d75631944af3a 100644
|
| --- a/site/user/quick/ios.md
|
| +++ b/site/user/quick/ios.md
|
| @@ -6,33 +6,22 @@ The following has been tested on MacOS Yosemite with Xcode version 6.3.
|
| 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.
|
| -
|
| - <!--?prettify lang=sh?-->
|
| -
|
| - git clone 'https://skia.googlesource.com/skia'
|
| - cd skia
|
| -
|
| -4. Create the project files.
|
| -
|
| - <!--?prettify lang=sh?-->
|
| -
|
| - GYP_DEFINES="skia_os='ios' skia_arch_type='arm' armv7=1 arm_neon=0" ./gyp_skia
|
| -
|
| -5. Build and run SampleApp.
|
| -
|
| - <!--?prettify lang=sh?-->
|
| -
|
| - xed out/gyp/SampleApp.xcodeproj # opens the SampleApp project in Xcode
|
| + # Create the project files.
|
| + GYP_DEFINES="skia_os='ios' skia_arch_type='arm' armv7=1 arm_neon=0" python bin/sync-and-gyp
|
| + # Build and run SampleApp.
|
| + xed out/gyp/SampleApp.xcodeproj # opens the SampleApp project in Xcode
|
|
|
| Prerequisites
|
| -------------
|
| @@ -68,12 +57,12 @@ Or you can set it to `xcode` alone, if you like.
|
|
|
| You can then generate the Xcode projects by running:
|
|
|
| - GYP_DEFINES="skia_os='ios' skia_arch_type='arm' armv7=1 arm_neon=0" ./gyp_skia
|
| + GYP_DEFINES="skia_os='ios' skia_arch_type='arm' armv7=1 arm_neon=0" python bin/sync-and-gyp
|
|
|
| Alternatively, you can do:
|
|
|
| export GYP_DEFINES="skia_os='ios' skia_arch_type='arm' armv7=1 arm_neon=0"
|
| - ./gyp_skia
|
| + python bin/sync-and-gyp
|
|
|
| Build and run tests
|
| -------------------
|
| @@ -107,7 +96,7 @@ Here's an example of running nanobench from the command line. We will build with
|
| Build and run SampleApp in the XCode IDE
|
| ----------------------------------------
|
|
|
| - * Run gyp_skia as described above.
|
| + * 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
|
| * Make sure the SampleApp target is selected, and choose an iOS device to run on
|
| @@ -133,4 +122,4 @@ You can use the same tool to download log files and golden master (GM) images:
|
|
|
| ios-deploy --bundle_id 'com.google.iOSShell' --download=/Documents --to ./my_download_location
|
|
|
| -Alternatively, you can put resources and other files in the bundle of the application. In this case, you'll need to run the app with the option '--resourcePath .'
|
| +Alternatively, you can put resources and other files in the bundle of the application. In this case, you'll need to run the app with the option '--resourcePath .'
|
|
|