Merge "Docs: Fix micro-httpd.py to serve the right build directory. Add some error checking and messages in case of failure. Test: make online-sac-docs Test: ./docs/source.android.com/scripts/micro-httpd.py"
diff --git a/scripts/micro-httpd.py b/scripts/micro-httpd.py
index 2292abc..f79f71e 100755
--- a/scripts/micro-httpd.py
+++ b/scripts/micro-httpd.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
-
-# Copyright (C) 2010 The Android Open Source Project
+#
+# Copyright (C) 2010,2016 The Android Open Source Project
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -13,17 +13,38 @@
# 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.
+#
+# Usage:
+# Serve the docs build directory on localhost:8080 (default):
+# $ ./docs/source.android.com/scripts/micro-httpd.py
+#
+# Serve using a different port on localhost:
+# $ HTTP_PORT=9090 ./docs/source.android.com/scripts/micro-httpd.py
import SimpleHTTPServer
import SocketServer
import os
+import sys
+import socket
-
-outdir = os.environ.get('OUTDIR', os.path.join(os.path.dirname(__file__), '..', 'out'))
-os.chdir(outdir)
+DOCS_DIR = 'out/target/common/docs/online-sac'
PORT = int(os.environ.get('HTTP_PORT', 8080))
+
+croot_dir = os.path.join(os.path.dirname(__file__), '../../..')
+docs_out = os.path.join(croot_dir, DOCS_DIR)
+
+if not os.path.isdir(docs_out):
+ sys.exit("Error: Docs build directory doesn't exist: %s" % DOCS_DIR)
+
Handler = SimpleHTTPServer.SimpleHTTPRequestHandler
-httpd = SocketServer.TCPServer(('0.0.0.0', PORT), Handler)
-httpd.allow_reuse_address = True
-print 'Serving on port %d' % PORT
+
+try:
+ httpd = SocketServer.TCPServer(('0.0.0.0', PORT), Handler)
+ httpd.allow_reuse_address = True
+except socket.error as sockerr:
+ sys.exit("Error: Address already in use. Kill blocking process (or wait a moment)")
+
+print("Serving docs at: http://{0}:{1}".format(socket.gethostname(), PORT))
+
+os.chdir(docs_out)
httpd.serve_forever()
