Merge release 1.2.0

mandelsoft · Dec 31, 2018 · ffb5379 · ffb5379
2 parents 27aded1 + f61d995
commit ffb5379
Show file tree

Hide file tree

Showing 104 changed files with 18,063 additions and 968 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,6 @@
 tags
+.idea
+/local
 /spiff
 /spiff++
 *.coverprofile

diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,7 @@
 language: go
 
 go:
-  - 1.7
+  - 1.10.4
 
 install:
   - go get -v github.com/kr/godep

diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
diff --git a/Makefile b/Makefile
@@ -8,11 +8,11 @@ grammar:
 release: spiff_linux_amd64.zip spiff_darwin_amd64.zip	
 
 spiff_linux_amd64.zip:
-	GOPATH=$(GOPATH) GOOS=linux GOARCH=amd64 go build -o spiff++ .
-	zip spiff_linux_amd64.zip spiff++
-	rm spiff++
+	GOPATH=$(GOPATH) GOOS=linux GOARCH=amd64 go build -o spiff++/spiff++ .
+	zip spiff++/spiff_linux_amd64.zip spiff++/spiff++
+	rm spiff++/spiff++
 
 spiff_darwin_amd64.zip:
-	GOPATH=$(GOPATH) GOOS=darwin GOARCH=amd64 go build -o spiff++ .
-	zip spiff_darwin_amd64.zip spiff++
-	rm spiff++
+	GOPATH=$(GOPATH) GOOS=darwin GOARCH=amd64 go build -o spiff++/spiff++ .
+	zip spiff++/spiff_darwin_amd64.zip spiff++/spiff++
+	rm spiff++/spiff++