Merge remote-tracking branch 'origin/master'

res/res.go

@@ -92,12 +92,13 @@ func AssetNames() []string {
 
 // _bindata is a table, holding each asset generator, mapped to its name.
 var _bindata = map[string]func() ([]byte, error){
-	"res/doc/sample.txt": res_doc_sample_txt,
-	"res/doc/usage.txt": res_doc_usage_txt,
+	"res/doc/sample.txt":   res_doc_sample_txt,
+	"res/doc/usage.txt":    res_doc_usage_txt,
 	"res/messages_en.json": res_messages_en_json,
 	"res/messages_zh.json": res_messages_zh_json,
-	"res/res.go": res_res_go,
+	"res/res.go":           res_res_go,
 }
+
 // AssetDir returns the file names below a certain
 // directory embedded in the file by go-bindata.
 // For example if you run go-bindata on data/... and data contains the
@@ -134,22 +135,14 @@ func AssetDir(name string) ([]string, error) {
 }
 
 type _bintree_t struct {
-	Func func() ([]byte, error)
+	Func     func() ([]byte, error)
 	Children map[string]*_bintree_t
 }
+
 var _bintree = &_bintree_t{nil, map[string]*_bintree_t{
-	"res": &_bintree_t{nil, map[string]*_bintree_t{
-		"doc": &_bintree_t{nil, map[string]*_bintree_t{
-			"sample.txt": &_bintree_t{res_doc_sample_txt, map[string]*_bintree_t{
-			}},
-			"usage.txt": &_bintree_t{res_doc_usage_txt, map[string]*_bintree_t{
-			}},
-		}},
-		"messages_en.json": &_bintree_t{res_messages_en_json, map[string]*_bintree_t{
-		}},
-		"messages_zh.json": &_bintree_t{res_messages_zh_json, map[string]*_bintree_t{
-		}},
-		"res.go": &_bintree_t{res_res_go, map[string]*_bintree_t{
-		}},
-	}},
+	"res/doc/sample.txt":   &_bintree_t{res_doc_sample_txt, map[string]*_bintree_t{}},
+	"res/doc/usage.txt":    &_bintree_t{res_doc_usage_txt, map[string]*_bintree_t{}},
+	"res/messages_en.json": &_bintree_t{res_messages_en_json, map[string]*_bintree_t{}},
+	"res/messages_zh.json": &_bintree_t{res_messages_zh_json, map[string]*_bintree_t{}},
+	"res/res.go":           &_bintree_t{res_res_go, map[string]*_bintree_t{}},
 }}

test/definition/repeat.yaml

+title: test
+desc: This is a test file.
+author: zentao
+version: 1.0
+
+fields:
+  - field: objectype
+    range: [bug,task,story]:2{3},[testcase]{2}
+    postfix: " "
+
+  - field: objectid
+    range: 1.0-9.0:3{2}
+    postfix: " "
+
+  - field: action
+    range: [create,resolve,close]{2},[create,finish,close]{10}
\ No newline at end of file

test/script/_debug.php

 #!/usr/bin/env php
 <?php
 
+include_once __DIR__ . DIRECTORY_SEPARATOR . '_utils.php';
+
+getZDCmd();
+
 if (!function_exists('simplexml_load_file')) {
     print("simplexml_load_file missing, pls use 'sudo apt-get install php7.0-simplexml' to install\n");
 }
\ No newline at end of file

test/script/_utils.php

@@ -11,9 +11,9 @@ function getZDCmd()
         $ret = './zd-mac';
     } else if ($is64bit && $os == 'linux') {
         $ret = './zd-linux';
-    } else if ($is64bit && $os == 'windows') {
+    } else if ($is64bit && strpos($os,"win") > -1) {
         $ret = 'zd-amd64.exe';
-    } else if (!$is64bit && $os == 'windows') {
+    } else if (!$is64bit && strpos($os,"win") > -1) {
         $ret = 'zd-x86.exe';
     }
 

test/script/field_repeat.exp

+>> story 1.0 create
\ No newline at end of file

test/script/field_repeat.php

+#!/usr/bin/env php
+<?php
+/**
+[case]
+title=repeat
+cid=0
+pid=0
+
+[group]
+  1. output >>
+
+[esac]
+*/
+
+include_once __DIR__ . DIRECTORY_SEPARATOR . '_utils.php';
+$cmd = getZDCmd();
+
+$output = [];
+exec("$cmd -y ../test/definition/repeat.yaml -c 7 -o ../test/output/output.txt -f text", $output);
+print(">> $output[3]\n");
\ No newline at end of file

xdoc/build-linux.sh

@@ -14,4 +14,5 @@ cp zd-linux zd
 tar -zcvf zd-linux-1.0.tar.gz zd data demo
 rm zd
 
-cd ..
\ No newline at end of file
+cd ..
+scp build/zd-linux* aaron@172.16.13.1:/Users/aaron/testing/project/zd/build
\ No newline at end of file

xdoc/build-win.bat

+rd /s/q build
+mkdir build
+
+go-bindata -o=res/res.go -pkg=res res/ res/doc
+
+SET CGO_ENABLED=1
+SET GOOS=windows
+
+SET GOARCH=386
+go build -o build\zd-x86.exe src/zd.go
+
+SET GOARCH=amd64
+go build -o build\zd-amd64.exe src/zd.go
+
+scp build\zd-* aaron@172.16.13.1:/Users/aaron/testing/project/zd/build
\ No newline at end of file

xdoc/build.sh

@@ -6,8 +6,8 @@ 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
+CGO_ENABLED=1 GOOS=windows GOARCH=386 go build -o build/zd-x86.exe src/zd.go
+CGO_ENABLED=1 GOOS=windows GOARCH=amd64 go build -o build/zd-amd64.exe src/zd.go
 
 GO_ENABLED=1 GOOS=linux GOARCH=amd64 go build -o build/zd-linux src/zd.go
 CGO_ENABLED=1 GOOS=darwin GOARCH=amd64 go build -o build/zd-mac src/zd.go

xdoc/build-win.sh → xdoc/package.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
@@ -19,4 +8,12 @@ cp zd-amd64.exe zd.exe
 zip -r zd-win-amd64-1.0.zip zd.exe data demo
 rm zd.exe
 
+cp zd-linux zd
+tar -zcvf zd-linux-1.0.tar.gz zd data demo
+rm zd
+
+cp zd-mac zd
+zip -r zd-mac-1.0.zip zd data demo
+rm zd
+
 cd ..
\ No newline at end of file

xdoc/steup.txt

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