Use pylib as a dependency of the rustpython binary in order to get a Lib path

Author: coolreader18

Cargo.lock

@@ -6,6 +6,7 @@ edition = "2018"
 description = "A python interpreter written in rust."
 repository = "https://github.com/RustPython/RustPython"
 license = "MIT"
+include = ["LICENSE", "Cargo.toml", "src/**/*.rs"]
 
 [workspace]
 members = [".", "derive", "vm", "wasm/lib", "parser", "compiler", "bytecode", "vm/pylib-crate", "common"]
@@ -15,7 +16,7 @@ name = "bench"
 path = "./benchmarks/bench.rs"
 
 [features]
-default = ["threading"]
+default = ["threading", "pylib"]
 flame-it = ["rustpython-vm/flame-it", "flame", "flamescope"]
 freeze-stdlib = ["rustpython-vm/freeze-stdlib"]
 threading = ["rustpython-vm/threading"]
@@ -29,6 +30,7 @@ clap = "2.33"
 rustpython-compiler = { path = "compiler", version = "0.1.1" }
 rustpython-parser = { path = "parser", version = "0.1.1" }
 rustpython-vm = { path = "vm", version = "0.1.1", default-features = false, features = ["compile-parse"] }
+pylib = { package = "rustpython-pylib", path = "vm/pylib-crate", version = "0.1.0", default-features = false, optional = true }
 dirs = { package = "dirs-next", version = "1.0" }
 num-traits = "0.2.8"
 cfg-if = "0.1"

Cargo.toml

@@ -198,14 +198,14 @@ fn create_settings(matches: &ArgMatches) -> PySettings {
     // add the current directory to sys.path
     settings.path_list.push("".to_owned());
 
+    // BUILDTIME_RUSTPYTHONPATH should be set when distributing
     if let Some(paths) = option_env!("BUILDTIME_RUSTPYTHONPATH") {
         settings.path_list.extend(
             std::env::split_paths(paths).map(|path| path.into_os_string().into_string().unwrap()),
         )
-    } else if option_env!("RUSTPYTHONPATH").is_none() {
-        settings
-            .path_list
-            .push(concat!(env!("CARGO_MANIFEST_DIR"), "/Lib").to_owned());
+    } else {
+        #[cfg(all(feature = "pylib", not(feature = "freeze-stdlib")))]
+        settings.path_list.push(pylib::LIB_PATH.to_owned());
     }
 
     if !ignore_environment {

src/main.rs

@@ -4,7 +4,10 @@ version = "0.1.0"
 authors = ["RustPython Team"]
 edition = "2018"
 
+[features]
+default = ["compiled-bytecode"]
+compiled-bytecode = ["rustpython-derive", "rustpython-bytecode"]
+
 [dependencies]
-rustpython-derive = { version = "0.1.2", path = "../../derive" }
-rustpython-bytecode = { version = "0.1.2", path = "../../bytecode" }
-maplit = "1.0"
+rustpython-derive = { version = "0.1.2", path = "../../derive", optional = true }
+rustpython-bytecode = { version = "0.1.2", path = "../../bytecode", optional = true }

vm/pylib-crate/Cargo.toml

@@ -4,25 +4,14 @@
 
 extern crate self as rustpython_pylib;
 
-use rustpython_bytecode::bytecode::{self, FrozenModule};
-use std::collections::HashMap;
-
-use rustpython_derive::py_compile_bytecode as _py_compile_bytecode;
-#[macro_export]
-macro_rules! py_compile_bytecode {
-    ($($arg:tt)*) => {{
-        #[macro_use]
-        mod __m {
-            $crate::_py_compile_bytecode!($($arg)*);
-        }
-        __proc_macro_call!()
-    }};
-}
-
-mod __exports {
-    pub use maplit::hashmap;
-}
+pub const LIB_PATH: &str = concat!(env!("CARGO_MANIFEST_DIR"), "/Lib");
 
+#[cfg(feature = "compiled-bytecode")]
+use {
+    rustpython_bytecode::bytecode::{self, FrozenModule},
+    std::collections::HashMap,
+};
+#[cfg(feature = "compiled-bytecode")]
 pub fn frozen_stdlib() -> HashMap<String, FrozenModule> {
-    py_compile_bytecode!(dir = "Lib", crate_name = "rustpython_pylib")
+    rustpython_derive::py_compile_bytecode!(dir = "Lib", crate_name = "rustpython_pylib")
 }