diff --git a/Makefile b/Makefile index 0e3a77f1..b44b3d9e 100644 --- a/Makefile +++ b/Makefile @@ -1,20 +1,19 @@ export GOPROXY=https://goproxy.cn,direct export GOPRIVATE=shylinux.com,github.com -# export CGO_ENABLED=0 +export CGO_ENABLED=0 all: @echo && date [ -f src/version.go ] || echo "package main" > src/version.go go build -v -o bin/ice.bin src/main.go src/version.go && chmod u+x bin/ice.bin && ./bin/ice.sh restart +ice: + cat src/binpack.go|sed 's/package main/package ice/g' > usr/release/binpack.go + +app: + CGO_ENABLED=1 go build -o usr/publish/contexts.app/Contents/MacOS/contexts src/app.go src/binpack.go && open usr/publish/contexts.app + %: src/%.go @echo && date go build -v -o usr/publish/$@ src/$@.go && chmod u+x usr/publish/$@ -ice: - cat src/binpack.go|sed 's/package main/package ice/g' > usr/release/binpack.go - -macapp: - mkdir -p usr/publish/contexts.app/Contents/MacOS - go build -o usr/publish/contexts.app/Contents/MacOS/contexts src/app.go src/binpack.go - open usr/publish/contexts.app diff --git a/go.mod b/go.mod index 24420953..d5107f19 100644 --- a/go.mod +++ b/go.mod @@ -5,6 +5,9 @@ go 1.11 require shylinux.com/x/ice v0.4.8 require ( + github.com/kr/pty v1.1.8 // indirect + github.com/webview/webview v0.0.0-20210330151455-f540d88dde4e // indirect + golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3 // indirect shylinux.com/x/golang-story v0.3.0 shylinux.com/x/linux-story v0.3.0 shylinux.com/x/mysql-story v0.3.2 diff --git a/go.sum b/go.sum index a59e0326..00931f47 100644 --- a/go.sum +++ b/go.sum @@ -1,3 +1,20 @@ +github.com/creack/pty v1.1.7 h1:6pwm8kMQKCmgUg0ZHTm5+/YvRK0s3THD/28+T6/kk4A= +github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY= +github.com/kr/pty v1.1.8 h1:AkaSdXYQOWeaO3neb8EM634ahkXXe3jYbVh/F9lq+GI= +github.com/kr/pty v1.1.8/go.mod h1:O1sed60cT9XZ5uDucP5qwvh+TE3NnUj51EiZO/lmSfw= +github.com/webview/webview v0.0.0-20210330151455-f540d88dde4e h1:z780M7mCrdt6KiICeW9SGirvQjxDlrVU+n99FO93nbI= +github.com/webview/webview v0.0.0-20210330151455-f540d88dde4e/go.mod h1:rpXAuuHgyEJb6kXcXldlkOjU6y4x+YcASKKXJNUhh0Y= +golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3 h1:0es+/5331RGQPcXlMfP+WrnIIS6dNnNRe0WB02W0F4M= +golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= +golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1 h1:SrN+KX8Art/Sf4HNj6Zcz06G7VEz+7w9tdXTPOZ7+l4= +golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 h1:v+OssWQX+hTHEmOBgwxdZxK4zHq3yOs8F9J7mk0PY8E= +golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= +golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= shylinux.com/x/go-qrcode v0.0.1 h1:/eOGqMj1qtgs9Ymd12zTUa1gcJZs9S92kj2lb0QzKsE= shylinux.com/x/go-qrcode v0.0.1/go.mod h1:KAbtU+KwiiABMZ/CJ0zh9PI2AX82Uf9rRYcQ4ODm4po= shylinux.com/x/go-sql-mysql v0.0.1 h1:VX5SrwLBKzfkRouj39LgJ9reIXOWmMsScRpr+e0qdp0= diff --git a/src/app.go b/src/app.go index 869a1d20..b48d96ce 100644 --- a/src/app.go +++ b/src/app.go @@ -5,21 +5,13 @@ import ( "path" "time" - "github.com/webview/webview" "shylinux.com/x/ice" - _ "shylinux.com/x/icebergs/misc/app" + "shylinux.com/x/icebergs/misc/app" ) func main() { os.Chdir(path.Join("/Users", os.Getenv("USER"), "contexts")) go ice.Run("serve", "start", "dev", "shy") time.Sleep(time.Second) - - w := webview.New(true) - defer w.Destroy() - - w.SetTitle("contexts") - w.SetSize(800, 600, webview.HintNone) - w.Navigate("http://localhost:9020") - w.Run() + app.Run() }