From a87d482a3bad04e211103c484b54580e243a9b4c Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Fri, 15 Jan 2016 16:27:43 -0500
Subject: [PATCH] Move all build scripts to script/build

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 appveyor.yml                                         | 2 +-
 project/RELEASE-PROCESS.md                           | 2 +-
 script/{build-image => build/image}                  | 0
 script/{build-linux => build/linux}                  | 2 +-
 script/{build-linux-inner => build/linux-entrypoint} | 0
 script/{build-osx => build/osx}                      | 0
 script/{build-windows.ps1 => build/windows.ps1}      | 2 +-
 script/ci                                            | 2 +-
 script/release/build-binaries                        | 6 +++---
 script/{test => test-default}                        | 0
 script/travis/build-binary                           | 6 +++---
 11 files changed, 11 insertions(+), 11 deletions(-)
 rename script/{build-image => build/image} (100%)
 rename script/{build-linux => build/linux} (76%)
 rename script/{build-linux-inner => build/linux-entrypoint} (100%)
 rename script/{build-osx => build/osx} (100%)
 rename script/{build-windows.ps1 => build/windows.ps1} (97%)
 rename script/{test => test-default} (100%)

diff --git a/appveyor.yml b/appveyor.yml
index 489be0213..e4f39544a 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -11,7 +11,7 @@ build: false
 
 test_script:
   - "tox -e py27,py34 -- tests/unit"
-  - ps: ".\\script\\build-windows.ps1"
+  - ps: ".\\script\\build\\windows.ps1"
 
 artifacts:
   - path: .\dist\docker-compose-Windows-x86_64.exe
diff --git a/project/RELEASE-PROCESS.md b/project/RELEASE-PROCESS.md
index 040a2602b..14d930881 100644
--- a/project/RELEASE-PROCESS.md
+++ b/project/RELEASE-PROCESS.md
@@ -58,7 +58,7 @@ When prompted build the non-linux binaries and test them.
 1.  Build the Mac binary in a Mountain Lion VM:
 
         script/prepare-osx
-        script/build-osx
+        script/build/osx
 
 2.  Download the windows binary from AppVeyor
 
diff --git a/script/build-image b/script/build/image
similarity index 100%
rename from script/build-image
rename to script/build/image
diff --git a/script/build-linux b/script/build/linux
similarity index 76%
rename from script/build-linux
rename to script/build/linux
index 47fb45e17..1a4cd4d9b 100755
--- a/script/build-linux
+++ b/script/build/linux
@@ -7,7 +7,7 @@ set -ex
 TAG="docker-compose"
 docker build -t "$TAG" . | tail -n 200
 docker run \
-    --rm --entrypoint="script/build-linux-inner" \
+    --rm --entrypoint="script/build/linux-entrypoint" \
     -v $(pwd)/dist:/code/dist \
     -v $(pwd)/.git:/code/.git \
     "$TAG"
diff --git a/script/build-linux-inner b/script/build/linux-entrypoint
similarity index 100%
rename from script/build-linux-inner
rename to script/build/linux-entrypoint
diff --git a/script/build-osx b/script/build/osx
similarity index 100%
rename from script/build-osx
rename to script/build/osx
diff --git a/script/build-windows.ps1 b/script/build/windows.ps1
similarity index 97%
rename from script/build-windows.ps1
rename to script/build/windows.ps1
index 4a2bc1f77..db643274c 100644
--- a/script/build-windows.ps1
+++ b/script/build/windows.ps1
@@ -26,7 +26,7 @@
 #
 # 6. Build the binary:
 #
-#        .\script\build-windows.ps1
+#        .\script\build\windows.ps1
 
 $ErrorActionPreference = "Stop"
 
diff --git a/script/ci b/script/ci
index f30265c02..f73be8428 100755
--- a/script/ci
+++ b/script/ci
@@ -18,4 +18,4 @@ GIT_VOLUME="--volumes-from=$(hostname)"
 . script/test-versions
 
 >&2 echo "Building Linux binary"
-. script/build-linux-inner
+. script/build/linux-entrypoint
diff --git a/script/release/build-binaries b/script/release/build-binaries
index 083f8eb58..3a57b89a8 100755
--- a/script/release/build-binaries
+++ b/script/release/build-binaries
@@ -22,15 +22,15 @@ REPO=docker/compose
 
 # Build the binaries
 script/clean
-script/build-linux
+script/build/linux
 # TODO: build osx binary
 # script/prepare-osx
-# script/build-osx
+# script/build/osx
 # TODO: build or fetch the windows binary
 echo "You need to build the osx/windows binaries, that step is not automated yet."
 
 echo "Building the container distribution"
-script/build-image $VERSION
+script/build/image $VERSION
 
 echo "Create a github release"
 # TODO: script more of this https://developer.github.com/v3/repos/releases/
diff --git a/script/test b/script/test-default
similarity index 100%
rename from script/test
rename to script/test-default
diff --git a/script/travis/build-binary b/script/travis/build-binary
index 7cc1092dd..065244bf5 100755
--- a/script/travis/build-binary
+++ b/script/travis/build-binary
@@ -3,11 +3,11 @@
 set -ex
 
 if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
-    script/build-linux
+    script/build/linux
     # TODO: requires auth to push, so disable for now
-    # script/build-image master
+    # script/build/image master
     # docker push docker/compose:master
 else
     script/prepare-osx
-    script/build-osx
+    script/build/osx
 fi