From b482b2b6a26c37291a15aee0ae6a36f6e7c6a007 Mon Sep 17 00:00:00 2001 From: Jacob Gadikian Date: Sun, 14 Feb 2021 00:45:14 +0700 Subject: [PATCH 01/38] Added a basic Makefile --- Makefile | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/Makefile b/Makefile index ed3a50e43f0..4f9f72d2e16 100644 --- a/Makefile +++ b/Makefile @@ -1 +1,49 @@ +# gnoland is the main executable of gnolang +gnoland: + echo "Building Gnoland for a wide range of systems" + mkdir build || true + GOOS=darwin GOARCH=amd64 go build -o build/gno-darwin-amd64 cmd/main.go + GOOS=darwin GOARCH=arm64 go build -o build/gno-darwin-arm64 cmd/main.go + GOOS=linux GOARCH=amd64 go build -o build/gno-linux-amd64 cmd/main.go + GOOS=linux GOARCH=arm64 go build -o build/gno-linux-arm64 cmd/main.go + GOOS=windows GOARCH=amd64 go build -o build/gno-win-amd64 cmd/main.go + GOOS=windows GOARCH=amd64 go build -o build/gno-win-arm64 cmd/main.go + +# goscan scans go code +goscan: + echo "Building goscan for a wide range of systems" + mkdir build || true + GOOS=darwin GOARCH=amd64 go build -o build/goscan-darwin-amd64 cmd/goscan/goscan.go + GOOS=darwin GOARCH=arm64 go build -o build/goscan-darwin-arm64 cmd/goscan/goscan.go + GOOS=linux GOARCH=amd64 go build -o build/goscan-linux-amd64 cmd/goscan/goscan.go + GOOS=linux GOARCH=arm64 go build -o build/goscan-linux-arm64 cmd/goscan/goscan.go + GOOS=windows GOARCH=amd64 go build -o build/goscan-win-amd64 cmd/goscan/goscan.go + GOOS=windows GOARCH=amd64 go build -o build/goscan-win-arm64 cmd/goscan/goscan.go + + +# Is logos test code or will it be a part of the system? +logos: + echo "Building logos for a wide range of systems" + mkdir build || true + GOOS=darwin GOARCH=amd64 go build -o build/logos-darwin-amd64 logos/cmd/logos.go + GOOS=darwin GOARCH=arm64 go build -o build/logos-darwin-arm64 logos/cmd/logos.go + GOOS=linux GOARCH=amd64 go build -o build/logos-linux-amd64 logos/cmd/logos.go + GOOS=linux GOARCH=arm64 go build -o build/logos-linux-arm64 logos/cmd/logos.go + GOOS=windows GOARCH=amd64 go build -o build/logos-win-amd64 logos/cmd/logos.go + GOOS=windows GOARCH=amd64 go build -o build/logos-win-arm64 logos/cmd/logos.go + + + +all: + gnoland goscan logos + + + + + # TODO stringer -type=Op +# Unsure what the above refers to. Created a basic Makefile. + +# TODO can probobaly make this more specific, but that may not be desirable. Sometimes it's nice to check if it builds +# everywhere. + From c5d351bbc58b7225137e3f0041c944967a716a7e Mon Sep 17 00:00:00 2001 From: Jacob Gadikian Date: Sun, 14 Feb 2021 01:03:46 +0700 Subject: [PATCH 02/38] Finished Makefile, added some comments to goscan.go --- Makefile | 17 ++++++++++------- cmd/goscan/goscan.go | 9 ++++++++- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 4f9f72d2e16..44e56859a51 100644 --- a/Makefile +++ b/Makefile @@ -2,12 +2,12 @@ gnoland: echo "Building Gnoland for a wide range of systems" mkdir build || true - GOOS=darwin GOARCH=amd64 go build -o build/gno-darwin-amd64 cmd/main.go - GOOS=darwin GOARCH=arm64 go build -o build/gno-darwin-arm64 cmd/main.go - GOOS=linux GOARCH=amd64 go build -o build/gno-linux-amd64 cmd/main.go - GOOS=linux GOARCH=arm64 go build -o build/gno-linux-arm64 cmd/main.go - GOOS=windows GOARCH=amd64 go build -o build/gno-win-amd64 cmd/main.go - GOOS=windows GOARCH=amd64 go build -o build/gno-win-arm64 cmd/main.go + GOOS=darwin GOARCH=amd64 go build -o build/gno-darwin-amd64 cmd/gnoland/main.go + GOOS=darwin GOARCH=arm64 go build -o build/gno-darwin-arm64 cmd/gnoland/main.go + GOOS=linux GOARCH=amd64 go build -o build/gno-linux-amd64 cmd/gnoland/main.go + GOOS=linux GOARCH=arm64 go build -o build/gno-linux-arm64 cmd/gnoland/main.go + GOOS=windows GOARCH=amd64 go build -o build/gno-win-amd64 cmd/gnoland/main.go + GOOS=windows GOARCH=amd64 go build -o build/gno-win-arm64 cmd/gnoland/main.go # goscan scans go code goscan: @@ -33,9 +33,12 @@ logos: GOOS=windows GOARCH=amd64 go build -o build/logos-win-arm64 logos/cmd/logos.go +deps: + go mod download + all: - gnoland goscan logos + deps gnoland goscan logos diff --git a/cmd/goscan/goscan.go b/cmd/goscan/goscan.go index 6c2731a578f..fd27df2f8e4 100644 --- a/cmd/goscan/goscan.go +++ b/cmd/goscan/goscan.go @@ -10,10 +10,16 @@ import ( "github.com/davecgh/go-spew/spew" ) +/* +Goscan: + + + */ + func main() { fset := token.NewFileSet() // positions are relative to fset - filename := os.Args[1] + filename := os.Args[1] // Take a filename as an argument. bz, err := ioutil.ReadFile(filename) if err != nil { panic(err) @@ -27,6 +33,7 @@ func main() { } // Print the imports from the file's AST. + // AST: https://en.wikipedia.org/wiki/Abstract_syntax_tree spew.Dump(f) } From 7b27422b28e54ac835d8fec77cee1442ecb325c9 Mon Sep 17 00:00:00 2001 From: Jacob Gadikian Date: Sun, 14 Feb 2021 03:48:36 +0700 Subject: [PATCH 03/38] Create make.yml --- .github/workflows/make.yml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 .github/workflows/make.yml diff --git a/.github/workflows/make.yml b/.github/workflows/make.yml new file mode 100644 index 00000000000..775bf0dd8a5 --- /dev/null +++ b/.github/workflows/make.yml @@ -0,0 +1,19 @@ +# TODO: Add target OS +name: logos +on: [push, pull_request] + +jobs: + logos: + strategy: + fail-fast: false + matrix: + build-os: [ubuntu-latest, macos-latest, windows-latest] + runs-on: ${{ matrix.build-os }} + steps: + - uses: actions/checkout@v2 + - name: Setup go + uses: actions/setup-go@v2 + with: + go-version: '^1.15' + - name: make + run: make From 2907adfb7a26ae5dcaa67034f91bebf8b905a75b Mon Sep 17 00:00:00 2001 From: Jacob Gadikian Date: Sun, 14 Feb 2021 03:51:14 +0700 Subject: [PATCH 04/38] Update make.yml --- .github/workflows/make.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/make.yml b/.github/workflows/make.yml index 775bf0dd8a5..4205da72063 100644 --- a/.github/workflows/make.yml +++ b/.github/workflows/make.yml @@ -3,7 +3,7 @@ name: logos on: [push, pull_request] jobs: - logos: + goscan: strategy: fail-fast: false matrix: @@ -15,5 +15,5 @@ jobs: uses: actions/setup-go@v2 with: go-version: '^1.15' - - name: make - run: make + - name: goscan + run: make goscan From 8d8378498a6d1646611a1a0fd18427ad678194be Mon Sep 17 00:00:00 2001 From: Jacob Gadikian Date: Sun, 14 Feb 2021 03:51:38 +0700 Subject: [PATCH 05/38] Update make.yml --- .github/workflows/make.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/make.yml b/.github/workflows/make.yml index 4205da72063..355d2e09b6c 100644 --- a/.github/workflows/make.yml +++ b/.github/workflows/make.yml @@ -1,4 +1,3 @@ -# TODO: Add target OS name: logos on: [push, pull_request] From 1050ae2c36f25292e4c0603f3ed08210944b2207 Mon Sep 17 00:00:00 2001 From: Jacob Gadikian Date: Sun, 14 Feb 2021 04:01:05 +0700 Subject: [PATCH 06/38] Update Makefile Build only for build platform --- Makefile | 45 +++++++++++++++++++++++---------------------- 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/Makefile b/Makefile index 44e56859a51..b715ab05fdd 100644 --- a/Makefile +++ b/Makefile @@ -1,36 +1,37 @@ # gnoland is the main executable of gnolang -gnoland: - echo "Building Gnoland for a wide range of systems" - mkdir build || true - GOOS=darwin GOARCH=amd64 go build -o build/gno-darwin-amd64 cmd/gnoland/main.go - GOOS=darwin GOARCH=arm64 go build -o build/gno-darwin-arm64 cmd/gnoland/main.go - GOOS=linux GOARCH=amd64 go build -o build/gno-linux-amd64 cmd/gnoland/main.go - GOOS=linux GOARCH=arm64 go build -o build/gno-linux-arm64 cmd/gnoland/main.go - GOOS=windows GOARCH=amd64 go build -o build/gno-win-amd64 cmd/gnoland/main.go - GOOS=windows GOARCH=amd64 go build -o build/gno-win-arm64 cmd/gnoland/main.go +# bring this back when ready +# gnoland: +# echo "Building Gnoland for a wide range of systems" +# mkdir build || true +# go build -o build/gno-darwin-amd64 cmd/gnoland/main.go +# GOOS=darwin GOARCH=arm64 go build -o build/gno-darwin-arm64 cmd/gnoland/main.go +# GOOS=linux GOARCH=amd64 go build -o build/gno-linux-amd64 cmd/gnoland/main.go +# GOOS=linux GOARCH=arm64 go build -o build/gno-linux-arm64 cmd/gnoland/main.go +# GOOS=windows GOARCH=amd64 go build -o build/gno-win-amd64 cmd/gnoland/main.go +# GOOS=windows GOARCH=amd64 go build -o build/gno-win-arm64 cmd/gnoland/main.go # goscan scans go code goscan: echo "Building goscan for a wide range of systems" mkdir build || true - GOOS=darwin GOARCH=amd64 go build -o build/goscan-darwin-amd64 cmd/goscan/goscan.go - GOOS=darwin GOARCH=arm64 go build -o build/goscan-darwin-arm64 cmd/goscan/goscan.go - GOOS=linux GOARCH=amd64 go build -o build/goscan-linux-amd64 cmd/goscan/goscan.go - GOOS=linux GOARCH=arm64 go build -o build/goscan-linux-arm64 cmd/goscan/goscan.go - GOOS=windows GOARCH=amd64 go build -o build/goscan-win-amd64 cmd/goscan/goscan.go - GOOS=windows GOARCH=amd64 go build -o build/goscan-win-arm64 cmd/goscan/goscan.go + go build -o build/goscan cmd/goscan/goscan.go +# GOOS=darwin GOARCH=arm64 go build -o build/goscan-darwin-arm64 cmd/goscan/goscan.go +# GOOS=linux GOARCH=amd64 go build -o build/goscan-linux-amd64 cmd/goscan/goscan.go +# GOOS=linux GOARCH=arm64 go build -o build/goscan-linux-arm64 cmd/goscan/goscan.go +# GOOS=windows GOARCH=amd64 go build -o build/goscan-win-amd64 cmd/goscan/goscan.go +# GOOS=windows GOARCH=amd64 go build -o build/goscan-win-arm64 cmd/goscan/goscan.go # Is logos test code or will it be a part of the system? logos: echo "Building logos for a wide range of systems" mkdir build || true - GOOS=darwin GOARCH=amd64 go build -o build/logos-darwin-amd64 logos/cmd/logos.go - GOOS=darwin GOARCH=arm64 go build -o build/logos-darwin-arm64 logos/cmd/logos.go - GOOS=linux GOARCH=amd64 go build -o build/logos-linux-amd64 logos/cmd/logos.go - GOOS=linux GOARCH=arm64 go build -o build/logos-linux-arm64 logos/cmd/logos.go - GOOS=windows GOARCH=amd64 go build -o build/logos-win-amd64 logos/cmd/logos.go - GOOS=windows GOARCH=amd64 go build -o build/logos-win-arm64 logos/cmd/logos.go + go build -o build/logos logos/cmd/logos.go +# GOOS=darwin GOARCH=arm64 go build -o build/logos-darwin-arm64 logos/cmd/logos.go +# GOOS=linux GOARCH=amd64 go build -o build/logos-linux-amd64 logos/cmd/logos.go +# GOOS=linux GOARCH=arm64 go build -o build/logos-linux-arm64 logos/cmd/logos.go +# GOOS=windows GOARCH=amd64 go build -o build/logos-win-amd64 logos/cmd/logos.go +# GOOS=windows GOARCH=amd64 go build -o build/logos-win-arm64 logos/cmd/logos.go deps: @@ -38,7 +39,7 @@ deps: all: - deps gnoland goscan logos + deps goscan logos From 7039e2e0f319850f6b33428ac779d031ef9ebc86 Mon Sep 17 00:00:00 2001 From: Jacob Gadikian Date: Sun, 14 Feb 2021 04:08:53 +0700 Subject: [PATCH 07/38] Update Makefile Add realm test --- Makefile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index b715ab05fdd..5751d27b7a1 100644 --- a/Makefile +++ b/Makefile @@ -38,8 +38,12 @@ deps: go mod download + +test: + go test tests/*.go -v -run="Test/realm.go" + all: - deps goscan logos + deps test goscan logos From 7e7a53fc048f838f10a312f969dc4b891ec85f20 Mon Sep 17 00:00:00 2001 From: Jacob Gadikian Date: Sun, 14 Feb 2021 13:52:08 +0700 Subject: [PATCH 08/38] enable building gnoland --- Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 5751d27b7a1..d1d67d85a83 100644 --- a/Makefile +++ b/Makefile @@ -1,9 +1,9 @@ # gnoland is the main executable of gnolang # bring this back when ready -# gnoland: -# echo "Building Gnoland for a wide range of systems" -# mkdir build || true -# go build -o build/gno-darwin-amd64 cmd/gnoland/main.go +gnoland: + echo "Building Gnoland for a wide range of systems" + mkdir build || true + go build -o build/gno-darwin-amd64 cmd/gnoland/main.go # GOOS=darwin GOARCH=arm64 go build -o build/gno-darwin-arm64 cmd/gnoland/main.go # GOOS=linux GOARCH=amd64 go build -o build/gno-linux-amd64 cmd/gnoland/main.go # GOOS=linux GOARCH=arm64 go build -o build/gno-linux-arm64 cmd/gnoland/main.go @@ -43,7 +43,7 @@ test: go test tests/*.go -v -run="Test/realm.go" all: - deps test goscan logos + deps test gnoland goscan logos From 9eb7086d4b782ce2d3f2e8611b3614de9a839ee3 Mon Sep 17 00:00:00 2001 From: Jacob Gadikian Date: Sun, 14 Feb 2021 15:02:22 +0700 Subject: [PATCH 09/38] Implemented the techknowlogic version of xgo for multiplatofrm builds --- Makefile | 36 ++++++++++-------------------------- go.mod | 1 + go.sum | 2 ++ 3 files changed, 13 insertions(+), 26 deletions(-) diff --git a/Makefile b/Makefile index d1d67d85a83..b4327e88845 100644 --- a/Makefile +++ b/Makefile @@ -3,47 +3,31 @@ gnoland: echo "Building Gnoland for a wide range of systems" mkdir build || true - go build -o build/gno-darwin-amd64 cmd/gnoland/main.go -# GOOS=darwin GOARCH=arm64 go build -o build/gno-darwin-arm64 cmd/gnoland/main.go -# GOOS=linux GOARCH=amd64 go build -o build/gno-linux-amd64 cmd/gnoland/main.go -# GOOS=linux GOARCH=arm64 go build -o build/gno-linux-arm64 cmd/gnoland/main.go -# GOOS=windows GOARCH=amd64 go build -o build/gno-win-amd64 cmd/gnoland/main.go -# GOOS=windows GOARCH=amd64 go build -o build/gno-win-arm64 cmd/gnoland/main.go - -# goscan scans go code + xgo ./cmd/gnoland + +# goscan scans go code to determine its AST goscan: echo "Building goscan for a wide range of systems" mkdir build || true - go build -o build/goscan cmd/goscan/goscan.go -# GOOS=darwin GOARCH=arm64 go build -o build/goscan-darwin-arm64 cmd/goscan/goscan.go -# GOOS=linux GOARCH=amd64 go build -o build/goscan-linux-amd64 cmd/goscan/goscan.go -# GOOS=linux GOARCH=arm64 go build -o build/goscan-linux-arm64 cmd/goscan/goscan.go -# GOOS=windows GOARCH=amd64 go build -o build/goscan-win-amd64 cmd/goscan/goscan.go -# GOOS=windows GOARCH=amd64 go build -o build/goscan-win-arm64 cmd/goscan/goscan.go + xgo ./cmd/goscan # Is logos test code or will it be a part of the system? logos: echo "Building logos for a wide range of systems" mkdir build || true - go build -o build/logos logos/cmd/logos.go -# GOOS=darwin GOARCH=arm64 go build -o build/logos-darwin-arm64 logos/cmd/logos.go -# GOOS=linux GOARCH=amd64 go build -o build/logos-linux-amd64 logos/cmd/logos.go -# GOOS=linux GOARCH=arm64 go build -o build/logos-linux-arm64 logos/cmd/logos.go -# GOOS=windows GOARCH=amd64 go build -o build/logos-win-amd64 logos/cmd/logos.go -# GOOS=windows GOARCH=amd64 go build -o build/logos-win-arm64 logos/cmd/logos.go - - -deps: - go mod download - + xgo ./logos/cmd test: go test tests/*.go -v -run="Test/realm.go" +xgo: + go get src.techknowlogick.com/xgo + + all: - deps test gnoland goscan logos + xgo test gnoland goscan logos diff --git a/go.mod b/go.mod index 258cc86a88a..de199a308e8 100644 --- a/go.mod +++ b/go.mod @@ -9,6 +9,7 @@ require ( github.com/jaekwon/testify v1.6.1 github.com/mattn/go-runewidth v0.0.10 github.com/stretchr/testify v1.6.1 + src.techknowlogick.com/xgo v1.2.1-0.20210207204503-1ea8454a58df // indirect ) replace github.com/gdamore/tcell => github.com/gnolang/tcell v1.4.0 diff --git a/go.sum b/go.sum index 7221a6ee5ba..54b06da342a 100644 --- a/go.sum +++ b/go.sum @@ -27,3 +27,5 @@ golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +src.techknowlogick.com/xgo v1.2.1-0.20210207204503-1ea8454a58df h1:emObvP33uBegaUw3n4wBs5Jj/pahioIqMZnTdET9lFA= +src.techknowlogick.com/xgo v1.2.1-0.20210207204503-1ea8454a58df/go.mod h1:31CE1YKtDOrKTk9PSnjTpe6YbO6W/0LTYZ1VskL09oU= From e4b2043c33b6fdb048d18f13d3eec98cde86559b Mon Sep 17 00:00:00 2001 From: Jacob Gadikian Date: Sun, 14 Feb 2021 15:05:59 +0700 Subject: [PATCH 10/38] Update make.yml --- .github/workflows/make.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/make.yml b/.github/workflows/make.yml index 355d2e09b6c..322f4d752dd 100644 --- a/.github/workflows/make.yml +++ b/.github/workflows/make.yml @@ -14,5 +14,5 @@ jobs: uses: actions/setup-go@v2 with: go-version: '^1.15' - - name: goscan - run: make goscan + - name: build + run: make From 16c0eaa89ec675a517fa2ef5e0a6fee6e907f1c6 Mon Sep 17 00:00:00 2001 From: Jacob Gadikian Date: Sun, 14 Feb 2021 15:07:23 +0700 Subject: [PATCH 11/38] Update Makefile --- Makefile | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index b4327e88845..3854a083b9f 100644 --- a/Makefile +++ b/Makefile @@ -1,3 +1,6 @@ +all: + xgo test gnoland goscan logos + # gnoland is the main executable of gnolang # bring this back when ready gnoland: @@ -26,10 +29,6 @@ xgo: go get src.techknowlogick.com/xgo -all: - xgo test gnoland goscan logos - - From 50af14f1799d5af775f6f93309a75147cd25a1b1 Mon Sep 17 00:00:00 2001 From: Jacob Gadikian Date: Sun, 14 Feb 2021 15:08:59 +0700 Subject: [PATCH 12/38] Update Makefile --- Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 3854a083b9f..346097a962d 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,4 @@ -all: - xgo test gnoland goscan logos +all: xgo test gnoland goscan logos # gnoland is the main executable of gnolang # bring this back when ready From d5d055bb5ad27985f77ec0cf9c7ef25cdab022ff Mon Sep 17 00:00:00 2001 From: Jacob Gadikian Date: Sun, 14 Feb 2021 15:12:30 +0700 Subject: [PATCH 13/38] Update Makefile --- Makefile | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index 346097a962d..67be3fbeafb 100644 --- a/Makefile +++ b/Makefile @@ -1,39 +1,36 @@ all: xgo test gnoland goscan logos +build-dir: + mkdir build || echo "Build folder is already present." + # gnoland is the main executable of gnolang # bring this back when ready gnoland: - echo "Building Gnoland for a wide range of systems" - mkdir build || true + echo "Building gnoland" xgo ./cmd/gnoland # goscan scans go code to determine its AST goscan: - echo "Building goscan for a wide range of systems" - mkdir build || true + echo "Building goscan" xgo ./cmd/goscan # Is logos test code or will it be a part of the system? logos: - echo "Building logos for a wide range of systems" - mkdir build || true + echo "building logos" xgo ./logos/cmd test: + echo "Running tests" go test tests/*.go -v -run="Test/realm.go" xgo: + echo "installing xgo" go get src.techknowlogick.com/xgo - - # TODO stringer -type=Op # Unsure what the above refers to. Created a basic Makefile. -# TODO can probobaly make this more specific, but that may not be desirable. Sometimes it's nice to check if it builds -# everywhere. - From ee6647451409be2a0f3818591afc7e613b92cc63 Mon Sep 17 00:00:00 2001 From: Jacob Gadikian Date: Sun, 14 Feb 2021 15:14:14 +0700 Subject: [PATCH 14/38] Update make.yml --- .github/workflows/make.yml | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/.github/workflows/make.yml b/.github/workflows/make.yml index 322f4d752dd..fb581c13304 100644 --- a/.github/workflows/make.yml +++ b/.github/workflows/make.yml @@ -3,16 +3,8 @@ on: [push, pull_request] jobs: goscan: - strategy: - fail-fast: false - matrix: - build-os: [ubuntu-latest, macos-latest, windows-latest] - runs-on: ${{ matrix.build-os }} + runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - name: Setup go - uses: actions/setup-go@v2 - with: - go-version: '^1.15' - name: build run: make From a0ad9813177ae3f3a590426406657ff24feaed80 Mon Sep 17 00:00:00 2001 From: Jacob Gadikian Date: Sun, 14 Feb 2021 15:17:38 +0700 Subject: [PATCH 15/38] Update Makefile --- Makefile | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 67be3fbeafb..c5c31170f35 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,4 @@ -all: xgo test gnoland goscan logos - -build-dir: - mkdir build || echo "Build folder is already present." +all: xgo gnoland goscan logos # gnoland is the main executable of gnolang # bring this back when ready @@ -15,7 +12,7 @@ goscan: xgo ./cmd/goscan -# Is logos test code or will it be a part of the system? +# Logos is the interface to Gnoland logos: echo "building logos" xgo ./logos/cmd @@ -29,7 +26,7 @@ xgo: echo "installing xgo" go get src.techknowlogick.com/xgo - +# NB: Binaries will output in the folder github.com/gnoland # TODO stringer -type=Op # Unsure what the above refers to. Created a basic Makefile. From 8b22b7dd8f60fdc9761fb896943a346aa33dce23 Mon Sep 17 00:00:00 2001 From: Jacob Gadikian Date: Sun, 14 Feb 2021 15:19:49 +0700 Subject: [PATCH 16/38] Update make.yml --- .github/workflows/make.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/make.yml b/.github/workflows/make.yml index fb581c13304..17e18aff15d 100644 --- a/.github/workflows/make.yml +++ b/.github/workflows/make.yml @@ -6,5 +6,9 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 + - name: Setup go + uses: actions/setup-go@v2 + with: + go-version: '^1.15' - name: build run: make From 4fc50e0a3b00196c5d038bf28833e00cce1c2b49 Mon Sep 17 00:00:00 2001 From: Jacob Gadikian Date: Sun, 14 Feb 2021 15:25:39 +0700 Subject: [PATCH 17/38] Update make.yml --- .github/workflows/make.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/make.yml b/.github/workflows/make.yml index 17e18aff15d..53a631f13e5 100644 --- a/.github/workflows/make.yml +++ b/.github/workflows/make.yml @@ -2,7 +2,7 @@ name: logos on: [push, pull_request] jobs: - goscan: + gno: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 @@ -12,3 +12,7 @@ jobs: go-version: '^1.15' - name: build run: make + - uses: actions/upload-artifact@v2 + with: + name: gno + path: github.com/gnolang From 022abcedb65aeb19f4a557c855893076c8324e3d Mon Sep 17 00:00:00 2001 From: Jacob Gadikian Date: Sun, 14 Feb 2021 15:27:34 +0700 Subject: [PATCH 18/38] Update and rename make.yml to build.yml --- .github/workflows/{make.yml => build.yml} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename .github/workflows/{make.yml => build.yml} (96%) diff --git a/.github/workflows/make.yml b/.github/workflows/build.yml similarity index 96% rename from .github/workflows/make.yml rename to .github/workflows/build.yml index 53a631f13e5..451c2ed8a21 100644 --- a/.github/workflows/make.yml +++ b/.github/workflows/build.yml @@ -1,4 +1,4 @@ -name: logos +name: build on: [push, pull_request] jobs: From 1034ecce60d8d7c1b325726dd4afc77b6fcba326 Mon Sep 17 00:00:00 2001 From: Jacob Gadikian Date: Sun, 14 Feb 2021 16:18:25 +0700 Subject: [PATCH 19/38] Update Makefile --- Makefile | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index c5c31170f35..d33774e0319 100644 --- a/Makefile +++ b/Makefile @@ -1,21 +1,23 @@ all: xgo gnoland goscan logos +targets = windows/amd64,windows/arm64,darwin-10.14/arm64,darwin-10.14/amd64,linux/* + # gnoland is the main executable of gnolang # bring this back when ready gnoland: echo "Building gnoland" - xgo ./cmd/gnoland + xgo -v -x --targets=$(targets) ./cmd/gnoland # goscan scans go code to determine its AST goscan: echo "Building goscan" - xgo ./cmd/goscan + xgo -v -x --targets=$(targets) ./cmd/goscan # Logos is the interface to Gnoland logos: echo "building logos" - xgo ./logos/cmd + xgo -v -x --targets=4(targets) ./logos/cmd test: From fa1c2e1c0c51728454690f632168068fd161391a Mon Sep 17 00:00:00 2001 From: faddat Date: Sun, 14 Feb 2021 12:05:27 +0000 Subject: [PATCH 20/38] Updated build process --- Makefile | 26 +++++++++++++++++++------- go.sum | 1 + 2 files changed, 20 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index d33774e0319..9786ec814b4 100644 --- a/Makefile +++ b/Makefile @@ -1,24 +1,37 @@ -all: xgo gnoland goscan logos +all: build-dir gnoland goscan logos + +build-dir: + mkdir build || true + +# Uses xgo to compile gnoland, gnoscan and logos +# NB: Binaries will output in the folder github.com/gnoland targets = windows/amd64,windows/arm64,darwin-10.14/arm64,darwin-10.14/amd64,linux/* -# gnoland is the main executable of gnolang -# bring this back when ready +omni: xgo + echo "Building all gnoland components for arm64 and amd64" + xgo -v -x --targets=$(targets) ./cmd/gnoland + xgo -v -x --targets=$(targets) ./cmd/goscan + xgo -v -x --targets=$(targets) ./logos/cmd + +# The main show gnoland: echo "Building gnoland" - xgo -v -x --targets=$(targets) ./cmd/gnoland + go build -o build/gnoland ./cmd/gnoland # goscan scans go code to determine its AST goscan: echo "Building goscan" - xgo -v -x --targets=$(targets) ./cmd/goscan + go build -o build/goscan ./cmd/goscan # Logos is the interface to Gnoland logos: echo "building logos" - xgo -v -x --targets=4(targets) ./logos/cmd + go build -o build/logos ./logos/cmd/logos.go +clean: + rm -rf build test: echo "Running tests" @@ -28,7 +41,6 @@ xgo: echo "installing xgo" go get src.techknowlogick.com/xgo -# NB: Binaries will output in the folder github.com/gnoland # TODO stringer -type=Op # Unsure what the above refers to. Created a basic Makefile. diff --git a/go.sum b/go.sum index 54b06da342a..db629f591ca 100644 --- a/go.sum +++ b/go.sum @@ -21,6 +21,7 @@ github.com/rivo/uniseg v0.1.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0= github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +golang.org/x/sys v0.0.0-20190626150813-e07cf5db2756 h1:9nuHUbU8dRnRRfj9KjWUVrJeoexdbeMjttk6Oh1rD10= golang.org/x/sys v0.0.0-20190626150813-e07cf5db2756/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= From b569f92c5b29c6e2747821ca0bac798ce367a4e2 Mon Sep 17 00:00:00 2001 From: faddat Date: Sun, 14 Feb 2021 13:13:45 +0000 Subject: [PATCH 21/38] Added HasBorder to the Border struct so that tests pass --- Makefile | 1 + logos/types.go | 5 ++++- logos/types_test.go | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 9786ec814b4..52ee1e3789b 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,6 @@ all: build-dir gnoland goscan logos +.PHONY: logos build-dir: mkdir build || true diff --git a/logos/types.go b/logos/types.go index 9224776c6a5..a803a3f3cf3 100644 --- a/logos/types.go +++ b/logos/types.go @@ -670,7 +670,7 @@ func (pd Padding) GetPadding() Padding { return pd } -// A border can only have width 0 or 1, and is part of the padding. +// border can only have width 0 or 1, and is part of the padding. // Each string should represent a character of width 1. type Border struct { Corners [4]string // starts upper-left and clockwise, "" draws no corner. @@ -678,6 +678,7 @@ type Border struct { BotLine []string // nil if no bottom border. LeftLine []string // nil if no left border. RightLine []string // nil if no right border. + HasBorder bool // Border or no border. } func DefaultBorder() Border { @@ -692,6 +693,8 @@ func DefaultBorder() Border { BotLine: []string{string(tcell.RuneHLine)}, LeftLine: []string{string(tcell.RuneVLine)}, RightLine: []string{string(tcell.RuneVLine)}, + HasBorder: true, // Border or no border. + } } diff --git a/logos/types_test.go b/logos/types_test.go index 6d97cfff20f..41a8e7414df 100644 --- a/logos/types_test.go +++ b/logos/types_test.go @@ -39,7 +39,7 @@ func TestNewPageSprint(t *testing.T) { this is a new string */ - bpv := NewBufferedPageView(page, Size{}) + bpv := NewBufferedElemView(page, Size{}) out := bpv.Sprint() // unrendered. require.Equal(t, out, " \n ") bpv.Render() From 8fbae4395722ed04d1a7534b03484e4bdd450296 Mon Sep 17 00:00:00 2001 From: Jacob Gadikian Date: Sun, 14 Feb 2021 20:16:47 +0700 Subject: [PATCH 22/38] Update build.yml Added multiplatform build, more or less as a test --- .github/workflows/build.yml | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 451c2ed8a21..165e930d6b7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -2,7 +2,24 @@ name: build on: [push, pull_request] jobs: - gno: + native: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - name: Setup go + uses: actions/setup-go@v2 + with: + go-version: '^1.15' + - name: build + run: make + - uses: actions/upload-artifact@v2 + with: + name: gno + path: github.com/gnolang + + + + xgo: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 From df1023fd49c76238d83fe7de10bffd821dac607e Mon Sep 17 00:00:00 2001 From: Jacob Gadikian Date: Sun, 14 Feb 2021 20:18:38 +0700 Subject: [PATCH 23/38] Update build.yml --- .github/workflows/build.yml | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 165e930d6b7..4056f8b03de 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -19,7 +19,7 @@ jobs: - xgo: + omni: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 @@ -28,8 +28,20 @@ jobs: with: go-version: '^1.15' - name: build - run: make + run: make onmni - uses: actions/upload-artifact@v2 with: name: gno path: github.com/gnolang + + + test: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - name: Setup go + uses: actions/setup-go@v2 + with: + go-version: '^1.15' + - name: build + run: make test From 48e39a44d00336c4663fb978d3e5e658613d8033 Mon Sep 17 00:00:00 2001 From: Jacob Gadikian Date: Sun, 14 Feb 2021 20:19:29 +0700 Subject: [PATCH 24/38] Update build.yml --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4056f8b03de..536b632533d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -28,7 +28,7 @@ jobs: with: go-version: '^1.15' - name: build - run: make onmni + run: make omni - uses: actions/upload-artifact@v2 with: name: gno From fdc8774d45baffce5f9200d9fc0e8dfc2eeca03c Mon Sep 17 00:00:00 2001 From: Jacob Gadikian Date: Sun, 14 Feb 2021 20:48:48 +0700 Subject: [PATCH 25/38] Update README.md --- README.md | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 5b78b8748fb..f74ac08f08c 100644 --- a/README.md +++ b/README.md @@ -26,10 +26,11 @@ continuing to make the tests/files/\*.go tests pass. Make sure you have >=[go1.15](https://golang.org/doc/install) installed, and then try this: ```bash -> git clone git@github.com:gnolang/gno.git -> cd gno -> go mod download github.com/davecgh/go-spew -> go test tests/*.go -v -run="Test/realm.go" +git clone git@github.com:gnolang/gno.git +cd gno +make +cd build +./gnoland ``` ## Ownership From d4f89e67e523ec2a85ab224464608bb0e9158f08 Mon Sep 17 00:00:00 2001 From: Jacob Gadikian Date: Sun, 14 Feb 2021 20:50:32 +0700 Subject: [PATCH 26/38] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index f74ac08f08c..e8422a60c10 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ simulated by the Gnomes of the Greater Resistance. ## Status -_Update Feb 13th, 2021: Implemented Logos UI framework._ +_Update Feb 14th, 2021: Implemented Logos UI framework, added Makefile._ This is a still a work in a progress, though much of the structure of the interpreter and AST have taken place. Work is ongoing now to demonstrate the Realm concept before From f531d89d7bb0795ad8275814541b9fbd5773a099 Mon Sep 17 00:00:00 2001 From: faddat Date: Sun, 14 Feb 2021 13:59:40 +0000 Subject: [PATCH 27/38] https://stackoverflow.com/questions/38172661/what-is-the-meaning-of-and Fixed Logos (I think) --- logos/cmd/logos.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/logos/cmd/logos.go b/logos/cmd/logos.go index bbc68b5ec8a..a4131089bb8 100644 --- a/logos/cmd/logos.go +++ b/logos/cmd/logos.go @@ -170,7 +170,7 @@ func makeTestPage() *logos.BufferedElemView { Border: logos.Border{HasBorder: true}, } // TODO width shouldn't matter. - page := logos.NewPage(ts, 84, true, style) + page := logos.NewPage(ts, 84, true, &style) bpv := logos.NewBufferedElemView(page, logos.Size{}) return bpv } From e8b1b5d86c69ca7782bf63593b98fc740796338d Mon Sep 17 00:00:00 2001 From: faddat Date: Sun, 14 Feb 2021 14:07:24 +0000 Subject: [PATCH 28/38] Corrected some issues --- logos/cmd/logos.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/logos/cmd/logos.go b/logos/cmd/logos.go index a4131089bb8..2ca7379b7c8 100644 --- a/logos/cmd/logos.go +++ b/logos/cmd/logos.go @@ -119,9 +119,10 @@ func makeTestString() string { putln("Enclose: !\u20e3 (should be enclosed exclamation)") putln("ZWJ: \U0001f9db\u200d\u2640 (female vampire)") putln("ZWJ: \U0001f9db\u200d\u2642 (male vampire)") - putln("Family: \U0001f469\u200d\U0001f467\u200d\U0001f467 (woman girl girl)\n") + putln("Family: \U0001f469\u200d\U0001f467\u200d\U0001f467 (woman girl girl)") // XXX why is this broken? - // putln("Region: \U0001f1fa\U0001f1f8 (USA! USA!)\n") + putln("Region: \U0001f1fa\U0001f1f8 (USA! USA!)\n") + // Perhaps bad governance broke it. putln("") putln("Box:") putln(string([]rune{ @@ -166,7 +167,7 @@ func makeTestPage() *logos.BufferedElemView { // make a buffered page. ts := makeTestString() style := logos.Style{ - Padding: logos.Padding{2, 2, 2, 2}, + Padding: logos.Padding{Left: 2, Top: 2, Right: 2, Bottom: 2}, Border: logos.Border{HasBorder: true}, } // TODO width shouldn't matter. From d51cd1c7d183ddc9c56dd74e63a3c68adba1fc5c Mon Sep 17 00:00:00 2001 From: faddat Date: Sun, 14 Feb 2021 14:12:29 +0000 Subject: [PATCH 29/38] Added comments --- logos/cmd/logos.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/logos/cmd/logos.go b/logos/cmd/logos.go index 2ca7379b7c8..ee05493ebb4 100644 --- a/logos/cmd/logos.go +++ b/logos/cmd/logos.go @@ -99,6 +99,8 @@ func main() { } } + +// makeTestString constructs the string that is displayed to test Logos func makeTestString() string { s := "" putln := func(l string) { @@ -163,6 +165,8 @@ func makeTestString() string { return s } + +// makeTestPage gets the test string and returns a Buffered Page View, the TUI of Logos func makeTestPage() *logos.BufferedElemView { // make a buffered page. ts := makeTestString() From 7e482c1a6224630e0ee81751824626fd933e70ed Mon Sep 17 00:00:00 2001 From: Jacob Gadikian Date: Mon, 15 Feb 2021 16:47:51 +0700 Subject: [PATCH 30/38] Update Makefile --- Makefile | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 52ee1e3789b..b6d0c7b85cc 100644 --- a/Makefile +++ b/Makefile @@ -1,9 +1,7 @@ -all: build-dir gnoland goscan logos +all: gnoland goscan logos .PHONY: logos -build-dir: - mkdir build || true # Uses xgo to compile gnoland, gnoscan and logos # NB: Binaries will output in the folder github.com/gnoland @@ -18,18 +16,18 @@ omni: xgo # The main show gnoland: echo "Building gnoland" - go build -o build/gnoland ./cmd/gnoland + go build -o gnoland ./cmd/gnoland # goscan scans go code to determine its AST goscan: echo "Building goscan" - go build -o build/goscan ./cmd/goscan + go build -o goscan ./cmd/goscan # Logos is the interface to Gnoland logos: echo "building logos" - go build -o build/logos ./logos/cmd/logos.go + go build -o logos ./logos/cmd/logos.go clean: rm -rf build From 468ef63a9ee113a6fad1b421ea99ea246821c8d4 Mon Sep 17 00:00:00 2001 From: Jacob Gadikian Date: Mon, 15 Feb 2021 16:49:54 +0700 Subject: [PATCH 31/38] Update build.yml --- .github/workflows/build.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 536b632533d..cd96d5dc852 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -14,8 +14,11 @@ jobs: run: make - uses: actions/upload-artifact@v2 with: - name: gno - path: github.com/gnolang + name: gnoland + path: | + gnoland + goscan + logos From 77b2eb8f3760ef039afc361666381dc6a36fd069 Mon Sep 17 00:00:00 2001 From: faddat Date: Sat, 20 Feb 2021 16:26:50 +0000 Subject: [PATCH 32/38] added plain "go test" --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index b6d0c7b85cc..99ef8870759 100644 --- a/Makefile +++ b/Makefile @@ -34,6 +34,7 @@ clean: test: echo "Running tests" + go test go test tests/*.go -v -run="Test/realm.go" xgo: From f2aa9b7d115ef8d787c38b53e88f3ce797ac36fc Mon Sep 17 00:00:00 2001 From: faddat Date: Sun, 21 Feb 2021 09:22:27 +0000 Subject: [PATCH 33/38] Added CHANGELOG --- CHANGELOG | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 CHANGELOG diff --git a/CHANGELOG b/CHANGELOG new file mode 100644 index 00000000000..d1acd21d891 --- /dev/null +++ b/CHANGELOG @@ -0,0 +1,31 @@ +# Changelog +All notable changes to this project will be documented in this file. + +The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), +and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). + +## [Unreleased] +### Added +- First commits +- Logos browser +- Tests from Yagi +- xgo cross compilation support +- Makefile +- Github action +- Expanded Readme with information about the project + +### Changed +- Moved Logos + +### Removed + + + +## [1.0.0] - 2017-06-20 +### Added + + +### Changed + + +### Removed From d54a3581da2a4a056f5db966c09d639554824759 Mon Sep 17 00:00:00 2001 From: Jacob Gadikian Date: Mon, 22 Feb 2021 23:58:24 +0700 Subject: [PATCH 34/38] Added new phonies for active dev --- Makefile | 2 +- go.mod | 1 + go.sum | 92 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 94 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 99ef8870759..d756be72441 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ all: gnoland goscan logos -.PHONY: logos +.PHONY: logos goscan gnoland # Uses xgo to compile gnoland, gnoscan and logos diff --git a/go.mod b/go.mod index de199a308e8..6c90e873563 100644 --- a/go.mod +++ b/go.mod @@ -3,6 +3,7 @@ module github.com/gnolang/gno go 1.15 require ( + github.com/OpenDiablo2/OpenDiablo2 v0.0.0-20210217103502-e9c9786af1b3 // indirect github.com/davecgh/go-spew v1.1.1 github.com/gdamore/tcell v1.4.0 github.com/gdamore/tcell/v2 v2.1.0 diff --git a/go.sum b/go.sum index db629f591ca..e2fcc672d56 100644 --- a/go.sum +++ b/go.sum @@ -1,3 +1,11 @@ +dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= +github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= +github.com/JoshVarga/blast v0.0.0-20180421040937-681c804fb9f0 h1:tDnuU0igiBiQFjsvq1Bi7DpoUjqI76VVvW045vpeFeM= +github.com/JoshVarga/blast v0.0.0-20180421040937-681c804fb9f0/go.mod h1:h/5OEGj4G+fpYxluLjSMZbFY011ZxAntO98nCl8mrCs= +github.com/OpenDiablo2/OpenDiablo2 v0.0.0-20210217103502-e9c9786af1b3 h1:76Eq8UAC3xvkYNTOFVQ9OJgsu9amP9nnioPANV5Twdw= +github.com/OpenDiablo2/OpenDiablo2 v0.0.0-20210217103502-e9c9786af1b3/go.mod h1:3JsaDhsHD+3mmG/WLLct2Zy1HjXS39jsyLPFbgRkbN0= +github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= +github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -7,25 +15,109 @@ github.com/gnolang/tcell v1.4.0 h1:lMgIbMpvutxEsddokzHHX4/7SewlPWp9DuuBafpq0Nw= github.com/gnolang/tcell v1.4.0/go.mod h1:vxEiSDZdW3L+Uhjii9c3375IlDmR05bzxY404ZVSMo0= github.com/gnolang/tcell/v2 v2.1.0 h1:gUYsnrQP+bPYTamkKTSkBuOc86MW2+YW+8E+kjZSf+8= github.com/gnolang/tcell/v2 v2.1.0/go.mod h1:vSVL/GV5mCSlPC6thFP5kfOFdM9MGZcalipmpTxTgQA= +github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= +github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200707082815-5321531c36a2 h1:Ac1OEHHkbAZ6EUnJahF0GKcU0FjPc/V8F1DvjhKngFE= +github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200707082815-5321531c36a2/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= +github.com/go-restruct/restruct v1.2.0-alpha h1:2Lp474S/9660+SJjpVxoKuWX09JsXHSrdV7Nv3/gkvc= +github.com/go-restruct/restruct v1.2.0-alpha/go.mod h1:KqrpKpn4M8OLznErihXTGLlsXFGeLxHUrLRRI/1YjGk= +github.com/gofrs/flock v0.8.0/go.mod h1:F1TvTiK9OcQqauNUHlbJvyl9Qa1QvF/gOUDKA14jxHU= +github.com/google/uuid v1.1.2 h1:EVhdT+1Kseyi1/pUmXKaFxYsDNy9RQYkMWRH68J/W7Y= +github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/gravestench/akara v0.0.0-20201014060234-a64208a7fd3c h1:WopE590cKxkcKXcOee4gPXHqtzwbarLClCaWNCdLqgI= +github.com/gravestench/akara v0.0.0-20201014060234-a64208a7fd3c/go.mod h1:fTeda1SogMg5Lkd4lXMEd/Pk/a5/gQuLGaAI2rn1PBQ= +github.com/hajimehoshi/bitmapfont/v2 v2.1.0/go.mod h1:2BnYrkTQGThpr/CY6LorYtt/zEPNzvE/ND69CRTaHMs= +github.com/hajimehoshi/ebiten/v2 v2.0.2 h1:t8HXO9hJfKlS9tNhht8Ov6xecag0gRl7AkfKgC9hcLE= +github.com/hajimehoshi/ebiten/v2 v2.0.2/go.mod h1:AbHP/SS226aFTex/izULVwW0D2AuGyqC4AVwilmRjOg= +github.com/hajimehoshi/file2byteslice v0.0.0-20200812174855-0e5e8a80490e/go.mod h1:CqqAHp7Dk/AqQiwuhV1yT2334qbA/tFWQW0MD2dGqUE= +github.com/hajimehoshi/go-mp3 v0.3.1/go.mod h1:qMJj/CSDxx6CGHiZeCgbiq2DSUkbK0UbtXShQcnfyMM= +github.com/hajimehoshi/oto v0.6.1/go.mod h1:0QXGEkbuJRohbJaxr7ZQSxnju7hEhseiPx2hrh6raOI= +github.com/hajimehoshi/oto v0.6.8 h1:yRb3EJQ4lAkBgZYheqmdH6Lr77RV9nSWFsK/jwWdTNY= +github.com/hajimehoshi/oto v0.6.8/go.mod h1:0QXGEkbuJRohbJaxr7ZQSxnju7hEhseiPx2hrh6raOI= github.com/jaekwon/testify v1.6.1 h1:4AtAJcR9GzXN5W4DdY7ie74iCPiJV1JJUJL90t2ZUyw= github.com/jaekwon/testify v1.6.1/go.mod h1:Oun0RXIHI7osufabQ60i4Lqkj0GXLbqI1I7kgzBNm1U= +github.com/jakecoffman/cp v1.0.0/go.mod h1:JjY/Fp6d8E1CHnu74gWNnU0+b9VzEdUVPoJxg2PsTQg= +github.com/jfreymuth/oggvorbis v1.0.1/go.mod h1:NqS+K+UXKje0FUYUPosyQ+XTVvjmVjps1aEZH1sumIk= +github.com/jfreymuth/vorbis v1.0.0/go.mod h1:8zy3lUAm9K/rJJk223RKy6vjCZTWC61NA2QD06bfOE0= +github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= +github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/lucasb-eyer/go-colorful v1.0.3 h1:QIbQXiugsb+q10B+MI+7DI1oQLdmnep86tWFlaaUAac= github.com/lucasb-eyer/go-colorful v1.0.3/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0= github.com/mattn/go-runewidth v0.0.7/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI= github.com/mattn/go-runewidth v0.0.10 h1:CoZ3S2P7pvtP45xOtBw+/mDL2z0RKI576gSkzRRpdGg= github.com/mattn/go-runewidth v0.0.10/go.mod h1:RAqKPSqVFrSLVXbA8x7dzmKdmGzieGRCM46jaSJTDAk= +github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= +github.com/pkg/browser v0.0.0-20180916011732-0a3d74bf9ce4/go.mod h1:4OwLy04Bl9Ef3GJJCoec+30X3LQs/0/m4HFRt/2LUSA= +github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= +github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pkg/profile v1.5.0 h1:042Buzk+NhDI+DeSAA62RwJL8VAuZUMQZUjCsRz1Mug= +github.com/pkg/profile v1.5.0/go.mod h1:qBsxPvzyUincmltOk6iyRVxHYg4adc0OFOv72ZdLa18= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/rivo/uniseg v0.1.0 h1:+2KBaVoUmb9XzDsrx/Ct0W/EYOSFf/nWTauy++DprtY= github.com/rivo/uniseg v0.1.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= +github.com/robertkrimen/otto v0.0.0-20200922221731-ef014fd054ac h1:kYPjbEN6YPYWWHI6ky1J813KzIq/8+Wg4TO4xU7A/KU= +github.com/robertkrimen/otto v0.0.0-20200922221731-ef014fd054ac/go.mod h1:xvqspoSXJTIpemEonrMDFq6XzwHYYgToXWj5eRX1OtY= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0= github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= +golang.org/x/exp v0.0.0-20190731235908-ec7cb31e5a56/go.mod h1:JhuoJpWY28nO4Vef9tZUw9qufEGTyX1+7lmHxV5q5G4= +golang.org/x/exp v0.0.0-20201008143054-e3b2a7f2fdc7 h1:2/QncOxxpPAdiH+E00abYw/SaQG353gltz79Nl1zrYE= +golang.org/x/exp v0.0.0-20201008143054-e3b2a7f2fdc7/go.mod h1:1phAWC201xIgDyaFpmDeZkgf70Q4Pd/CNqfRtVPtxNw= +golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= +golang.org/x/image v0.0.0-20190703141733-d6a02ce849c9/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= +golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= +golang.org/x/image v0.0.0-20200927104501-e162460cd6b5 h1:QelT11PB4FXiDEXucrfNckHoFxwt8USGY1ajP1ZF5lM= +golang.org/x/image v0.0.0-20200927104501-e162460cd6b5/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= +golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE= +golang.org/x/mobile v0.0.0-20190415191353-3e0bab5405d6/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o= +golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o= +golang.org/x/mobile v0.0.0-20200801112145-973feb4309de h1:OVJ6QQUBAesB8CZijKDSsXX7xYVtUhrkY0gwMfbi4p4= +golang.org/x/mobile v0.0.0-20200801112145-973feb4309de/go.mod h1:skQtrUTUwhdJvXM/2KKJzY8pDgNr9I/FOMqDVRPBUS4= +golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY= +golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= +golang.org/x/mod v0.1.1-0.20191209134235-331c550502dd/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.3.1-0.20200828183125-ce943fd02449/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= +golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190429190828-d89cdac9e872/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190626150813-e07cf5db2756 h1:9nuHUbU8dRnRRfj9KjWUVrJeoexdbeMjttk6Oh1rD10= golang.org/x/sys v0.0.0-20190626150813-e07cf5db2756/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20201009025420-dfb3f7c4e634/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20201028215240-c5abc1b1d397 h1:YZ169h3kkKEXsueizzMwOT9AaiffbOa6oXSmUFJ4vxM= +golang.org/x/sys v0.0.0-20201028215240-c5abc1b1d397/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20200117012304-6edc0a871e69/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20201009162240-fcf82128ed91/go.mod h1:z6u4i615ZeAfBE4XtMziQW1fSVJXACjjbWkB/mvPzlU= +golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/sourcemap.v1 v1.0.5 h1:inv58fC9f9J3TK2Y2R1NPntXEn3/wjWHkonhIUODNTI= +gopkg.in/sourcemap.v1 v1.0.5/go.mod h1:2RlvNNSMglmRrcvhfuzp4hQHwOtjxlbjX7UPY/GXb78= +gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= src.techknowlogick.com/xgo v1.2.1-0.20210207204503-1ea8454a58df h1:emObvP33uBegaUw3n4wBs5Jj/pahioIqMZnTdET9lFA= From 146f11a454f4093ba2ff888e2f117bb134fba75c Mon Sep 17 00:00:00 2001 From: Jacob Gadikian Date: Tue, 16 Mar 2021 04:26:14 +0700 Subject: [PATCH 35/38] Create Readme.md Sketch of how --- logos/Readme.md | 54 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 logos/Readme.md diff --git a/logos/Readme.md b/logos/Readme.md new file mode 100644 index 00000000000..77fb051f116 --- /dev/null +++ b/logos/Readme.md @@ -0,0 +1,54 @@ +# Logos + +Logos is the interface to Gno. + +* Browser +* Text Editor +* Development environment in the spirt of emacs +* Terminal + +Bootstrap from Go to Gno the same way that Go bootstrapped from GCC. + +* Stitch +* Demodule + +Within one community, there are many realms and each realm maps to a user / thread / goroutine. + +There are many communities, and all communities enjoy full sovereignty. + +Realms can be public or private. + +## User Realms + +gno.land/u/faddat + +Every user in a Gno community has their own realm. + +## Realms + +gno.land/r/chat + +A utility realm doesn't map to a person, instead, it maps to an application. Utility realms have an economic model with three fee components: + +* Storage +* Computation +* Authorship (optional) + +A utility realm can be paid for and preserved by the stream of funds provided by its users in the form of fees. Authors of utility realms are permitted to include fees for their authorship of the module. This is to ensure that popular realms, despite being open soruce, produce a stream of revenue for their creators. + +**Private Utility Realms** + +* Has a whitelisted of users or an exclusionary blacklist +* Is transparent on the blockchain +* Must include computation fees +* Can include authorship fees +* Can charge users storage fees at execution, or allow for state rent to be paid up. + + +**Public Utility Realms** + +* Has a whitelisted of users or an exclusionary blacklist +* Is transparent on the blockchain +* Must include computation fees +* Can include authorship fees +* Can charge users storage fees at execution, or allow for state rent to be paid up. From dadeb931d0a9f5489e7c99480302a20792ab4cac Mon Sep 17 00:00:00 2001 From: faddat Date: Sun, 4 Apr 2021 17:23:25 +0000 Subject: [PATCH 36/38] Xgo removed, basic guidelines added. --- CHANGELOG | 1 - Makefile | 11 ----------- README.md | 4 ++++ go.mod | 1 - go.sum | 3 +-- 5 files changed, 5 insertions(+), 15 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index d1acd21d891..08f8a95d8b9 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -9,7 +9,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - First commits - Logos browser - Tests from Yagi -- xgo cross compilation support - Makefile - Github action - Expanded Readme with information about the project diff --git a/Makefile b/Makefile index d756be72441..144935eb6a0 100644 --- a/Makefile +++ b/Makefile @@ -3,16 +3,9 @@ all: gnoland goscan logos .PHONY: logos goscan gnoland -# Uses xgo to compile gnoland, gnoscan and logos # NB: Binaries will output in the folder github.com/gnoland targets = windows/amd64,windows/arm64,darwin-10.14/arm64,darwin-10.14/amd64,linux/* -omni: xgo - echo "Building all gnoland components for arm64 and amd64" - xgo -v -x --targets=$(targets) ./cmd/gnoland - xgo -v -x --targets=$(targets) ./cmd/goscan - xgo -v -x --targets=$(targets) ./logos/cmd - # The main show gnoland: echo "Building gnoland" @@ -37,10 +30,6 @@ test: go test go test tests/*.go -v -run="Test/realm.go" -xgo: - echo "installing xgo" - go get src.techknowlogick.com/xgo - # TODO stringer -type=Op # Unsure what the above refers to. Created a basic Makefile. diff --git a/README.md b/README.md index e8422a60c10..a608a45bd48 100644 --- a/README.md +++ b/README.md @@ -287,6 +287,10 @@ file does. Eventually, each function will be commented in the same manner. You can learn a great deal from reading Gnocode, and it's recommended that both users and developers have a look. +## Guidelines +* Jae's BDFL, this is his design. +* No dependencies on anything precompiled. + ## Contact If you can read this, the project is evolving (fast) every day. Check diff --git a/go.mod b/go.mod index 6c90e873563..28de4523027 100644 --- a/go.mod +++ b/go.mod @@ -10,7 +10,6 @@ require ( github.com/jaekwon/testify v1.6.1 github.com/mattn/go-runewidth v0.0.10 github.com/stretchr/testify v1.6.1 - src.techknowlogick.com/xgo v1.2.1-0.20210207204503-1ea8454a58df // indirect ) replace github.com/gdamore/tcell => github.com/gnolang/tcell v1.4.0 diff --git a/go.sum b/go.sum index e2fcc672d56..3df521800b1 100644 --- a/go.sum +++ b/go.sum @@ -120,5 +120,4 @@ gopkg.in/sourcemap.v1 v1.0.5/go.mod h1:2RlvNNSMglmRrcvhfuzp4hQHwOtjxlbjX7UPY/GXb gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -src.techknowlogick.com/xgo v1.2.1-0.20210207204503-1ea8454a58df h1:emObvP33uBegaUw3n4wBs5Jj/pahioIqMZnTdET9lFA= -src.techknowlogick.com/xgo v1.2.1-0.20210207204503-1ea8454a58df/go.mod h1:31CE1YKtDOrKTk9PSnjTpe6YbO6W/0LTYZ1VskL09oU= + From ba9e1c566cf9a76fb27e176b6260e2cbd73b5149 Mon Sep 17 00:00:00 2001 From: Jacob Gadikian Date: Mon, 5 Apr 2021 00:25:42 +0700 Subject: [PATCH 37/38] Update build.yml --- .github/workflows/build.yml | 21 ++------------------- 1 file changed, 2 insertions(+), 19 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index cd96d5dc852..59fbb0ddc37 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -9,7 +9,7 @@ jobs: - name: Setup go uses: actions/setup-go@v2 with: - go-version: '^1.15' + go-version: '^1.16' - name: build run: make - uses: actions/upload-artifact@v2 @@ -19,23 +19,6 @@ jobs: gnoland goscan logos - - - - omni: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - name: Setup go - uses: actions/setup-go@v2 - with: - go-version: '^1.15' - - name: build - run: make omni - - uses: actions/upload-artifact@v2 - with: - name: gno - path: github.com/gnolang test: @@ -45,6 +28,6 @@ jobs: - name: Setup go uses: actions/setup-go@v2 with: - go-version: '^1.15' + go-version: '^1.16' - name: build run: make test From aaf1af55e79c22bfa79765a479f3afc4bc3f9543 Mon Sep 17 00:00:00 2001 From: Jacob Gadikian Date: Mon, 12 Apr 2021 01:36:56 +0700 Subject: [PATCH 38/38] Update Readme.md info on realms was superfluous. --- logos/Readme.md | 33 --------------------------------- 1 file changed, 33 deletions(-) diff --git a/logos/Readme.md b/logos/Readme.md index 77fb051f116..8cb2176ea4e 100644 --- a/logos/Readme.md +++ b/logos/Readme.md @@ -18,37 +18,4 @@ There are many communities, and all communities enjoy full sovereignty. Realms can be public or private. -## User Realms -gno.land/u/faddat - -Every user in a Gno community has their own realm. - -## Realms - -gno.land/r/chat - -A utility realm doesn't map to a person, instead, it maps to an application. Utility realms have an economic model with three fee components: - -* Storage -* Computation -* Authorship (optional) - -A utility realm can be paid for and preserved by the stream of funds provided by its users in the form of fees. Authors of utility realms are permitted to include fees for their authorship of the module. This is to ensure that popular realms, despite being open soruce, produce a stream of revenue for their creators. - -**Private Utility Realms** - -* Has a whitelisted of users or an exclusionary blacklist -* Is transparent on the blockchain -* Must include computation fees -* Can include authorship fees -* Can charge users storage fees at execution, or allow for state rent to be paid up. - - -**Public Utility Realms** - -* Has a whitelisted of users or an exclusionary blacklist -* Is transparent on the blockchain -* Must include computation fees -* Can include authorship fees -* Can charge users storage fees at execution, or allow for state rent to be paid up.