refactor: Remove patch operation; Remove unnecessary source code copy to simplify build process

Author: Icemic

libquickjs-sys/build.rs

@@ -4,64 +4,16 @@ use std::env;
 
 fn main() {
     let embed_path = PathBuf::from(env::var("CARGO_MANIFEST_DIR").unwrap()).join("embed");
-    let out_path = PathBuf::from(env::var("OUT_DIR").unwrap());
 
     println!("cargo:rustc-env=VSLANG=1033");
     println!("cargo:rerun-if-changed=embed");
     println!("cargo:rerun-if-changed=build.rs");
 
-    let code_dir = out_path.join("quickjs");
-    if code_dir.exists() {
-        std::fs::remove_dir_all(&code_dir).unwrap();
-    }
-    copy_dir::copy_dir(embed_path.join("quickjs"), &code_dir)
-        .expect("Could not copy quickjs directory");
-
-    std::fs::copy(
-        embed_path.join("extensions.c"),
-        code_dir.join("extensions.c"),
-    )
-    .expect("Could not copy extensions.c");
-
-    std::fs::copy(
-        embed_path.join("extensions.h"),
-        code_dir.join("extensions.h"),
-    )
-    .expect("Could not copy extensions.h");
-
-    eprintln!("Applying patches...");
-    apply_patches(&code_dir);
-
     eprintln!("Generating bindings...");
     do_bindgen();
 
     eprintln!("Compiling quickjs...");
-    compile_lib(&code_dir);
-}
-
-fn apply_patches(code_dir: &PathBuf) {
-    use std::fs;
-
-    eprintln!("Applying patches...");
-    let embed_path = PathBuf::from(env::var("CARGO_MANIFEST_DIR").unwrap()).join("embed");
-    let patches_path = embed_path.join("patches");
-    for patch in fs::read_dir(patches_path).expect("Could not open patches directory") {
-        let patch = patch.expect("Could not open patch");
-        eprintln!("Applying {:?}...", patch.file_name());
-        let status = std::process::Command::new("patch")
-            .current_dir(code_dir)
-            .arg("-i")
-            .arg(patch.path())
-            .arg("--binary")
-            .spawn()
-            .expect("Could not apply patches")
-            .wait()
-            .expect("Could not apply patches");
-        assert!(
-            status.success(),
-            "Patch command returned non-zero exit code"
-        );
-    }
+    compile_lib(&embed_path);
 }
 
 fn compile_lib(code_dir: &Path) {
@@ -77,10 +29,10 @@ fn compile_lib(code_dir: &Path) {
             [
                 // extensions.c has included quickjs.c
                 "extensions.c",
-                "cutils.c",
-                "libbf.c",
-                "libregexp.c",
-                "libunicode.c",
+                "./quickjs/cutils.c",
+                "./quickjs/libbf.c",
+                "./quickjs/libregexp.c",
+                "./quickjs/libunicode.c",
             ]
             .iter()
             .map(|f| code_dir.join(f)),

libquickjs-sys/embed/extensions.c

@@ -1,5 +1,5 @@
 #include "extensions.h"
-#include "quickjs.c"
+#include "./quickjs/quickjs.c"
 
 // These are static inline functions in quickjs.h so bindgen does not pick
 // them up.

libquickjs-sys/embed/extensions.h

@@ -4,7 +4,7 @@
 #define WIN32_LEAN_AND_MEAN
 #define _WIN32_WINNT 0x0602
 
-#include "quickjs.h"
+#include "./quickjs/quickjs.h"
 
 #ifndef RUSTY_EXTENSION_H
 #define RUSTY_EXTENSION_H