Merge branch 'master' into develop
This commit is contained in:
commit
71fb63580a
10
Makefile
10
Makefile
|
@ -40,6 +40,12 @@ build-darwin: deps
|
||||||
fi
|
fi
|
||||||
xgo --targets=darwin/amd64, -dest build/ $(LDFLAGS) -tags='sqlite' -out writefreely ./cmd/writefreely
|
xgo --targets=darwin/amd64, -dest build/ $(LDFLAGS) -tags='sqlite' -out writefreely ./cmd/writefreely
|
||||||
|
|
||||||
|
build-arm7: deps
|
||||||
|
@hash xgo > /dev/null 2>&1; if [ $$? -ne 0 ]; then \
|
||||||
|
$(GOGET) -u github.com/karalabe/xgo; \
|
||||||
|
fi
|
||||||
|
xgo --targets=linux/arm-7, -dest build/ $(LDFLAGS) -tags='sqlite' -out writefreely ./cmd/writefreely
|
||||||
|
|
||||||
build-docker :
|
build-docker :
|
||||||
$(DOCKERCMD) build -t $(IMAGE_NAME):latest -t $(IMAGE_NAME):$(GITREV) .
|
$(DOCKERCMD) build -t $(IMAGE_NAME):latest -t $(IMAGE_NAME):$(GITREV) .
|
||||||
|
|
||||||
|
@ -72,6 +78,10 @@ release : clean ui assets
|
||||||
mv build/$(BINARY_NAME)-linux-amd64 build/$(BINARY_NAME)
|
mv build/$(BINARY_NAME)-linux-amd64 build/$(BINARY_NAME)
|
||||||
cd build; tar -cvzf ../$(BINARY_NAME)_$(GITREV)_linux_amd64.tar.gz *
|
cd build; tar -cvzf ../$(BINARY_NAME)_$(GITREV)_linux_amd64.tar.gz *
|
||||||
rm build/$(BINARY_NAME)
|
rm build/$(BINARY_NAME)
|
||||||
|
$(MAKE) build-arm7
|
||||||
|
mv build/$(BINARY_NAME)-linux-arm-7 build/$(BINARY_NAME)
|
||||||
|
cd build; tar -cvzf ../$(BINARY_NAME)_$(GITREV)_linux_arm7.tar.gz *
|
||||||
|
rm build/$(BINARY_NAME)
|
||||||
$(MAKE) build-darwin
|
$(MAKE) build-darwin
|
||||||
mv build/$(BINARY_NAME)-darwin-10.6-amd64 build/$(BINARY_NAME)
|
mv build/$(BINARY_NAME)-darwin-10.6-amd64 build/$(BINARY_NAME)
|
||||||
cd build; tar -cvzf ../$(BINARY_NAME)_$(GITREV)_macos_amd64.tar.gz *
|
cd build; tar -cvzf ../$(BINARY_NAME)_$(GITREV)_macos_amd64.tar.gz *
|
||||||
|
|
Loading…
Reference in New Issue