From b771fc5bf12254d42d163f69fc6113076031b8f9 Mon Sep 17 00:00:00 2001
From: Clint Shryock <clint@ctshryock.com>
Date: Tue, 18 Aug 2015 13:09:15 -0500
Subject: [PATCH 1/2] initial rename and update

---
 RELEASING.md => BUILDING.md | 40 +++++++++++++++++++++++++++++--------
 1 file changed, 32 insertions(+), 8 deletions(-)
 rename RELEASING.md => BUILDING.md (63%)

diff --git a/RELEASING.md b/BUILDING.md
similarity index 63%
rename from RELEASING.md
rename to BUILDING.md
index 41a6b8059..874759983 100644
--- a/RELEASING.md
+++ b/BUILDING.md
@@ -1,11 +1,7 @@
-# Releasing Terraform
+# Building Terraform
 
-This document contains details about the Terraform release process.
-
-## Schedule
-
-Terraform currently has no fixed release schedule, the HashiCorp maintainers
-can usually give a feel for roughly when the next release is planned.
+This document contains details about the process for building binaries for
+Terraform. 
 
 ## Versioning
 
@@ -18,13 +14,31 @@ As a pre-1.0 project, we use the MINOR and PATCH versions as follows:
 
 ## Process
 
-For maintainer documentation purposes, here is the current release process:
+If only need to build binaries for the platform you're running (Windows, Linux,
+Mac OS X etc..), you can follow the instructions in the README for [Developing
+Terraform][1].
+
+The guide below outlines the steps HashiCorp takes to build the official release 
+binaries for Terraform. This process will generate a set of binaries for each supported
+platform, using the [gox](https://github.com/mitchellh/gox) tool.
+
+A Vagrant virtual machine is used to provide a consistent envirornment with
+the pre-requisite tools in place. The specifics of this VM are defined in the 
+[Vagrantfile](Vagrantfile).
+
 
 ```sh
+# clone the repository if needed
+git clone https://github.com/hashicorp/terraform.git
+cd terraform
+
 # Spin up a fresh build VM
 vagrant destroy -f
 vagrant up
 vagrant ssh
+
+# The Vagrantfile installs Go and configures the $GOPATH at /opt/gopath
+# The current "terraform" directory is then sync'd into the gopath
 cd /opt/gopath/src/github.com/hashicorp/terraform/
 
 # Fetch dependencies
@@ -33,6 +47,13 @@ make updatedeps
 # Verify unit tests pass
 make test
 
+# Build the release
+# This generates binaries for each platform and places them in the pkg folder
+make release
+```
+
+After running these commands, you should have 
+
 # Prep release commit
 export VERSION="vX.Y.Z"
 # Edit CHANGELOG.md, adding current date to unreleased version header
@@ -86,3 +107,6 @@ git checkout master
 git add -A
 git commit -m "release: clean up after ${VERSION}"
 ```
+
+
+[1]: https://github.com/hashicorp/terraform#developing-terraform

From 7d2982ce9fd334048ec3e7c8d02e7fbd6fb26b77 Mon Sep 17 00:00:00 2001
From: Clint Shryock <clint@ctshryock.com>
Date: Tue, 18 Aug 2015 13:11:49 -0500
Subject: [PATCH 2/2] trim to just steps for building the binaries

---
 BUILDING.md | 57 ++---------------------------------------------------
 1 file changed, 2 insertions(+), 55 deletions(-)

diff --git a/BUILDING.md b/BUILDING.md
index 874759983..651b85a3b 100644
--- a/BUILDING.md
+++ b/BUILDING.md
@@ -52,61 +52,8 @@ make test
 make release
 ```
 
-After running these commands, you should have 
-
-# Prep release commit
-export VERSION="vX.Y.Z"
-# Edit CHANGELOG.md, adding current date to unreleased version header
-# Edit version.go, setting VersionPrelease to empty string
-
-# Snapshot dependency information
-go get github.com/tools/godep
-godep save ./...
-cp Godeps/Godeps.json deps/$(echo $VERSION | sed 's/\./-/g').json
-
-# Make and tag release commit (skipping Godeps dir)
-git add CHANGELOG.md terraform/version.go deps/
-git commit -a -m "${VERSION}"
-git tag -m "${VERSION}" "${VERSION}"
-
-# Build the release
-make release
-
-# Add Godeps for the archive
-git add Godeps
-
-# Make an archive with vendored dependencies
-stashName=$(git stash create)
-git archive -o terraform-$VERSION-src.tar.gz $stashName
-git reset --hard ${VERSION}
-
-# Zip and push release to bintray
-export BINTRAY_API_KEY="..."
-./scripts/dist "X.Y.Z" # no `v` prefix here
-
-# -- "Point of no return" --
-# -- Process can be aborted safely at any point before this --
-
-# Push the release commit and tag
-git push origin master
-git push origin vX.Y.Z
-
-# Click "publish" on the release from the Bintray Web UI
-# Upload terraform-$VERSION-src.tar.gz as a file to the GitHub release.
-
-# -- Release is complete! --
-
-# Start release branch (to be used for reproducible builds and docs updates)
-git checkout -b release/$VERSION
-git push origin release/$VERSION
-
-# Clean up master
-git checkout master
-# Set VersionPrerelease to "dev"
-# Add new CHANGELOG section for next release
-git add -A
-git commit -m "release: clean up after ${VERSION}"
-```
+After running these commands, you should have binaries for all supported
+platforms in the `pkg` folder.
 
 
 [1]: https://github.com/hashicorp/terraform#developing-terraform