Skip to content

Commit

Permalink
Merge pull request #21 from zorp-corp/sigilante/list-set-syntax
Browse files Browse the repository at this point in the history
Modify `List`/`Set` syntax.
  • Loading branch information
sigilante authored Jan 13, 2025
2 parents 06dc215 + 94ad0e6 commit a649d5b
Show file tree
Hide file tree
Showing 51 changed files with 501 additions and 378 deletions.
23 changes: 15 additions & 8 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ release-test-zero:

.PHONY: release-test-all
release-test-all:
cargo run $(PROFILE_RELEASE) -- --new test-all
cargo run $(PROFILE_RELEASE) -- --new exec-all

-: ## -----------------------------------------------------------
-: ## ---------- Rest of the commands in the Makefile -----------
Expand All @@ -44,29 +44,29 @@ release-test-all:
.PHONY: build-dev-fast
build-dev-fast: ## Slower to compile, faster to execute. Builds all projects
@set -e; \
./choo hoon/main.hoon hoon; \
cp out.jam assets/jocktest.jam; \
RUST_LOG=TRACE ./choo hoon/main.hoon hoon; \
# mv out.jam assets/jocktest.jam; \
cargo build $(PROFILE_DEV_FAST)

.PHONY: build-parallel
build-parallel: ## profiling profile with parallel feature enabled
@set -e; \
./choo hoon/main.hoon hoon; \
cp out.jam assets/jocktest.jam; \
# mv out.jam assets/jocktest.jam; \
cargo build $(FEATURES_PARALLEL) $(PROFILE_PROFILING)

.PHONY: build
build-dev-debug: ## Fast to compile, slow to execute. Builds all projects
@set -e; \
./choo hoon/main.hoon hoon; \
cp out.jam assets/jocktest.jam; \
RUST_LOG=TRACE ./choo --new --log-level trace hoon/main.hoon hoon; \
# mv out.jam assets/jocktest.jam; \
cargo build

.PHONY: build-release
build-release: ## Slowest to compile, fastest to execute. Builds all projects
@set -e; \
./choo --log-level trace hoon/main.hoon hoon; \
cp out.jam assets/jocktest.jam; \
RUST_LOG=TRACE ./choo hoon/main.hoon hoon; \
# mv out.jam assets/jocktest.jam; \
cargo build $(PROFILE_RELEASE)

.PHONY: update-choo
Expand All @@ -77,3 +77,10 @@ update-choo:
.PHONY: choo-version
choo-version:
@echo "Latest choo version: $(CHOO_TAG)"

.PHONY: clean
clean: ## Clean all projects
@set -e; \
rm -f assets/jocktest.jam; \
rm -rf .data.choo/ \
cargo clean
9 changes: 5 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,10 @@ Then copy the `choo` executable to the root folder.
To build and run Jock with tests:

```bash
make release
make build release

./target/release/jock-testing test-all
# run all codes in /lib/tests
./target/release/jock-testing exec-all
# run specific code in /lib/tests
./target/release/jock-testing test-n 0
```

This will execute all of the supplied programs, then run unit tests over each of the compilation steps in producing each program's Nock.
Binary file modified assets/jocktest.jam
Binary file not shown.
Loading

0 comments on commit a649d5b

Please sign in to comment.