From f64075678a432639b1b1e8d6334e61ae8570e3c0 Mon Sep 17 00:00:00 2001
From: Danny Hermes <daniel.j.hermes@gmail.com>
Date: Wed, 17 Feb 2016 14:18:59 -0800
Subject: Making GAE_PYTHON optional in tox config.

Also using --gae-lib-root instead of setting the PYTHONPATH.
---
 scripts/build-docs    | 39 ---------------------------------------
 scripts/build_docs.sh | 39 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 39 insertions(+), 39 deletions(-)
 delete mode 100755 scripts/build-docs
 create mode 100755 scripts/build_docs.sh

(limited to 'scripts')

diff --git a/scripts/build-docs b/scripts/build-docs
deleted file mode 100755
index b583416..0000000
--- a/scripts/build-docs
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/bash
-#
-# Copyright 2014 Google Inc. All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# Build the oauth2client docs, installing the GAE SDK as needed.
-
-set -e
-
-if [[ -z "${SKIP_GAE_SDK}" ]]; then
-  scripts/fetch_gae_sdk.py
-  export PYTHONPATH="${PWD}/google_appengine:${PYTHONPATH}"
-fi
-
-rm -rf docs/_build/* docs/source/*
-sphinx-apidoc --separate --force -o docs/source oauth2client
-# We only have one package, so modules.rst is overkill.
-rm -f docs/source/modules.rst
-
-# If anything has changed
-if [[ -n "$(git diff -- docs/)" ]]; then
-    echo "sphinx-apidoc generated changes that are not checked in to version control."
-    exit 1
-fi
-
-cd docs
-make html
-cd ..
diff --git a/scripts/build_docs.sh b/scripts/build_docs.sh
new file mode 100755
index 0000000..b583416
--- /dev/null
+++ b/scripts/build_docs.sh
@@ -0,0 +1,39 @@
+#!/bin/bash
+#
+# Copyright 2014 Google Inc. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# Build the oauth2client docs, installing the GAE SDK as needed.
+
+set -e
+
+if [[ -z "${SKIP_GAE_SDK}" ]]; then
+  scripts/fetch_gae_sdk.py
+  export PYTHONPATH="${PWD}/google_appengine:${PYTHONPATH}"
+fi
+
+rm -rf docs/_build/* docs/source/*
+sphinx-apidoc --separate --force -o docs/source oauth2client
+# We only have one package, so modules.rst is overkill.
+rm -f docs/source/modules.rst
+
+# If anything has changed
+if [[ -n "$(git diff -- docs/)" ]]; then
+    echo "sphinx-apidoc generated changes that are not checked in to version control."
+    exit 1
+fi
+
+cd docs
+make html
+cd ..
-- 
cgit v1.2.3