fix windows build, check version

Author: mschenk42

.travis.yml

@@ -13,6 +13,7 @@ before_install:
 
 before_deploy:
   - go build -v --tags static -ldflags "-X main.Version=${TRAVIS_TAG}"
+  - v=$(${PWD}/gtm verify "${TRAVIS_TAG}"); echo "$v"; if [ ! "$v" == "true" ]; then exit 1; fi
   - tar -zcf gtm.${TRAVIS_TAG}.${TRAVIS_OS_NAME}.tar.gz gtm
   - shasum -a 256 gtm.${TRAVIS_TAG}.${TRAVIS_OS_NAME}.tar.gz > gtm.${TRAVIS_TAG}.${TRAVIS_OS_NAME}.checksum.txt
 

Makefile

@@ -1,9 +1,10 @@
 BINARY         = bin/gtm
-VERSION        = gtm-dev-$(shell date +'%Y.%m.%d-%H:%M:%S')
+VERSION        = 0.0.0-dev
 COMMIT         = $(shell git show -s --format='%h' HEAD)
 LDFLAGS        = -ldflags "-X main.Version=$(VERSION)-$(COMMIT)"
 GIT2GO_VERSION = v27
 GIT2GO_PATH    = $(GOPATH)/src/github.com/libgit2/git2go
+LIBGIT2_PATH   = $(GIT2GO_PATH)/vendor/libgit2
 PKGS           = $(shell go list ./... | grep -v vendor)
 BUILD_TAGS     = static
 
@@ -60,7 +61,7 @@ git2go-install:
 	git submodule update --init
 
 git2go: git2go-install
-	cd $(GIT2GO_PATH)/vendor/libgit2 && \
+	cd $(LIBGIT2_PATH) && \
 	mkdir -p install/lib && \
 	mkdir -p build && \
 	cd build && \

appveyor.yml

@@ -7,12 +7,16 @@ clone_folder: c:\gopath\src\github.com\git-time-metric\gtm
 skip_branch_with_pr: true
 
 environment:
+  GOVERSION: 1.9.7
   GOPATH: c:\gopath
   PROJ_DIR: /c/gopath/src/github.com/git-time-metric/gtm
 
 install:
-  - go env
+  - rmdir c:\go /s /q
+  - appveyor DownloadFile https://storage.googleapis.com/golang/go%GOVERSION%.windows-amd64.msi
+  - msiexec /i go%GOVERSION%.windows-amd64.msi /q
   - go version
+  - go env
 
 build_script:
   - c:\msys64\usr\bin\bash -lc "cd ${PROJ_DIR} && make git2go-install"

command/verify.go

@@ -63,6 +63,10 @@ func (c VerifyCmd) Run(args []string) int {
 		return 1
 	}
 
+	// NOTE a newline is not sent when outputting to terminal.
+	// THis makes it easier to assign to a shell variable.
+	// For example, v=$(gtm verify "1.0.0") but because there is
+	// no newline running gtm verify will not display anything
 	c.output(fmt.Sprintf("%t", valid))
 	return 0
 }

script/appveyor-build.sh

@@ -24,19 +24,31 @@ cmake -DTHREADSAFE=ON \
       -DCURL=OFF \
       -G "MSYS Makefiles" \
       .. &&
-
-cmake --build . --target install
-
-cd "${GIT2GO_PATH}" && go install --tags static
+cmake --build .
 
 cd "${GOPATH}/src/github.com/git-time-metric/gtm"
 go get -d ./...
 go test --tags static $(go list ./... | grep -v vendor)
 if [[ "${APPVEYOR_REPO_TAG}" = true ]]; then
-    go build --tags static -v -ldflags "-X main.Version=${APPVEYOR_REPO_TAG_NAME}"
+    version=${APPVEYOR_REPO_TAG_NAME}
+    go build -v --tags static -ldflags "-X main.Version=${version}"
+
+    # make sure version is set correctly
+    v="$(${GOPATH}/src/github.com/git-time-metric/gtm/gtm.exe verify ${version})"
+    if [ ! "$v" == "true" ]; then
+        exit 1
+    fi
+
     tar -zcf "gtm.${APPVEYOR_REPO_TAG_NAME}.windows.tar.gz" gtm.exe
 else
-    timestamp=$(date +%s)
-    go build --tags static -v -ldflags "-X main.Version=developer-build-${timestamp}"
-    tar -zcf "gtm.developer-build-${timestamp}.windows.tar.gz" gtm.exe
+    version='0.0.0-dev'
+    go build -v --tags static -ldflags "-X main.Version=${version}"
+
+    # make sure version is set correctly
+    v="$(${GOPATH}/src/github.com/git-time-metric/gtm/gtm.exe verify ${version})"
+    if [ ! "$v" == "true" ]; then
+        exit 1
+    fi
+
+    tar -zcf "gtm.developer-build-${version}.windows.tar.gz" gtm.exe
 fi