Add jockc and break into crates.

.cargo/config.toml

@@ -0,0 +1,2 @@
+[env]
+CARGO_WORKSPACE_DIR = { value = "", relative = true }

.gitignore

@@ -1,11 +1,13 @@
 # Compilation artifacts
 target
 bin/
-choo
-out.jam
+hoonc
+jockc
+jockt
+*.jam
 
-.data.crown
-**/.data.crown
+.data.*
+**/.data.*
 
 # Dev config
 .vscode/settings.json

Cargo.toml

@@ -1,20 +1,21 @@
-[package]
-name = "jocktest"
+[workspace]
+members = [
+    "crates/jockc",
+    "crates/jockt",
+]
+
+resolver = "2"
+
+[workspace.package]
 version = "0.1.0"
 edition = "2021"
 
-[dependencies]
-crown = { git = "https://github.com/zorp-corp/nockchain", rev="932c8e6b6d159e072d1f4b6d26cc0dccbae4a377"}
-sword = { git = "https://github.com/zorp-corp/nockchain.git", rev = "932c8e6b6d159e072d1f4b6d26cc0dccbae4a377" }
-sword_macros = { git = "https://github.com/zorp-corp/nockchain.git", rev = "932c8e6b6d159e072d1f4b6d26cc0dccbae4a377" }
-assert_no_alloc = { git = "https://github.com/zorp-corp/nockchain.git", rev = "932c8e6b6d159e072d1f4b6d26cc0dccbae4a377" }
-clap = { version = "4.4.4", features = ["derive", "cargo", "color", "env"]}
-tokio = { version = "1.32", features = ["rt", "rt-multi-thread", "net", "macros", "io-util", "fs", "sync", "time"] }
-tracing = "0.1.41"
+# Dependencies
+[workspace.dependencies.jockc]
+path = "crates/jockc"
 
-[[bin]]
-name = "jocktest"
-path = "main.rs"
+[workspace.dependencies.jockt]
+path = "crates/jockt"
 
 [profile.dev]
 opt-level = 3
@@ -28,4 +29,3 @@ debug = 2
 opt-level = 3
 lto = "thin"
 codegen-units = 1
-

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2024 Zorp Corp
+Copyright (c) 2024-2025 Zorp Corp
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

Makefile

@@ -53,30 +53,53 @@ release-exec-all:
 	$(call show_env_vars)
 	@echo "Running release exec-all"
 	RUST_LOG=TRACE MINIMAL_LOG_FORMAT=true cargo run $(PROFILE_RELEASE) -- --new exec-all
+	@exit 0
 
 .PHONY: release-test-all
 release-test-all:
 	$(call show_env_vars)
 	@echo "Running release test-all"
 	RUST_LOG=TRACE MINIMAL_LOG_FORMAT=true cargo run $(PROFILE_RELEASE) -- --new test-all
+	@exit 0
 
 .PHONY: build
-build-dev-debug:
-	$(call show_env_vars)
-	RUST_LOG=trace ./hoonc hoon/main.hoon hoon; \
-	mv out.jam assets/jocktest.jam; \
-	cargo build $(PROFILE_DEV_DEBUG)
-
-.PHONY: build-release
-build-release:
-	$(call show_env_vars)
-	RUST_LOG=trace ./hoonc hoon/main.hoon hoon; \
-	mv out.jam assets/jocktest.jam; \
-	cargo build $(PROFILE_RELEASE)
+build: jockc jockt ## Build the Jock compiler and tester
 
 .PHONY: clean
 clean: ## Clean all projects
 	@set -e; \
 	rm -rf .data.hoonc/ ; \
 	rm -rf target/ ; \
+	rm -rf assets/*.jam ; \
 	cargo clean
+	@exit 0
+
+HOON_TARGETS=assets/jockc.jam assets/jockt.jam
+
+assets/jockc.jam:
+	@set -e; \
+	RUST_LOG=trace MINIMAL_LOG_FORMAT=true ./hoonc crates/jockc/hoon/main.hoon crates/jockc/hoon; \
+	mv out.jam assets/jockc.jam; \
+	exit 0
+
+assets/jockt.jam:
+	@set -e; \
+	RUST_LOG=trace MINIMAL_LOG_FORMAT=true ./hoonc crates/jockt/hoon/main.hoon crates/jockt/hoon; \
+	mv out.jam assets/jockt.jam; \
+	exit 0
+
+.PHONY: jockc
+jockc: $(HOON_TARGETS) ## Compile the Jock compiler
+	@set -e; \
+	RUST_LOG=trace MINIMAL_LOG_FORMAT=true ./hoonc crates/jockc/hoon/main.hoon crates/jockc/hoon; \
+	mv out.jam assets/jockc.jam; \
+	cargo build $(PROFILE_RELEASE); \
+	exit 0
+
+.PHONY: jockt
+jockt: $(HOON_TARGETS) ## Compile the Jock tester
+	@set -e; \
+	RUST_LOG=trace MINIMAL_LOG_FORMAT=true ./hoonc crates/jockt/hoon/main.hoon crates/jockt/hoon; \
+	mv out.jam assets/jockt.jam; \
+	cargo build $(PROFILE_RELEASE); \
+	exit 0