Remove changes to sip_module_exe/sip_install_exe that are not needed …

…anymore.
ModOrganizer2 · Jun 15, 2024 · 50da6e0 · 50da6e0
1 parent 49857a2
commit 50da6e0
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 24 deletions.
diff --git a/src/tasks/pyqt.cpp b/src/tasks/pyqt.cpp
@@ -234,30 +234,29 @@ namespace mob::tasks {
             // here instead
             op::delete_directory(cx(), source_path() / "build", op::optional);
 
-            auto p = sip::sip_install_process()
-                         .arg("--confirm-license")
-                         .arg("--verbose", process::log_trace)
-                         .arg("--pep484-pyi")
-                         .arg("--link-full-dll")
-                         .arg("--build-dir", build_path())
-                         .cwd(source_path())
-                         .env(pyqt_env);
-
-            if (build_type() == config::debug) {
-                p.arg("--debug")
-                    // the distinfo generation currently fails with debug mode
-                    .arg("--no-distinfo");
-            }
-
             // build modules
-            run_tool(process_runner(p));
+            run_tool(process_runner(process()
+                                        .binary(sip::sip_install_exe())
+                                        .arg("--confirm-license")
+                                        .arg("--verbose", process::log_trace)
+                                        .arg("--pep484-pyi")
+                                        .arg("--link-full-dll")
+                                        .arg("--build-dir", build_path())
+                                        //			.arg("--enable",
+                                        //"pylupdate")  // these are not in modules so
+                                        // they .arg("--enable", "pyrcc")      // don't
+                                        // get copied below
+                                        // .args(zip(repeat("--enable"), modules()))
+                                        .cwd(source_path())
+                                        .env(pyqt_env)));
 
             // done, create the bypass file
             built_bypass.create();
         }
 
         // generate the PyQt6_sip-XX.tar.gz file
-        run_tool(process_runner(sip::sip_module_process()
+        run_tool(process_runner(process()
+                                    .binary(sip::sip_module_exe())
                                     .arg("--sdist")
                                     .arg(pyqt_sip_module_name())
                                     .cwd(conf().path().cache())

diff --git a/src/tasks/sip.cpp b/src/tasks/sip.cpp
@@ -62,14 +62,14 @@ namespace mob::tasks {
         return conf().path().build() / ("sip-" + version());
     }
 
-    process sip::sip_module_process()
+    fs::path sip::sip_module_exe()
     {
-        return process().binary(python::scripts_path() / "sip-module.exe");
+        return python::scripts_path() / "sip-module.exe";
     }
 
-    process sip::sip_install_process()
+    fs::path sip::sip_install_exe()
     {
-        return process().binary(python::scripts_path() / "sip-install.exe");
+        return python::scripts_path() / "sip-install.exe";
     }
 
     fs::path sip::module_source_path()
@@ -193,7 +193,8 @@ namespace mob::tasks {
     {
         // generate sip.h, will be copied to python's include directory, used
         // by plugin_python
-        run_tool(process_runner(sip_module_process()
+        run_tool(process_runner(process()
+                                    .binary(sip_module_exe())
                                     .chcp(65001)
                                     .stdout_encoding(encodings::acp)
                                     .stderr_encoding(encodings::acp)

diff --git a/src/tasks/tasks.h b/src/tasks/tasks.h
@@ -486,8 +486,8 @@ namespace mob::tasks {
         static bool prebuilt();
 
         static fs::path source_path();
-        static process sip_module_process();
-        static process sip_install_process();
+        static fs::path sip_module_exe();
+        static fs::path sip_install_exe();
         static fs::path module_source_path();
 
     protected: