Skip to content

Commit 9c2d194

Browse files
committed
Rename add-debugger to native-simulator
1 parent 4211ee1 commit 9c2d194

File tree

10 files changed

+15
-8
lines changed

10 files changed

+15
-8
lines changed

cargo-generate.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ sub_templates = [
77
"contract",
88
"atomics-contract",
99
"stack-reorder-contract",
10-
"add-debugger",
10+
"native-simulator",
1111
# Dependency crate templates
1212
"c-wrapper-crate",
1313
"x64-simulator-crate",
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

workspace/Cargo.toml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,11 @@ overflow-checks = true
1313
strip = true
1414
codegen-units = 1
1515

16+
[profile.ckb-debug]
17+
inherits = "release"
18+
strip = false
19+
debug = true
20+
1621
# TODO: Will be deleted after release
1722
[replace]
1823
"ckb-std:0.15.3" = { git = "https://github.com/nervosnetwork/ckb-std.git", branch = "master" }

workspace/Makefile

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,9 @@ build-simulator: build
5353
@set -eu; \
5454
if [ "x$(CONTRACT)" = "x" ]; then \
5555
for contract in $(wildcard contracts/*); do \
56-
$(MAKE) -e -C $$contract build-simulator; \
56+
if [ -d "$$contract/`basename $$contract`-dbg" ]; then \
57+
$(MAKE) -e -C $$contract build-simulator; \
58+
fi; \
5759
done; \
5860
else \
5961
$(MAKE) -e -C contracts/$(CONTRACT) build-simulator; \
@@ -121,7 +123,7 @@ generate:
121123
mv Cargo.toml.new Cargo.toml; \
122124
if [ "$(ALSO_ADD_DEBUGGER)" = "true" ] && [ "$(TEMPLATE)" = "contract" ]; then \
123125
echo "Generate native simulator debugger"; \
124-
scripts/add-debugger $${GENERATED_DIR#$(DESTINATION)/} $(TEMPLATE_TYPE) $(TEMPLATE_REPO); \
126+
scripts/generate-native-simulator $${GENERATED_DIR#$(DESTINATION)/} $(TEMPLATE_TYPE) $(TEMPLATE_REPO); \
125127
fi; \
126128
else \
127129
cargo generate $(TEMPLATE_TYPE) $(TEMPLATE_REPO) $(TEMPLATE) \
@@ -135,16 +137,16 @@ generate:
135137
mv Cargo.toml.new Cargo.toml; \
136138
if [ "$(ALSO_ADD_DEBUGGER)" = "true" ] && [ "$(TEMPLATE)" = "contract" ]; then \
137139
echo "Generate native simulator debugger"; \
138-
scripts/add-debugger $(CRATE) $(TEMPLATE_TYPE) $(TEMPLATE_REPO); \
140+
scripts/generate-native-simulator $(CRATE) $(TEMPLATE_TYPE) $(TEMPLATE_REPO); \
139141
fi; \
140142
fi;
141143

142-
add-debugger:
144+
generate-native-simulator:
143145
@set -eu; \
144146
if [ "x$(CRATE)" = "x" ]; then \
145-
scripts/add-debugger _ $(TEMPLATE_TYPE) $(TEMPLATE_REPO); \
147+
scripts/generate-native-simulator _ $(TEMPLATE_TYPE) $(TEMPLATE_REPO); \
146148
else \
147-
scripts/add-debugger $(CRATE) $(TEMPLATE_TYPE) $(TEMPLATE_REPO); \
149+
scripts/generate-native-simulator $(CRATE) $(TEMPLATE_TYPE) $(TEMPLATE_REPO); \
148150
fi
149151

150152
prepare:

workspace/scripts/add-debugger renamed to workspace/scripts/generate-native-simulator

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ fi
5050

5151
CONTRACT_CRATE=$(echo "$CONTRACT_NAME" | tr '-' '_')
5252

53-
cargo generate $2 $3 add-debugger -n $CONTRACT_NAME-dbg --destination contracts/$CONTRACT_NAME -d contract_name=$CONTRACT_NAME -d contract_crate_name=$CONTRACT_CRATE
53+
cargo generate $2 $3 native-simulator -n $CONTRACT_NAME-dbg --destination contracts/$CONTRACT_NAME -d contract_name=$CONTRACT_NAME -d contract_crate_name=$CONTRACT_CRATE
5454
cd contracts/$CONTRACT_NAME
5555
mv $CONTRACT_NAME-dbg/src/contract-lib.rs src/lib.rs
5656
echo "Finally, you need to add a feature to the contract's Cargo.toml:"

0 commit comments

Comments
 (0)