Fix pylib dependency for binary

youknowone · youknowone · commit 716d0db0e67c · 2022-09-05T10:39:58.000+09:00
diff --git a/pylib/src/lib.rs b/pylib/src/lib.rs
@@ -6,10 +6,10 @@
 // so build.rs sets this env var
 pub const LIB_PATH: &str = match option_env!("win_lib_path") {
     Some(s) => s,
-    None => concat!(env!("CARGO_MANIFEST_DIR"), "/../Lib"),
+    None => concat!(env!("CARGO_MANIFEST_DIR"), "/Lib"),
 };
 
 #[cfg(feature = "freeze-stdlib")]
 pub fn frozen_stdlib() -> impl Iterator<Item = (String, rustpython_compiler_core::FrozenModule)> {
-    rustpython_derive::py_freeze!(dir = "../Lib", crate_name = "rustpython_compiler_core")
+    rustpython_derive::py_freeze!(dir = "./Lib", crate_name = "rustpython_compiler_core")
 }
diff --git a/src/lib.rs b/src/lib.rs
@@ -43,6 +43,8 @@ extern crate env_logger;
 #[macro_use]
 extern crate log;
 
+use rustpython_pylib;
+
 mod shell;
 
 use clap::{App, AppSettings, Arg, ArgMatches};
@@ -249,6 +251,11 @@ fn add_stdlib(vm: &mut VirtualMachine) {
     #[cfg(feature = "stdlib")]
     vm.add_native_modules(rustpython_stdlib::get_module_inits());
 
+    let state = PyRc::get_mut(&mut vm.state).expect("vm.state must allow borrow mut");
+    let settings = &mut state.settings;
+    // add the current directory to sys.path
+    settings.path_list.push("".to_owned());
+
     // if we're on freeze-stdlib, the core stdlib modules will be included anyway
     #[cfg(feature = "freeze-stdlib")]
     vm.add_frozen(rustpython_pylib::frozen_stdlib());
@@ -257,25 +264,24 @@ fn add_stdlib(vm: &mut VirtualMachine) {
     {
         use rustpython_vm::common::rc::PyRc;
         let state = PyRc::get_mut(&mut vm.state).unwrap();
+        let settings = &mut state.settings;
 
         #[allow(clippy::needless_collect)] // false positive
-        let path_list: Vec<_> = state.settings.path_list.drain(..).collect();
+        let path_list: Vec<_> = settings.path_list.drain(..).collect();
 
         // BUILDTIME_RUSTPYTHONPATH should be set when distributing
         if let Some(paths) = option_env!("BUILDTIME_RUSTPYTHONPATH") {
-            state
-                .settings
+            settings
                 .path_list
                 .extend(split_paths(paths).map(|path| path.into_os_string().into_string().unwrap()))
         } else {
             #[cfg(feature = "rustpython-pylib")]
-            state
-                .settings
+            settings
                 .path_list
                 .push(rustpython_pylib::LIB_PATH.to_owned())
         }
 
-        state.settings.path_list.extend(path_list.into_iter());
+        settings.path_list.extend(path_list.into_iter());
     }
 }
 
diff --git a/wasm/lib/Cargo.toml b/wasm/lib/Cargo.toml
@@ -11,9 +11,8 @@ edition = "2021"
 crate-type = ["cdylib", "rlib"]
 
 [features]
-default = ["stdlib"]
-stdlib = ["freeze-stdlib", "rustpython-pylib", "rustpython-stdlib"]
-freeze-stdlib = ["rustpython-vm/freeze-stdlib", "rustpython-pylib?/freeze-stdlib"]
+default = ["freeze-stdlib"]
+freeze-stdlib = ["rustpython-vm/freeze-stdlib", "rustpython-pylib/freeze-stdlib", "rustpython-stdlib"]
 no-start-func = []
 
 [dependencies]
