Add missing venv/

Author: jayvdb

pyoxidizer/src/distutils/_msvccompiler.py …hon_lib_hacks/distutils/_msvccompiler.pypyoxidizer/src/distutils/_msvccompiler.py renamed to pyoxidizer/src/cpython_lib_hacks/distutils/_msvccompiler.py pyoxidizer/src/distutils/_msvccompiler.py renamed to pyoxidizer/src/cpython_lib_hacks/distutils/_msvccompiler.py

@@ -0,0 +1,10 @@
+import sys
+from . import main
+
+rc = 1
+try:
+    main()
+    rc = 0
+except Exception as e:
+    print('Error: %s' % e, file=sys.stderr)
+sys.exit(rc)

…izer/src/distutils/_msvccompiler.py.orig …ib_hacks/distutils/_msvccompiler.py.origpyoxidizer/src/distutils/_msvccompiler.py.orig renamed to pyoxidizer/src/cpython_lib_hacks/distutils/_msvccompiler.py.orig pyoxidizer/src/distutils/_msvccompiler.py.orig renamed to pyoxidizer/src/cpython_lib_hacks/distutils/_msvccompiler.py.orig

@@ -4,7 +4,7 @@
 
 use lazy_static::lazy_static;
 use serde::Deserialize;
-use slog::warn;
+use slog::{info, warn};
 use std::collections::BTreeMap;
 use std::fs::{read_dir, read_to_string};
 use std::path::{Path, PathBuf};
@@ -20,16 +20,24 @@ lazy_static! {
         let mut res: BTreeMap<&'static str, &'static [u8]> = BTreeMap::new();
 
         res.insert(
-            "command/build_ext.py",
-            include_bytes!("../distutils/command/build_ext.py"),
+            "distutils/command/build_ext.py",
+            include_bytes!("../cpython_lib_hacks/distutils/command/build_ext.py"),
         );
         res.insert(
-            "_msvccompiler.py",
-            include_bytes!("../distutils/_msvccompiler.py"),
+            "distutils/_msvccompiler.py",
+            include_bytes!("../cpython_lib_hacks/distutils/_msvccompiler.py"),
         );
         res.insert(
-            "unixccompiler.py",
-            include_bytes!("../distutils/unixccompiler.py"),
+            "distutils/unixccompiler.py",
+            include_bytes!("../cpython_lib_hacks/distutils/unixccompiler.py"),
+        );
+        res.insert(
+            "venv/__init__.py",
+            include_bytes!("../cpython_lib_hacks/venv/__init__.py"),
+        );
+        res.insert(
+            "venv/__main__.py",
+            include_bytes!("../cpython_lib_hacks/venv/__main__.py"),
         );
 
         res
@@ -56,27 +64,32 @@ pub fn prepare_hacked_distutils(logger: &slog::Logger, target: &PythonPaths) {
         target.stdlib.display()
     );
 
-    let dest_distutils_path = target.stdlib.join("distutils");
+    let dest_stdlib_path = target.stdlib.clone();
 
     // The venv "pyvenv.cfg" is used as a proxy for the first hack
     let src_metadata = fs::metadata(&target.prefix.join(".timestamp")).unwrap();
 
     let src_mtime = FileTime::from_last_modification_time(&src_metadata);
 
     for (path, data) in MODIFIED_DISTUTILS_FILES.iter() {
-        let mut dest_path = dest_distutils_path.clone();
+        let mut dest_path = dest_stdlib_path.clone();
         dest_path.extend(path.split("/"));
-
-        let dest_metadata = fs::metadata(dest_path.canonicalize().unwrap()).unwrap();
-
-        let dest_mtime = FileTime::from_last_modification_time(&dest_metadata);
-
-        if src_mtime < dest_mtime {
-            warn!(logger, "not overwriting newer distutils/{}", path);
-            continue;
+        info!(logger, "checking {}", path);
+        if dest_path.exists() {
+            let dest_metadata = fs::metadata(dest_path.canonicalize().unwrap()).unwrap();
+
+            let dest_mtime = FileTime::from_last_modification_time(&dest_metadata);
+
+            if src_mtime < dest_mtime {
+                warn!(logger, "not overwriting newer {}", path);
+                continue;
+            }
+            warn!(logger, "modifying {} for oxidation", path);
+        } else {
+            let dest_dir = dest_path.parent().unwrap();
+            std::fs::create_dir_all(&dest_dir).unwrap();
+            warn!(logger, "installing missing {} for oxidation", path);
         }
-
-        warn!(logger, "modifying distutils/{} for oxidation", path);
         std::fs::write(dest_path, data).unwrap();
     }
 }