aboutsummaryrefslogtreecommitdiffhomepage
path: root/site
diff options
context:
space:
mode:
authorGravatar Hal Canary <halcanary@google.com>2017-03-14 10:03:51 -0400
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2017-03-14 14:21:49 +0000
commit30a6b81f4b8c08aa3f1fec55935fc736f2684823 (patch)
treea60844369885ff310127cad114940b5b37e9fb50 /site
parentd3749485db2de966a80e39669a49192fc7c0bd9d (diff)
Documentation: Consistancy
* Don't rely on '#!', since it doesn't work for Windows cmd shell. * Consistantly use `tools/git-sync-deps` rather than `bin/sync`. * Always call `bin/gn` ranther than `gn` in case depot_tools is missing from the path. NOTRY=true Change-Id: I27909f2610d1bb3241874399d7d2f7286f99f43b Reviewed-on: https://skia-review.googlesource.com/9640 Reviewed-by: Mike Klein <mtklein@chromium.org> Commit-Queue: Mike Klein <mtklein@chromium.org>
Diffstat (limited to 'site')
-rw-r--r--site/dev/chrome/repo.md6
-rw-r--r--site/dev/contrib/submit.md2
-rw-r--r--site/dev/testing/testing.md4
-rw-r--r--site/dev/testing/tests.md6
-rw-r--r--site/dev/testing/xsan.md8
-rw-r--r--site/user/sample/viewer.md2
6 files changed, 13 insertions, 15 deletions
diff --git a/site/dev/chrome/repo.md b/site/dev/chrome/repo.md
index d897e1edaf..545f154a2a 100644
--- a/site/dev/chrome/repo.md
+++ b/site/dev/chrome/repo.md
@@ -3,10 +3,8 @@ Working in a Chromium repo
To work on Skia inside a Chromium checkout, run the following:
-~~~~
-$ cd chromium/src/third_party/skia
-$ tools/git-sync-deps
-~~~~
+ cd chromium/src/third_party/skia
+ python tools/git-sync-deps
This command does a minimal "just sync the DEPS" emulation of gclient sync for
Skia into chromium/src/third_party/skia/third_party. After that, make dm or
diff --git a/site/dev/contrib/submit.md b/site/dev/contrib/submit.md
index a64fe87fa3..d3ffc9d572 100644
--- a/site/dev/contrib/submit.md
+++ b/site/dev/contrib/submit.md
@@ -32,7 +32,7 @@ If your branch gets out of date, you will need to update it:
<!--?prettify lang=sh?-->
git pull
- python bin/sync
+ python tools/git-sync-deps
Adding a unit test
------------------
diff --git a/site/dev/testing/testing.md b/site/dev/testing/testing.md
index 29f7a4dae0..c14ca72f68 100644
--- a/site/dev/testing/testing.md
+++ b/site/dev/testing/testing.md
@@ -6,8 +6,8 @@ This is a quickstart to building and running DM.
<!--?prettify lang=sh?-->
- python bin/sync
- gn gen out/Debug
+ python tools/git-sync-deps
+ bin/gn gen out/Debug
ninja -C out/Debug dm
out/Debug/dm -v -w dm_output
diff --git a/site/dev/testing/tests.md b/site/dev/testing/tests.md
index 701c2c4dfd..c24a1731e0 100644
--- a/site/dev/testing/tests.md
+++ b/site/dev/testing/tests.md
@@ -9,9 +9,9 @@ We assume you have already synced Skia's dependecies and set up Skia's build sys
<!--?prettify lang=sh?-->
- python bin/sync
- gn gen out/Debug
- gn gen out/Release --args='is_debug=false'
+ python tools/git-sync-deps
+ bin/gn gen out/Debug
+ bin/gn gen out/Release --args='is_debug=false'
<span id="test"></span>
diff --git a/site/dev/testing/xsan.md b/site/dev/testing/xsan.md
index aec935ee80..56cc2bec7a 100644
--- a/site/dev/testing/xsan.md
+++ b/site/dev/testing/xsan.md
@@ -8,7 +8,7 @@ Get Clang binaries
CLANGDIR="${HOME}/clang"
- tools/git-sync-deps
+ python tools/git-sync-deps
CC= CXX= infra/bots/assets/clang_linux/create.py -t "$CLANGDIR"
Configure and Compile Skia with MSAN
@@ -23,7 +23,7 @@ Configure and Compile Skia with MSAN
sanitize = "MSAN"
skia_use_fontconfig = false
EOF
- tools/git-sync-deps
+ python tools/git-sync-deps
bin/gn gen out/msan
ninja -C out/msan
@@ -37,7 +37,7 @@ Configure and Compile Skia with ASAN
cxx = "${CLANGDIR}/bin/clang++"
sanitize = "ASAN"
EOF
- tools/git-sync-deps
+ python tools/git-sync-deps
bin/gn gen out/asan
ninja -C out/asan
@@ -52,7 +52,7 @@ Configure and Compile Skia with TSAN
sanitize = "TSAN"
is_debug = false
EOF
- tools/git-sync-deps
+ python tools/git-sync-deps
bin/gn gen out/tsan
ninja -C out/tsan
diff --git a/site/user/sample/viewer.md b/site/user/sample/viewer.md
index d41590ad91..66330ebf34 100644
--- a/site/user/sample/viewer.md
+++ b/site/user/sample/viewer.md
@@ -17,7 +17,7 @@ Linux, Macintosh and Windows
The Viewer can be built using the regular GN build process, e.g.
- gn gen out/Release --args='is_debug=false'
+ bin/gn gen out/Release --args='is_debug=false'
ninja -C out/Release viewer
Android