bin/sysopen: script moved to bin
No-Try: true
Change-Id: I1b9b1be36c9ed2d574de681b90b98e56f45e70fa
Reviewed-on: https://skia-review.googlesource.com/c/174588
Auto-Submit: Hal Canary <halcanary@google.com>
Reviewed-by: Hal Canary <halcanary@google.com>
Commit-Queue: Hal Canary <halcanary@google.com>
diff --git a/tools/skqp/sysopen.py b/bin/sysopen
similarity index 100%
rename from tools/skqp/sysopen.py
rename to bin/sysopen
diff --git a/experimental/c-api-example/c.md b/experimental/c-api-example/c.md
index 19ae515..d173236 100644
--- a/experimental/c-api-example/c.md
+++ b/experimental/c-api-example/c.md
@@ -127,5 +127,4 @@
experimental/c-api-example/skia-c-example.c \
"$SKIA_LIB_DIR"/libskia.* -Wl,-rpath -Wl,"$SKIA_LIB_DIR"
./skia-c-example
- [ $(uname) = Darwin ] && open skia-c-example.png
- [ $(uname) = Linux ] && xdg-open skia-c-example.png
+ bin/sysopen skia-c-example.png
diff --git a/experimental/documentation/gerrit.md b/experimental/documentation/gerrit.md
index 45894fb..10b79eb 100644
--- a/experimental/documentation/gerrit.md
+++ b/experimental/documentation/gerrit.md
@@ -69,7 +69,7 @@
5. Open in web browser:
- echo https://skia-review.googlesource.com/c/skia/+/$(bin/gerrit-number @)
+ bin/sysopen https://skia-review.googlesource.com/c/skia/+/$(bin/gerrit-number @)
Updating a Change
-----------------
diff --git a/tools/skqp/README.md b/tools/skqp/README.md
index 232920a..6228218 100644
--- a/tools/skqp/README.md
+++ b/tools/skqp/README.md
@@ -65,7 +65,7 @@
OUTPUT_LOCATION="/storage/emulated/0/Android/data/org.skia.skqp/files/output"
adb pull $OUTPUT_LOCATION /tmp/
- tools/skqp/sysopen.py /tmp/output/skqp_report/report.html
+ bin/sysopen /tmp/output/skqp_report/report.html
Running a single test
---------------------
diff --git a/tools/skqp/README_GENERATING_MODELS.md b/tools/skqp/README_GENERATING_MODELS.md
index d7afdd1..a4b5b0b 100644
--- a/tools/skqp/README_GENERATING_MODELS.md
+++ b/tools/skqp/README_GENERATING_MODELS.md
@@ -13,7 +13,7 @@
Open the resulting URL in a browser and download the resulting `meta.json` file.
- tools/skqp/sysopen.py $(tools/skqp/get_gold_export_url.py HEAD~10 HEAD)
+ bin/sysopen $(tools/skqp/get_gold_export_url.py HEAD~10 HEAD)
2. From a checkout of Skia's master branch, execute:
@@ -36,7 +36,7 @@
Review and submit the change:
git push origin HEAD:refs/for/skqp/dev
- tools/skqp/sysopen.py https://review.skia.org/$(bin/gerrit-number HEAD)
+ bin/sysopen https://review.skia.org/$(bin/gerrit-number HEAD)
`tools/skqp/cut_release`
diff --git a/tools/skqp/test_apk.sh b/tools/skqp/test_apk.sh
index 1938f88..4a155d7 100755
--- a/tools/skqp/test_apk.sh
+++ b/tools/skqp/test_apk.sh
@@ -69,17 +69,10 @@
REPORT="${TDIR}/${odir_basename}/report.html"
-open_file() {
- case "$(uname)" in
- Linux) [ "$DISPLAY" ] && xdg-open "$@" > /dev/null 2>&1 & ;;
- Darwin) open "$@" & ;;
- esac
-}
-
if [ -f "$REPORT" ]; then
grep 'f(.*;' "$REPORT"
echo "$REPORT"
- open_file "$REPORT"
+ "$(dirname "$0")"/../../bin/sysopen "$REPORT"
else
echo "$TDIR"
fi