Skip to content

Commit

Permalink
Update building scripts to not build the admin cli anymore
Browse files Browse the repository at this point in the history
  • Loading branch information
capitancambio committed Nov 13, 2014
1 parent fbed4a6 commit b11d407
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 7 deletions.
1 change: 0 additions & 1 deletion .build/assembly.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
<directory>build/bin/${item}</directory>
<includes>
<include>dp2*</include>
<include>dp2admin*</include>
</includes>
<outputDirectory>/</outputDirectory>
<fileMode>0755</fileMode>
Expand Down
8 changes: 2 additions & 6 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ Available targets:
all build binaries
build build all
build-dp2 build dp2 tool
build-dp2admin build dp2admin tool
dist build x-platform binaries
test run tests with coverage
cover-deploy deploy test coverage results
Expand All @@ -29,7 +28,7 @@ help:
clean:
-rm -rf "${BUILDDIR}"

build: test build-dp2 build-dp2admin
build: test build-dp2

build-setup:
@export GOPATH="${GOPATH}"
Expand All @@ -46,9 +45,6 @@ build-dp2: build-setup
@echo "Building dp2..."
@${GO} install ${GOBUILD_FLAGS} github.com/daisy/pipeline-cli-go/dp2

build-dp2admin: build-setup
@echo "Building dp2admin..."
@${GO} install ${GOBUILD_FLAGS} github.com/daisy/pipeline-cli-go/dp2admin

dist: build-setup test
@echo "Building for x-platform..."
Expand All @@ -57,7 +53,7 @@ dist: build-setup test
-osarch="linux/amd64 linux/386 darwin/386 darwin/amd64 windows/386 windows/amd64"
@${GOX} -output="${GOPATH}/bin/{{.OS}}_{{.Arch}}/{{.Dir}}" \
-osarch="linux/amd64 linux/386 darwin/386 darwin/amd64 windows/386 windows/amd64" \
./dp2/ ./dp2admin
./dp2/

test: build-setup
@echo "Running tests..."
Expand Down

0 comments on commit b11d407

Please sign in to comment.