Quellcode durchsuchen

Move all build scripts to script/build

Signed-off-by: Daniel Nephin <[email protected]>
Daniel Nephin vor 10 Jahren
Ursprung
Commit
a87d482a3b

+ 1 - 1
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

+ 1 - 1
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
 

+ 0 - 0
script/build-image → script/build/image


+ 1 - 1
script/build-linux → 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"

+ 0 - 0
script/build-linux-inner → script/build/linux-entrypoint


+ 0 - 0
script/build-osx → script/build/osx


+ 1 - 1
script/build-windows.ps1 → script/build/windows.ps1

@@ -26,7 +26,7 @@
 #
 # 6. Build the binary:
 #
-#        .\script\build-windows.ps1
+#        .\script\build\windows.ps1
 
 $ErrorActionPreference = "Stop"
 

+ 1 - 1
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

+ 3 - 3
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/

+ 0 - 0
script/test → script/test-default


+ 3 - 3
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