From 465b0b3f841b2c742908057a4f9d77c66b4faead Mon Sep 17 00:00:00 2001 From: Zack Scholl Date: Sun, 21 Aug 2016 11:34:26 -0400 Subject: [PATCH] Updated Makefile Former-commit-id: 567e9474a209c2f18c45184a4b3ea27707b1f8da [formerly 2f0d76d8fcb47f48665a6d9e6dd3a7a62bdb8c3b] [formerly bc4797d56c793bb16baf2ab44dcf3f8d46b491e4 [formerly 6ecaef78577b3416c58e26ca4f6fe8d812e9600a [formerly c10c7b16e2c35005f6816cdb0a3b4022abdd5163]]] Former-commit-id: 9beec0c669e6fe5dad80e09d519ab076d3333202 [formerly 9f6e746719f5093312b7c33bae80d5476eabc82b] Former-commit-id: b483ae83fd9623c758135d25f7c90eecdc88a6f4 Former-commit-id: 14b820f0e4e74e39cab38c4a6ff80ef21cae494e --- Makefile | 73 ++++++++++++++++++++++++++------------------------------ main.go | 1 - 2 files changed, 34 insertions(+), 40 deletions(-) diff --git a/Makefile b/Makefile index f4ca73c..df96eee 100644 --- a/Makefile +++ b/Makefile @@ -1,51 +1,46 @@ -ADDRESS = cowyo.com -PORT = 8003 - -CUR_DIR = $(shell bash -c 'pwd') -USERCUR = $(shell bash -c 'whoami') - -make: - go build - -install: - rm -rf jinstall - mkdir jinstall - cp install/cowyo.nginx jinstall/cowyo.nginx - sed -i 's/PORT/$(PORT)/g' jinstall/cowyo.nginx - sed -i 's/ADDRESS/$(ADDRESS)/g' jinstall/cowyo.nginx - sed -i 's^CUR_DIR^$(CUR_DIR)^g' jinstall/cowyo.nginx - cp install/cowyo.init jinstall/cowyo.init - sed -i 's/EXT_ADDRESS/$(ADDRESS)/g' jinstall/cowyo.init - sed -i 's^CUR_DIR^$(CUR_DIR)^g' jinstall/cowyo.init - sed -i 's^USERCUR^$(USERCUR)^g' jinstall/cowyo.init - sed -i 's^PORT^$(PORT)^g' jinstall/cowyo.init - cp jinstall/cowyo.init /etc/init.d/cowyo.init - chmod +x /etc/init.d/cowyo.init - cp jinstall/cowyo.nginx /etc/nginx/sites-available/cowyo.nginx - ln -fs /etc/nginx/sites-available/cowyo.nginx /etc/nginx/sites-enabled/cowyo.nginx - /etc/init.d/nginx reload - /etc/init.d/nginx restart - /etc/init.d/cowyo.init restart - rm -rf jinstall - -binaries: +SOURCEDIR=. +SOURCES := $(shell find $(SOURCEDIR) -name '*.go') + +BINARY=cowyo + +VERSION=1.1 +BUILD_TIME=`date +%FT%T%z` +BUILD=`git rev-parse HEAD` + +LDFLAGS=-ldflags "-X main.VersionNum=${VERSION} -X main.Build=${BUILD} -X main.BuildTime=${BUILD_TIME}" + +.DEFAULT_GOAL: $(BINARY) + +$(BINARY): $(SOURCES) + go get github.com/boltdb/bolt + go get github.com/gin-gonic/contrib/sessions + go get github.com/gin-gonic/gin + go get github.com/gorilla/websocket + go get github.com/microcosm-cc/bluemonday + go get github.com/russross/blackfriday + go get github.com/sergi/go-diff/diffmatchpatch + go build ${LDFLAGS} -o ${BINARY} ${SOURCES} + +.PHONY: clean +clean: + if [ -f ${BINARY} ] ; then rm ${BINARY} ; fi + rm -rf binaries + +.PHONY: binaries +binaries: rm -rf binaries rm -f cowyo mkdir binaries - env GOOS=linux GOARCH=amd64 go build -o cowyo -v *.go + env GOOS=linux GOARCH=amd64 go build ${LDFLAGS} -o ${BINARY} ${SOURCES} zip -9 -r cowyo-linux-64bit.zip cowyo static/* templates/* rm -f cowyo - env GOOS=windows GOARCH=amd64 go build -o cowyo.exe -v *.go + env GOOS=windows GOARCH=amd64 go build ${LDFLAGS} -o ${BINARY} ${SOURCES} zip -9 -r cowyo-windows-64bit.zip cowyo.exe static/* templates/* rm -f cowyo.exe - env GOOS=linux GOARCH=arm go build -o cowyo -v *.go + env GOOS=linux GOARCH=arm go build ${LDFLAGS} -o ${BINARY} ${SOURCES} zip -9 -r cowyo-raspberrypi.zip cowyo static/* templates/* rm -f cowyo - env GOOS=darwin GOARCH=amd64 go build -o cowyo -v *.go + env GOOS=darwin GOARCH=amd64 go build ${LDFLAGS} -o ${BINARY} ${SOURCES} zip -9 -r cowyo-macosx-64bit.zip cowyo static/* templates/* rm -f cowyo mv *.zip binaries/ - - -.PHONY: install -.PHONY: binaries diff --git a/main.go b/main.go index 918eb2a..480816c 100644 --- a/main.go +++ b/main.go @@ -46,7 +46,6 @@ func init() { } func main() { - VersionNum = "1.1" // _, executableFile, _, _ := runtime.Caller(0) // get full path of this file cwd, _ := os.Getwd() databaseFile := path.Join(cwd, "data.db")