remove normal build

godevsig · Sep 13, 2021 · 1343e80 · 1343e80
1 parent 727ac8d
commit 1343e80
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 20 deletions.
diff --git a/Makefile b/Makefile
@@ -47,25 +47,19 @@ dep:
 build: dep
 	@go build -tags $(BLDTAGS) -ldflags="$(LDFLAGS)" -o bin ./cmd/gshell
 
-debug: BLDTAGS := $(BLDTAGS),debug
-debug: build ## Build debug binary to bin dir
-
-lite: BLDTAGS := $(BLDTAGS)
+lite: BLDTAGS := $(BLDTAGS),stdcommon
 lite: LDFLAGS += -s -w
 lite: build ## Build lite release binary to bin dir
 
-normal: BLDTAGS := $(BLDTAGS),stdcommon
-normal: build ## Build normal release binary to bin dir
-
-FULLTAGS := $(BLDTAGS),stdcommon
+FULLTAGS := $(BLDTAGS),stdcommon,stdext
 FULLTAGS := $(FULLTAGS),stdarchive,stdcompress,stdcontainer,stdcrypto,stddatabase,stdencoding
 FULLTAGS := $(FULLTAGS),stdhash,stdhtml,stdlog,stdmath,stdhttp,stdmail,stdrpc,stdregexp,stdruntime,stdtext,stdunicode
+FULLTAGS := $(FULLTAGS),debug
 full: BLDTAGS := $(FULLTAGS)
 full: build ## Build full release binary to bin dir
 
 clean: ## Remove previous build and test files
-	@rm -rf bin `find -name "\.test"`
-	@rm -rf bin `find -name "test"`
+	@rm -rf bin `find -name "\.test"` `find -name "test"`
 
 help: ## Display this help screen
 	@grep -h -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
diff --git a/go.mod b/go.mod
@@ -9,6 +9,6 @@ require (
 	github.com/traefik/yaegi v0.9.23
 )
 
-replace github.com/traefik/yaegi => github.com/godevsig/yaegi v0.9.24-0.20210912175842-de16837109eb
+replace github.com/traefik/yaegi => github.com/godevsig/yaegi v0.9.24-0.20210913181827-a19e2afe695a
 
-replace github.com/niubaoshu/gotiny => github.com/godevsig/gotiny v0.0.4-0.20210826165942-af63eabe2674
+replace github.com/niubaoshu/gotiny => github.com/godevsig/gotiny v0.0.4-0.20210913173728-083dd4b72177
diff --git a/go.sum b/go.sum
@@ -2,10 +2,10 @@ github.com/barkimedes/go-deepcopy v0.0.0-20200817023428-a044a1957ca4 h1:iBbhlt5Y
 github.com/barkimedes/go-deepcopy v0.0.0-20200817023428-a044a1957ca4/go.mod h1:hiVxq5OP2bUGBRNS3Z/bt/reCLFNbdcST6gISi1fiOM=
 github.com/godevsig/adaptiveservice v0.9.1 h1:FBRQqcgskYb711zhYTejjfJwngpgy5sPvHYePaeuW/4=
 github.com/godevsig/adaptiveservice v0.9.1/go.mod h1:blZoCvk1rWn0dQgYNQhR3pKnCfPAkZl2hdK55If3wcM=
-github.com/godevsig/gotiny v0.0.4-0.20210826165942-af63eabe2674 h1:/YsMYhOqiFhaMA2gRceyxBKH1FgLY4Y2Oj+qbBJExTU=
-github.com/godevsig/gotiny v0.0.4-0.20210826165942-af63eabe2674/go.mod h1:QdEauSzqdF5tbLIVtGYO6sqOhUKVPSZGd5x7xK5oeS4=
-github.com/godevsig/yaegi v0.9.24-0.20210912175842-de16837109eb h1:SuKKJ7zjVrOQiUCHfgUDU7ehd+ZjuP12nIcc6/94WPQ=
-github.com/godevsig/yaegi v0.9.24-0.20210912175842-de16837109eb/go.mod h1:RuCwD8/wsX7b6KoQHOaIFUfuH3gQIK4KWnFFmJMw5VA=
+github.com/godevsig/gotiny v0.0.4-0.20210913173728-083dd4b72177 h1:Ga+4dO0xF4ejuZfKnHfEA/bqlNUc2XKNjpopVDhMjLM=
+github.com/godevsig/gotiny v0.0.4-0.20210913173728-083dd4b72177/go.mod h1:QdEauSzqdF5tbLIVtGYO6sqOhUKVPSZGd5x7xK5oeS4=
+github.com/godevsig/yaegi v0.9.24-0.20210913181827-a19e2afe695a h1:Fmy8tJ/28e9eTb8GfYZ2vTJ7se+HKXdNcqpcxk3cpNw=
+github.com/godevsig/yaegi v0.9.24-0.20210913181827-a19e2afe695a/go.mod h1:RuCwD8/wsX7b6KoQHOaIFUfuH3gQIK4KWnFFmJMw5VA=
 github.com/mattn/go-runewidth v0.0.3/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU=
 github.com/mattn/go-runewidth v0.0.13 h1:lTGmDsbAYt5DmK6OnoV7EuIF1wEIFAcxld6ypU4OSgU=
 github.com/mattn/go-runewidth v0.0.13/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=

diff --git a/gshell_test.go b/gshell_test.go
@@ -373,6 +373,7 @@ func TestMain(m *testing.M) {
 		time.Sleep(1 * time.Second)
 		ret := m.Run()
 		exec.Command("pkill", "-SIGINT", "gshell.tester").Run()
+		time.Sleep(3 * time.Second)
 		os.Exit(ret)
 	} else {
 		os.Exit(m.Run())

diff --git a/stdlib/embed.go b/stdlib/embed.go
diff --git a/stdlib/plugin.go b/stdlib/plugin.go
diff --git a/stdlib/stdlib.go b/stdlib/stdlib.go
@@ -15,14 +15,16 @@ func init() {
 // Provide access to go standard library (http://golang.org/pkg/)
 // go list std | grep -v internal | grep -v '\.' | grep -v unsafe | grep -v syscall
 
-//go:generate ../cmd/extract/extract -name stdlib -tag stdbase bufio bytes context embed errors expvar flag fmt
+//go:generate ../cmd/extract/extract -name stdlib -tag stdbase bufio bytes context errors expvar flag fmt
 //go:generate ../cmd/extract/extract -name stdlib -tag stdbase io io/fs io/ioutil net os os/exec os/signal os/user
-//go:generate ../cmd/extract/extract -name stdlib -tag stdbase path path/filepath plugin reflect
+//go:generate ../cmd/extract/extract -name stdlib -tag stdbase path path/filepath reflect
 //go:generate ../cmd/extract/extract -name stdlib -tag stdbase sort strconv strings sync sync/atomic time
 
 //go:generate ../cmd/extract/extract -name stdlib -tag stdcommon archive/tar compress/gzip crypto/md5 crypto/rand
 //go:generate ../cmd/extract/extract -name stdlib -tag stdcommon encoding/binary encoding/hex encoding/json net/http
 
+//go:generate ../cmd/extract/extract -name stdlib -tag stdext embed plugin
+
 //go:generate ../cmd/extract/extract -name stdlib -tag stdarchive archive/zip
 
 //go:generate ../cmd/extract/extract -name stdlib -tag stdcompress compress/bzip2 compress/flate compress/lzw compress/zlib