foster/denoland-deno
1
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2025-01-22 06:09:25 -05:00
Code Issues Packages 1 Wiki Activity

refactor(runtime): reorganize build script for snapshot (#17760)

Browse source 
This commit reorganizes "runtime/build.rs" to properly create an
extension and conditionally include "99_main.js" in the snapshot.
This commit is contained in:
Bartek Iwańczuk 2023-02-13 15:34:32 +01:00 • committed by GitHub
parent 8b5be962f5
commit f80a1fa7e9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 74 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
cli/build.rs
View file

@ -351,8 +351,13 @@ fn create_cli_snapshot(snapshot_path: PathBuf) {
specifier: "runtime/js/99_main.js".to_string(), specifier: "runtime/js/99_main.js".to_string(),
code: deno_runtime::js::SOURCE_CODE_FOR_99_MAIN_JS, code: deno_runtime::js::SOURCE_CODE_FOR_99_MAIN_JS,
}); });
let extensions_with_js = let extensions_with_js = vec![Extension::builder("cli")
vec![Extension::builder("cli").esm(esm_files).build()]; // FIXME(bartlomieju): information about which extensions were
// already snapshotted is not preserved in the snapshot. This should be
// fixed, so we can reliably depend on that information.
// .dependencies(vec!["runtime"])
.esm(esm_files)
.build()];
create_snapshot(CreateSnapshotOptions { create_snapshot(CreateSnapshotOptions {
cargo_manifest_dir: env!("CARGO_MANIFEST_DIR"), cargo_manifest_dir: env!("CARGO_MANIFEST_DIR"),

103
runtime/build.rs
View file

@ -155,9 +155,58 @@ mod not_docs {
fn create_runtime_snapshot( fn create_runtime_snapshot(
snapshot_path: PathBuf, snapshot_path: PathBuf,
additional_extension: Extension, maybe_additional_extension: Option<Extension>,
) { ) {
let extensions_with_js: Vec<Extension> = vec![ let runtime_extension = Extension::builder("runtime")
.dependencies(vec![
"deno_webidl",
"deno_console",
"deno_url",
"deno_tls",
"deno_web",
"deno_fetch",
"deno_cache",
"deno_websocket",
"deno_webstorage",
"deno_crypto",
"deno_webgpu",
"deno_broadcast_channel",
"deno_node",
"deno_ffi",
"deno_net",
"deno_napi",
"deno_http",
"deno_flash",
])
.esm(include_js_files_dir!(
dir "js",
"01_build.js",
"01_errors.js",
"01_version.ts",
"06_util.js",
"10_permissions.js",
"11_workers.js",
"12_io.js",
"13_buffer.js",
"30_fs.js",
"30_os.js",
"40_diagnostics.js",
"40_files.js",
"40_fs_events.js",
"40_http.js",
"40_process.js",
"40_read_file.js",
"40_signals.js",
"40_spawn.js",
"40_tty.js",
"40_write_file.js",
"41_prompt.js",
"90_deno_ns.js",
"98_global_scope.js",
))
.build();
let mut extensions_with_js: Vec<Extension> = vec![
deno_webidl::init(), deno_webidl::init(),
deno_console::init(), deno_console::init(),
deno_url::init(), deno_url::init(),
@ -185,9 +234,13 @@ mod not_docs {
deno_napi::init::<Permissions>(false), deno_napi::init::<Permissions>(false),
deno_http::init(), deno_http::init(),
deno_flash::init::<Permissions>(false), // No --unstable deno_flash::init::<Permissions>(false), // No --unstable
additional_extension, runtime_extension,
]; ];
if let Some(additional_extension) = maybe_additional_extension {
extensions_with_js.push(additional_extension);
}
create_snapshot(CreateSnapshotOptions { create_snapshot(CreateSnapshotOptions {
cargo_manifest_dir: env!("CARGO_MANIFEST_DIR"), cargo_manifest_dir: env!("CARGO_MANIFEST_DIR"),
snapshot_path, snapshot_path,
@ -208,44 +261,22 @@ mod not_docs {
pub fn build_snapshot(runtime_snapshot_path: PathBuf) { pub fn build_snapshot(runtime_snapshot_path: PathBuf) {
#[allow(unused_mut, unused_assignments)] #[allow(unused_mut, unused_assignments)]
let mut esm_files = include_js_files_dir!( let mut maybe_additional_extension = None;
dir "js",
"01_build.js",
"01_errors.js",
"01_version.ts",
"06_util.js",
"10_permissions.js",
"11_workers.js",
"12_io.js",
"13_buffer.js",
"30_fs.js",
"30_os.js",
"40_diagnostics.js",
"40_files.js",
"40_fs_events.js",
"40_http.js",
"40_process.js",
"40_read_file.js",
"40_signals.js",
"40_spawn.js",
"40_tty.js",
"40_write_file.js",
"41_prompt.js",
"90_deno_ns.js",
"98_global_scope.js",
);
#[cfg(not(feature = "snapshot_from_snapshot"))] #[cfg(not(feature = "snapshot_from_snapshot"))]
{ {
esm_files.push(ExtensionFileSource { maybe_additional_extension = Some(
specifier: "js/99_main.js".to_string(), Extension::builder("runtime_main")
code: include_str!("js/99_main.js"), .dependencies(vec!["runtime"])
}); .esm(vec![ExtensionFileSource {
specifier: "js/99_main.js".to_string(),
code: include_str!("js/99_main.js"),
}])
.build(),
);
} }
let additional_extension = create_runtime_snapshot(runtime_snapshot_path, maybe_additional_extension);
Extension::builder("runtime").esm(esm_files).build();
create_runtime_snapshot(runtime_snapshot_path, additional_extension);
} }
} }