Merge remote-tracking branch 'origin/master'

xdoc/build-linux.sh

+rm -rf build
+mkdir build
+mkdir build/log
+cp -r data build/
+cp -r demo build/
+
+go-bindata -o=res/res.go -pkg=res res/ res/doc
+
+GO_ENABLED=1 GOOS=linux GOARCH=amd64 go build -o build/zd-linux src/zd.go
+
+cd build
+
+cp zd-linux zd
+tar -zcvf zd-linux-1.0.tar.gz zd data demo
+rm zd
+
+cd ..
\ No newline at end of file

xdoc/build-mac.sh

+rm -rf build
+mkdir build
+mkdir build/log
+cp -r data build/
+cp -r demo build/
+
+go-bindata -o=res/res.go -pkg=res res/ res/doc
+
+CGO_ENABLED=1 GOOS=darwin GOARCH=amd64 go build -o build/zd-mac src/zd.go
+
+cd build
+
+cp zd-mac zd
+zip -r zd-mac-1.0.zip zd data demo
+rm zd
+
+cd ..
\ No newline at end of file

xdoc/build-win.sh

+rm -rf build
+mkdir build
+mkdir build/log
+cp -r data build/
+cp -r demo build/
+
+go-bindata -o=res/res.go -pkg=res res/ res/doc
+
+CGO_ENABLED=0 GOOS=windows GOARCH=386 go build -o build/zd-x86.exe src/zd.go
+CGO_ENABLED=0 GOOS=windows GOARCH=amd64 go build -o build/zd-amd64.exe src/zd.go
+
+cd build
+
+cp zd-x86.exe zd.exe
+zip -r zd-win-x86-1.0.zip zd.exe data demo
+rm zd.exe
+
+cp zd-amd64.exe zd.exe
+zip -r zd-win-amd64-1.0.zip zd.exe data demo
+rm zd.exe
+
+cd ..
\ No newline at end of file

xdoc/steup.txt

 go get -u github.com/jteeuwen/go-bindata/...
-scp build/zd-linux aaron@172.16.13.132:/home/aaron/dev/project/go/zendata/build
\ No newline at end of file
+scp aaron@172.16.13.132:/home/aaron/dev/project/go/zendata/build build/zd-linux
\ No newline at end of file