Skip to content

Commit

Permalink
rename thrift-gen release directory and address PR comments.
Browse files Browse the repository at this point in the history
  • Loading branch information
Nils Dijk committed Dec 30, 2015
1 parent e766dac commit ea283fc
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 13 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
.DS_Store
build
Godeps/_workspace
release/
thrift-gen-release/
23 changes: 11 additions & 12 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ EXAMPLES=./examples/bench/server ./examples/bench/client ./examples/ping ./examp
PKGS := . ./json ./hyperbahn ./thrift ./typed ./trace $(EXAMPLES)
TEST_ARG ?= -race
BUILD := ./build
RELEASE := ./release
RELEASE_LINUX := $(RELEASE)/linux-x86_64
RELEASE_DARWIN := $(RELEASE)/darwin-x86_64
THRIFT_GEN_RELEASE := ./thrift-gen-release
THRIFT_GEN_RELEASE_LINUX := $(THRIFT_GEN_RELEASE)/linux-x86_64
THRIFT_GEN_RELEASE_DARWIN := $(THRIFT_GEN_RELEASE)/darwin-x86_64
SRCS := $(foreach pkg,$(PKGS),$(wildcard $(pkg)/*.go))
export GOPATH = $(GODEPS):$(OLDGOPATH)

Expand Down Expand Up @@ -35,8 +35,8 @@ packages_test:
setup:
mkdir -p $(BUILD)
mkdir -p $(BUILD)/examples
mkdir -p $(RELEASE_LINUX)
mkdir -p $(RELEASE_DARWIN)
mkdir -p $(THRIFT_GEN_RELEASE_LINUX)
mkdir -p $(THRIFT_GEN_RELEASE_DARWIN)

get_thrift:
scripts/travis/get-thrift.sh
Expand All @@ -53,8 +53,7 @@ help:
clean:
echo Cleaning build artifacts...
go clean
rm -rf $(BUILD)
rm -rf $(RELEASE)
rm -rf $(BUILD) $(THRIFT_GEN_RELEASE)
echo

fmt format:
Expand Down Expand Up @@ -115,10 +114,10 @@ thrift_gen:
rm -rf trace/thrift/gen-go/tcollector && $(BUILD)/thrift-gen --generateThrift --inputFile trace/tcollector.thrift --outputDir trace/thrift/gen-go/

release_thrift_gen: clean setup
GOOS=linux GOARCH=amd64 godep go build -o $(RELEASE_LINUX)/thrift-gen ./thrift/thrift-gen
GOOS=darwin GOARCH=amd64 godep go build -o $(RELEASE_DARWIN)/thrift-gen ./thrift/thrift-gen
tar -czf thrift-gen.tar.gz $(RELEASE)
mv thrift-gen.tar.gz $(RELEASE)/
GOOS=linux GOARCH=amd64 godep go build -o $(THRIFT_GEN_RELEASE_LINUX)/thrift-gen ./thrift/thrift-gen
GOOS=darwin GOARCH=amd64 godep go build -o $(THRIFT_GEN_RELEASE_DARWIN)/thrift-gen ./thrift/thrift-gen
tar -czf thrift-gen-release.tar.gz $(THRIFT_GEN_RELEASE)
mv thrift-gen-release.tar.gz $(THRIFT_GEN_RELEASE)/

.PHONY: all help clean fmt format get_thrift install install_ci packages_test test test_ci vet
.PHONY: all help clean fmt format get_thrift install install_ci release_thrift_gen packages_test test test_ci vet
.SILENT: all help clean fmt format test vet

0 comments on commit ea283fc

Please sign in to comment.