Skip to content

Commit

Permalink
Switch to 'make bin' instead of 'make binary'
Browse files Browse the repository at this point in the history
I keep mistyping this when creating the binary as per other projects
that use it commonly (it's usually `make bin` instead of `make binary`).
  • Loading branch information
cdrage committed Nov 29, 2016
1 parent 6092df4 commit c87e6cd
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ script:
- make test-unit

# make test-cmd requires kompose binary
- make binary
- make bin

# $GOPATH/bin is in $PATH
- mkdir -p $GOPATH/bin
Expand Down
23 changes: 19 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,3 +1,18 @@

# Copyright 2016 The Kubernetes Authors.
#
# Licensed 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.

.PHONY: all

KOMPOSE_ENVS := \
Expand All @@ -9,15 +24,15 @@ KOMPOSE_ENVS := \

BIND_DIR := bundles

default: binary
default: bin

all:
all: validate
CGO_ENABLED=1 ./script/make.sh

binary:
bin:
CGO_ENABLED=1 ./script/make.sh binary

binary-cross:
cross:
# CGO_ENABLED=1 ./script/make.sh binary-cross
./script/make.sh binary-cross

Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ $ PROG=kompose source script/bash_autocomplete
You can either build via the Makefile:

```console
$ make binary
$ make bin
```

Or `go build`:
Expand All @@ -86,10 +86,10 @@ If you have `go` v1.5, it's still good to build `kompose` with the following set
$ CGO_ENABLED=0 GO15VENDOREXPERIMENT=1 go build -o kompose main.go
```

To create a multi-platform binary, use the `binary-cross` command via `make`:
To create a multi-platform binary, use the `cross` command via `make`:

```console
$ make binary-cross
$ make cross
```

## Contributing and Issues
Expand Down

0 comments on commit c87e6cd

Please sign in to comment.