Optimize the process of adding simulator

Author: joii2020

add-debugger/src/contract-lib.rs

@@ -1,6 +1,6 @@
 #![cfg_attr(not(feature = "simulator"), no_std)]
-
-// This file will be automatically placed in the contract file, and rename to lib.rs
-
-// #[cfg(feature = "simulator")]
-// pub mod entry;
+#![allow(special_module_name)]
+#[cfg(feature = "simulator")]
+mod main;
+#[cfg(feature = "simulator")]
+pub use main::program_entry;

add-debugger/src/lib.rs

@@ -1,11 +1 @@
-ckb_std::entry_simulator!(program_entry);
-
-/// program entry
-fn program_entry() -> i8 {
-    // Call main function and return error code
-    // match {{contract_crate_name}}::entry::main() {
-    //     Ok(_) => 0,
-    //     Err(err) => err as i8,
-    // }
-    0
-}
+ckb_std::entry_simulator!({{contract_crate_name}}::program_entry);

contract/Makefile

@@ -44,6 +44,9 @@ build:
 		done \
 	fi
 
+build-simulator:
+	cd {{project-name}}-dbg && cargo build $(MODE_ARGS) && cp target/$(MODE)/*_dbg.* $(TOP)/$(BUILD_DIR)
+
 # test, check, clippy and fmt here are provided for completeness,
 # there is nothing wrong invoking cargo directly instead of make.
 test:

contract/src/main.rs

@@ -1,14 +1,14 @@
-#![no_std]
-#![cfg_attr(not(test), no_main)]
+#![cfg_attr(not(feature = "simulator"), no_std)]
+#![cfg_attr(not(any(feature = "simulator", test)), no_main)]
 
 #[cfg(test)]
 extern crate alloc;
 
-#[cfg(not(test))]
+#[cfg(not(any(feature = "simulator", test)))]
 use ckb_std::default_alloc;
-#[cfg(not(test))]
+#[cfg(not(any(feature = "simulator", test)))]
 ckb_std::entry!(program_entry);
-#[cfg(not(test))]
+#[cfg(not(any(feature = "simulator", test)))]
 default_alloc!();
 
 pub fn program_entry() -> i8 {

workspace/Makefile

@@ -48,6 +48,17 @@ build:
 		$(MAKE) -e -C contracts/$(CONTRACT) build; \
 	fi
 
+build-simulator:
+	mkdir -p $(BUILD_DIR)
+	@set -eu; \
+	if [ "x$(CONTRACT)" = "x" ]; then \
+		for contract in $(wildcard contracts/*); do \
+			$(MAKE) -e -C $$contract build-simulator; \
+		done; \
+	else \
+		$(MAKE) -e -C contracts/$(CONTRACT) build-simulator; \
+	fi
+
 # Run a single make task for a specific contract. For example:
 #
 # make run CONTRACT=stack-reorder TASK=adjust_stack_size STACK_SIZE=0x200000
@@ -88,6 +99,7 @@ TEMPLATE_REPO := https://github.com/cryptape/ckb-script-templates
 CRATE :=
 TEMPLATE := contract
 DESTINATION := contracts
+ALSO_ADD_DEBUGGER := true
 generate:
 	@set -eu; \
 	if [ "x$(CRATE)" = "x" ]; then \