Update docs generation to work with latest tools.mk

* The hand-written documentation has been moved from doc/ to docs/ so
  as not to conflict with generated edocs. .gitignore and rebar.config
  were updated to reflect this change.
* Added latest tools.mk which includes the upload-docs target for use
  in buildbot.

.gitignore

@@ -4,4 +4,4 @@
 ebin
 .local_dialyzer_plt
 deps/*
-edoc
+doc

rebar.config

@@ -3,8 +3,7 @@
            warn_untyped_record,
            {parse_transform, lager_transform}]}.
 {eunit_opts, [verbose]}.
-{edoc_opts, [preprocess,
-             {dir, "edoc"}]}.
+{edoc_opts, [preprocess]}.
 {cover_enabled, true}.
 {xref_checks, [undefined_function_calls]}.
 {deps, [{lager, "2.0.3", {git, "git://github.com/basho/lager.git", {tag, "2.0.3"}}},

tools.mk

@@ -1,11 +1,49 @@
+#  -------------------------------------------------------------------
+#
+#  Copyright (c) 2014 Basho Technologies, Inc.
+#
+#  This file is provided to you 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.
+#
+#  -------------------------------------------------------------------
+
+#  -------------------------------------------------------------------
+#  NOTE: This file is is from https://github.com/basho/tools.mk.
+#  It should not be edited in a project. It should simply be updated
+#  wholesale when a new version of tools.mk is released.
+#  -------------------------------------------------------------------
+
 REBAR ?= ./rebar
+REVISION ?= $(shell git rev-parse --short HEAD)
+PROJECT ?= $(shell basename `find src -name "*.app.src"` .app.src)
+
+.PHONY: compile-no-deps test docs xref dialyzer-run dialyzer-quick dialyzer \
+		cleanplt upload-docs
 
 compile-no-deps:
 	${REBAR} compile skip_deps=true
 
 test: compile
 	${REBAR} eunit skip_deps=true
 
+upload-docs: docs
+	@if [ -z "${BUCKET}" -o -z "${PROJECT}" -o -z "${REVISION}" ]; then \
+		echo "Set BUCKET, PROJECT, and REVISION env vars to upload docs"; \
+	        exit 1; fi
+	@cd doc; s3cmd put -P * "s3://${BUCKET}/${PROJECT}/${REVISION}/" > /dev/null
+	@echo "Docs built at: http://${BUCKET}.s3-website-us-east-1.amazonaws.com/${PROJECT}/${REVISION}"
+
 docs:
 	${REBAR} doc skip_deps=true
 
@@ -109,4 +147,3 @@ cleanplt:
 	sleep 5
 	rm $(PLT)
 	rm $(LOCAL_PLT)
-