Move //libdeno to //core/libdeno (#2015)

Fixes some sed errors introduced in c43cfe.

Unfortunately moving libdeno required splitting build.rs into two parts,
one for cli and one for core.

I've also removed the arm64 build - it's complicating things at this
re-org and we're not even testing it. I need to swing back to it and get
tools/test.py running for it.

1 files changed, 12 insertions, 8 deletions

diff --git a/cli/startup_data.rs b/cli/startup_data.rs
index 6e636e579..747e8b11d 100644
--- a/cli/startup_data.rs
+++ b/cli/startup_data.rs
@@ -7,19 +7,19 @@ pub fn deno_isolate_init() -> StartupData {
     debug!("Deno isolate init without snapshots.");
     #[cfg(not(feature = "check-only"))]
     let source_bytes =
-      include_bytes!(concat!(env!("GN_OUT_DIR"), "/gen/bundle/main.js"));
+      include_bytes!(concat!(env!("GN_OUT_DIR"), "/gen/cli/bundle/main.js"));
     #[cfg(feature = "check-only")]
     let source_bytes = vec![];
 
     StartupData::Script(Script {
-      filename: "gen/bundle/main.js".to_string(),
+      filename: "gen/cli/bundle/main.js".to_string(),
       source: std::str::from_utf8(&source_bytes[..]).unwrap().to_string(),
     })
   } else {
     debug!("Deno isolate init with snapshots.");
     #[cfg(not(any(feature = "check-only", feature = "no-snapshot-init")))]
     let data =
-      include_bytes!(concat!(env!("GN_OUT_DIR"), "/gen/snapshot_deno.bin"));
+      include_bytes!(concat!(env!("GN_OUT_DIR"), "/gen/cli/snapshot_deno.bin"));
     #[cfg(any(feature = "check-only", feature = "no-snapshot-init"))]
     let data = vec![];
 
@@ -33,20 +33,24 @@ pub fn compiler_isolate_init() -> StartupData {
   if cfg!(feature = "no-snapshot-init") {
     debug!("Deno isolate init without snapshots.");
     #[cfg(not(feature = "check-only"))]
-    let source_bytes =
-      include_bytes!(concat!(env!("GN_OUT_DIR"), "/gen/bundle/compiler.js"));
+    let source_bytes = include_bytes!(concat!(
+      env!("GN_OUT_DIR"),
+      "/gen/cli/bundle/compiler.js"
+    ));
     #[cfg(feature = "check-only")]
     let source_bytes = vec![];
 
     StartupData::Script(Script {
-      filename: "gen/bundle/compiler.js".to_string(),
+      filename: "gen/cli/bundle/compiler.js".to_string(),
       source: std::str::from_utf8(&source_bytes[..]).unwrap().to_string(),
     })
   } else {
     debug!("Deno isolate init with snapshots.");
     #[cfg(not(any(feature = "check-only", feature = "no-snapshot-init")))]
-    let data =
-      include_bytes!(concat!(env!("GN_OUT_DIR"), "/gen/snapshot_compiler.bin"));
+    let data = include_bytes!(concat!(
+      env!("GN_OUT_DIR"),
+      "/gen/cli/snapshot_compiler.bin"
+    ));
     #[cfg(any(feature = "check-only", feature = "no-snapshot-init"))]
     let data = vec![];