Merge pull request #590 from rgooch/master

Build fixes so that TravisCI will also test build for MacOS.

.travis.yml

@@ -18,4 +18,4 @@ before_install:
 script:
     - go test -covermode=count -coverprofile=coverage.out ./...
     - $HOME/gopath/bin/goveralls -coverprofile=coverage.out -service=travis-ci
-    - make all test
+    - make all build-darwin test

Makefile

@@ -2,6 +2,23 @@ all:
 	@cd $(GOPATH)/src; go install github.com/Symantec/Dominator/cmd/*
 	@cd c; make
 
+build-darwin:
+	@cd $(GOPATH)/src; (GOOS=darwin go build github.com/Symantec/Dominator/cmd/*)
+
+build-linux:
+	@cd $(GOPATH)/src; (GOOS=linux go build github.com/Symantec/Dominator/cmd/*)
+
+build-windows:
+	@cd $(GOPATH)/src; (GOOS=windows go build github.com/Symantec/Dominator/cmd/*)
+
+install-darwin:
+	@cd $(GOPATH)/src; (GOOS=darwin go install github.com/Symantec/Dominator/cmd/*)
+
+install-linux:
+	@cd $(GOPATH)/src; (GOOS=linux go install github.com/Symantec/Dominator/cmd/*)
+
+install-windows:
+	@cd $(GOPATH)/src; (GOOS=windows go install github.com/Symantec/Dominator/cmd/*)
 
 dominator.tarball:
 	@./scripts/make-tarball dominator -C $(ETCDIR) ssl

cmd/image-unpacker/main.go

@@ -1,3 +1,5 @@
+// +build linux
+
 package main
 
 import (

cmd/image-unpacker/stub.go

@@ -0,0 +1,12 @@
+// +build !linux
+
+package main
+
+import (
+	"os"
+)
+
+func main() {
+	os.Stderr.Write([]byte("Not available on this OS\n"))
+	os.Exit(1)
+}

cmd/imaginator/slaveDriver.go

@@ -1,3 +1,5 @@
+// +build linux
+
 package main
 
 import (

cmd/installer/configureLocalNetwork.go

@@ -1,3 +1,5 @@
+// +build linux
+
 package main
 
 import (

cmd/installer/configureNetwork.go

@@ -1,3 +1,5 @@
+// +build linux
+
 package main
 
 import (

cmd/installer/configureStorage.go

@@ -1,3 +1,5 @@
+// +build linux
+
 package main
 
 import (

cmd/installer/lib.go

@@ -1,3 +1,5 @@
+// +build linux
+
 package main
 
 import (

cmd/installer/main.go

@@ -1,3 +1,5 @@
+// +build linux
+
 package main
 
 import (

cmd/installer/objects.go

@@ -1,3 +1,5 @@
+// +build linux
+
 package main
 
 import (

cmd/installer/pty.go

@@ -1,3 +1,5 @@
+// +build linux
+
 package main
 
 import (

cmd/installer/server.go

@@ -1,3 +1,5 @@
+// +build linux
+
 package main
 
 import (

cmd/installer/stub.go

@@ -0,0 +1,12 @@
+// +build !linux
+
+package main
+
+import (
+	"os"
+)
+
+func main() {
+	os.Stderr.Write([]byte("Not available on this OS\n"))
+	os.Exit(1)
+}