Preserve most of the directory structure

.github/workflows/develop-clang.yml → .github/workflows/develop.yml

@@ -14,7 +14,7 @@ jobs:
     - name: Deps
       run: |
         rustup target add riscv64imac-unknown-none-elf
-        wget https://apt.llvm.org/llvm.sh && chmod +x llvm.sh && sudo ./llvm.sh 16 && rm llvm.sh
+        wget https://apt.llvm.org/llvm.sh && chmod +x llvm.sh && sudo ./llvm.sh 18 && rm llvm.sh
     - name: Test
       run: |
-        cargo build --verbose --target=riscv64imac-unknown-none-elf --features=build-with-clang
+        cargo build --target=riscv64imac-unknown-none-elf --features=build-with-clang

.github/workflows/release.yml

@@ -17,6 +17,7 @@ jobs:
       - name: Deps
         run: |
           rustup target add riscv64imac-unknown-none-elf
+          wget https://apt.llvm.org/llvm.sh && chmod +x llvm.sh && sudo ./llvm.sh 18 && rm llvm.sh
       - name: Push
         run: |
           cargo login ${{ secrets.CARGO_REGISTRY_TOKEN }}

Cargo.toml

@@ -31,11 +31,11 @@ log = ["dep:log", "dummy-atomic"]
 cc = "1.0"
 
 [dependencies]
-ckb-types = { package = "ckb-gen-types", version = "0.116", default-features = false, optional = true }
-buddy-alloc = { version = "0.5.0", optional = true }
-ckb-x64-simulator = { version = "0.9.1", optional = true }
-gcd = "2.3.0"
-log = { version = "0.4.21", optional = true, default-features = false }
+ckb-types = { package = "ckb-gen-types", version = "0.118", default-features = false, optional = true }
+buddy-alloc = { version = "0.5", optional = true }
+ckb-x64-simulator = { version = "0.9", optional = true }
+gcd = "2.3"
+log = { version = "0.4", optional = true, default-features = false }
 
 [workspace]
 exclude = ["test"]

Makefile

@@ -4,12 +4,12 @@ CC := riscv64-unknown-elf-gcc
 default: integration
 
 publish-crate:
-	cross publish -p ckb-std
+	cargo publish -p ckb-std
 
 publish: publish-crate
 
 clean:
-	cross clean && make -C test clean
+	cargo clean && make -C test clean
 
 test-shared-lib:
 	make -C test/shared-lib all-via-docker
@@ -20,6 +20,6 @@ test:
 	make -C test test
 
 check:
-	cross check --target ${TARGET} --examples
+	cargo check --target ${TARGET} --examples
 
 .PHONY: test check

build.rs

@@ -48,7 +48,7 @@ fn setup_compiler_flags(build: &mut cc::Build) {
 
     let clang = match std::env::var_os("CLANG") {
         Some(val) => val,
-        None => "clang-16".into(),
+        None => "clang-18".into(),
     };
 
     if cfg!(feature = "build-with-clang") {

contracts/ckb-std-tests/Cargo.toml

@@ -6,7 +6,7 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-ckb-std = { path = "../../", features = [ "dlopen-c", "dummy-atomic", "log"] }
+ckb-std = { path = "../../", features = ["build-with-clang", "dlopen-c", "dummy-atomic", "log"] }
 blake2b-ref = { version = "0.3", default-features = false }
-bytes = { version = "1.6.0", default-features = false }
-log = { version = "0.4.17", default-features = false }
+bytes = { version = "1.7", default-features = false }
+log = { version = "0.4", default-features = false }

contracts/exec-callee/Cargo.toml

@@ -9,4 +9,4 @@ edition = "2018"
 native-simulator = ["ckb-std/native-simulator"]
 
 [dependencies]
-ckb-std = { path = "../../" }
+ckb-std = { path = "../../", features=["build-with-clang"] }

contracts/exec-callee/exec-callee-dbg/Cargo.toml

@@ -6,9 +6,9 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 [dependencies]
 exec-callee = { path = "../", features = ["native-simulator"] }
-ckb-std = { path = "../../../", features = ["native-simulator"] }
+ckb-std = { path = "../../../", features = ["build-with-clang", "native-simulator"] }
 
 [lib]
 crate-type = ["cdylib"]
 
-[workspace]
+[workspace]

contracts/exec-caller-by-code-hash/Cargo.toml

@@ -6,4 +6,4 @@ edition = "2018"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-ckb-std = { path = "../../" }
+ckb-std = { path = "../../", features=["build-with-clang", "dummy-atomic"] }

contracts/exec-caller/Cargo.toml

@@ -6,4 +6,4 @@ edition = "2018"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-ckb-std = { path = "../../" }
+ckb-std = { path = "../../", features=["build-with-clang", "dummy-atomic"] }

contracts/spawn-callee/Cargo.toml

@@ -6,4 +6,4 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-ckb-std = { path = "../../" }
+ckb-std = { path = "../../", features=["build-with-clang", "dummy-atomic"] }

contracts/spawn-caller-by-code-hash/Cargo.toml

@@ -6,4 +6,4 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-ckb-std = { path = "../../" }
+ckb-std = { path = "../../", features=["build-with-clang", "dummy-atomic"] }

contracts/spawn-caller/Cargo.toml

@@ -6,4 +6,4 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-ckb-std = { path = "../../" }
+ckb-std = { path = "../../", features=["build-with-clang", "dummy-atomic"] }

test/Makefile

@@ -6,8 +6,7 @@ test: build
 
 build:
 	make -C shared-lib all-via-docker
-	cd .. && capsule build
-	cd .. && RUSTFLAGS="-C target-feature=-a" capsule build -n ckb-std-tests
+	cd ../contracts && RUSTFLAGS="-C target-feature=-a" cargo build --target riscv64imac-unknown-none-elf
 
 clean:
 	rm -rf ../build