Skip to content
Merged
Changes from 1 commit
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
2f29737
WIP extract build crate
ascjones Oct 17, 2022
16017f7
WIP extract build crate
ascjones Oct 17, 2022
82d7da0
build crate builds
ascjones Oct 17, 2022
47d0267
Put new template back, move generate-metadata template
ascjones Oct 17, 2022
5f4deac
WIP fixing up errors in exe project
ascjones Oct 17, 2022
478f298
Remove original build tests to build crate
ascjones Oct 18, 2022
1c20a5b
WIP move template to own crate
ascjones Oct 18, 2022
7bb9a98
Merge branch 'master' into aj/build-lib
ascjones Nov 28, 2022
80da3e2
Cargo.lock
ascjones Nov 28, 2022
ff2d087
Fix up after merge, continue with build lib separation
ascjones Nov 28, 2022
6d4c452
Continue extraction of `contract-template` crate
ascjones Nov 28, 2022
7571c51
Complete move of new impl to its own crate
ascjones Nov 28, 2022
4c309a5
Restore BuildSteps delete test-utils crate
ascjones Nov 28, 2022
cf87f72
Add missing wabt dependency
ascjones Nov 28, 2022
e9fe924
Get contract-build lib compiling
ascjones Nov 28, 2022
d54fe36
Fmt
ascjones Nov 28, 2022
197fcc9
Rename new from template method
ascjones Nov 28, 2022
6849dbc
Import contract-build crate into cargo-contract
ascjones Nov 28, 2022
53670fa
Recombine templates crate back into build crate
ascjones Nov 28, 2022
3c109e1
Workspace check success
ascjones Nov 28, 2022
d65ec5a
Fix some warnings
ascjones Nov 28, 2022
eceb586
Fix more warnings
ascjones Nov 28, 2022
1cf07d1
Fix remaining warnings
ascjones Nov 28, 2022
f9793f4
Merge branch 'master' into aj/build-lib
ascjones Nov 28, 2022
bb0f314
Move test tracing subscriber init to where it is used
ascjones Nov 29, 2022
d910ba8
Fix final errors with sharing test code
ascjones Nov 29, 2022
43eff59
Fmt
ascjones Nov 29, 2022
d45b62a
Add README and license
ascjones Nov 29, 2022
070190a
Sync serde dependencies
ascjones Nov 29, 2022
046c775
Relax serde requirement on crates
ascjones Nov 29, 2022
e634859
Merge branch 'master' into aj/build-lib
ascjones Nov 30, 2022
939a23d
Restore skip_wasm_validation step
ascjones Nov 30, 2022
5212504
Fmt
ascjones Nov 30, 2022
d009829
Add missing which dependency for windows
ascjones Nov 30, 2022
578524e
Add README to module docs, runs code example as doc test
ascjones Dec 1, 2022
1791ef2
Fmt
ascjones Dec 1, 2022
7528dc4
Renamed transcode dependency for consistency
ascjones Dec 1, 2022
70d41ec
Fmt
ascjones Dec 1, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Restore skip_wasm_validation step
  • Loading branch information
ascjones committed Nov 30, 2022
commit 939a23d81b6663a81fafb17277901929ad9ffb9e
6 changes: 5 additions & 1 deletion crates/cargo-contract/src/cmd/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -101,10 +101,12 @@ pub struct BuildCommand {
/// This is useful if one wants to analyze or debug the optimized binary.
#[clap(long)]
keep_debug_symbols: bool,

/// Export the build output in JSON format.
#[clap(long, conflicts_with = "verbose")]
output_json: bool,
/// Don't perform wasm validation checks e.g. for permitted imports.
#[clap(long)]
skip_wasm_validation: bool,
}

impl BuildCommand {
Expand Down Expand Up @@ -145,6 +147,7 @@ impl BuildCommand {
keep_debug_symbols: self.keep_debug_symbols,
lint: self.lint,
output_type,
skip_wasm_validation: self.skip_wasm_validation
};

contract_build::execute(args)
Expand Down Expand Up @@ -181,6 +184,7 @@ impl CheckCommand {
keep_debug_symbols: false,
lint: false,
output_type: OutputType::default(),
skip_wasm_validation: false,
};

contract_build::execute(args)
Expand Down