Skip to content

Commit

Permalink
wip
Browse files Browse the repository at this point in the history
Signed-off-by: Yuji Ito <llamerada.jp@gmail.com>
  • Loading branch information
llamerada-jp committed Feb 12, 2023
1 parent 7ed8fe6 commit f91a31e
Show file tree
Hide file tree
Showing 38 changed files with 1,125 additions and 694 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,13 @@
/build/
/coverage
/dist/*.wasm
/dist/404.html
/dist/colonio_go.js
/dist/colonio.js
/dist/colonio.wasm
/dist/container.js
/dist/controller.js
/dist/error.html
/dist/index.html
/dist/index.js
/dist/test.js
Expand Down
11 changes: 9 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
COLONIO_BRANCH := main
COLONIO_FILES := dist/colonio.js dist/colonio_go.js dist/colonio.wasm
GO_FILES := $(shell find . -name *.go)
OINARI_FILES := dist/wasm_exec.js
OINARI_FILES := dist/wasm_exec.js dist/404.html dist/error.html dist/index.html

run: build
while true; do ./bin/seed --debug -p 8080; done
Expand All @@ -19,8 +19,9 @@ setup:
$(MAKE) -C build/colonio build BUILD_TYPE=Debug
npm install

build: $(COLONIO_FILES) $(GO_FILES) $(OINARI_FILES) bin/seed dist/index.html src/keys.ts src/colonio.d.ts src/colonio_go.d.ts
build: $(COLONIO_FILES) $(GO_FILES) $(OINARI_FILES) bin/seed src/colonio.d.ts src/colonio_go.d.ts
GOOS=js GOARCH=wasm go build -o ./dist/oinari.wasm ./cmd/agent/*.go
GOOS=js GOARCH=wasm go build -o ./dist/sample.wasm ./cmd/sample/*.go
GOOS=js GOARCH=wasm go test -o ./dist/test_crosslink.wasm -c ./agent/crosslink/*
npm run build

Expand All @@ -30,6 +31,9 @@ test: $(COLONIO_FILES) $(GO_FILES) $(OINARI_FILES) bin/seed src/keys.ts
bin/seed: $(GO_FILES)
go build -o $@ ./cmd/seed

dist/404.html: src/404.html keys.json
go run ./cmd/tool template -i src/404.html -v keys.json > $@

dist/colonio.js: build/colonio/output/colonio.js
cp $< $@

Expand All @@ -39,6 +43,9 @@ dist/colonio.wasm: build/colonio/output/colonio.wasm
dist/colonio_go.js: build/colonio/src/js/colonio_go.js
cp $< $@

dist/error.html: src/error.html keys.json
go run ./cmd/tool template -i src/error.html -v keys.json > $@

dist/index.html: src/index.html keys.json
go run ./cmd/tool template -i src/index.html -v keys.json > $@

Expand Down
8 changes: 0 additions & 8 deletions agent/core/driver.go

This file was deleted.

58 changes: 0 additions & 58 deletions agent/core/pod.go

This file was deleted.

241 changes: 0 additions & 241 deletions agent/core/system.go

This file was deleted.

Loading

0 comments on commit f91a31e

Please sign in to comment.