From 3dd76893649f7a44294e3af4ce3949f229f74d2a Mon Sep 17 00:00:00 2001 From: Tomas Kral Date: Tue, 9 Aug 2016 13:35:48 +0200 Subject: [PATCH] Move binary target to binary-cross use binary target only for building for current platform --- Makefile | 6 ++++++ script/binary | 24 +++++------------------- script/binary-cross | 26 ++++++++++++++++++++++++++ 3 files changed, 37 insertions(+), 19 deletions(-) create mode 100644 script/binary-cross diff --git a/Makefile b/Makefile index c78611d1..7db776ab 100644 --- a/Makefile +++ b/Makefile @@ -16,3 +16,9 @@ all: binary: CGO_ENABLED=0 ./script/make.sh binary + +binary-cross: + CGO_ENABLED=0 ./script/make.sh binary-cross + +clean: + ./script/make.sh clean diff --git a/script/binary b/script/binary index 9fabf1af..74f31cef 100755 --- a/script/binary +++ b/script/binary @@ -1,26 +1,12 @@ #!/bin/bash set -e -if [ -z "$1" ]; then - OS_PLATFORM_ARG=(-os="darwin linux windows") -else - OS_PLATFORM_ARG=($1) -fi +# Get rid of existing binary +rm -f kompose -if [ -z "$2" ]; then - OS_ARCH_ARG=(-arch="386 amd64") -else - OS_ARCH_ARG=($2) -fi - -GITCOMMIT=$(git rev-parse --short HEAD) - -# Get rid of existing binaries -rm -f kompose* - -# Build binaries -gox "${OS_PLATFORM_ARG[@]}" "${OS_ARCH_ARG[@]}" \ - -output="bundles/kompose_{{.OS}}-{{.Arch}}/kompose" \ +# Build binary +go build \ -tags experimental \ + -o kompose \ -ldflags="-w -X github.com/skippbox/kompose/version.GITCOMMIT=${GITCOMMIT}" \ ./cli/main diff --git a/script/binary-cross b/script/binary-cross new file mode 100644 index 00000000..9fabf1af --- /dev/null +++ b/script/binary-cross @@ -0,0 +1,26 @@ +#!/bin/bash +set -e + +if [ -z "$1" ]; then + OS_PLATFORM_ARG=(-os="darwin linux windows") +else + OS_PLATFORM_ARG=($1) +fi + +if [ -z "$2" ]; then + OS_ARCH_ARG=(-arch="386 amd64") +else + OS_ARCH_ARG=($2) +fi + +GITCOMMIT=$(git rev-parse --short HEAD) + +# Get rid of existing binaries +rm -f kompose* + +# Build binaries +gox "${OS_PLATFORM_ARG[@]}" "${OS_ARCH_ARG[@]}" \ + -output="bundles/kompose_{{.OS}}-{{.Arch}}/kompose" \ + -tags experimental \ + -ldflags="-w -X github.com/skippbox/kompose/version.GITCOMMIT=${GITCOMMIT}" \ + ./cli/main