Python fixes on windows.

tychedelia · Nov 3, 2023 · fe7a1ba · fe7a1ba
1 parent b429c88
commit fe7a1ba
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 19 deletions.
diff --git a/td-rs-xtask/msvc/chop/RustCHOP.vcxproj b/td-rs-xtask/msvc/chop/RustCHOP.vcxproj
@@ -61,7 +61,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;$(PreprocessorDefinitions);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>
@@ -81,7 +81,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;CPLUSPLUSCHOPEXAMPLE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;$(PreprocessorDefinitions);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <PrecompiledHeader>
       </PrecompiledHeader>

diff --git a/td-rs-xtask/msvc/dat/RustDAT.vcxproj b/td-rs-xtask/msvc/dat/RustDAT.vcxproj
@@ -61,7 +61,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;$(PreprocessorDefinitions);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>
@@ -81,7 +81,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;CPLUSPLUSDATEXAMPLE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;$(PreprocessorDefinitions);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <PrecompiledHeader>
       </PrecompiledHeader>

diff --git a/td-rs-xtask/msvc/sop/RustSOP.vcxproj b/td-rs-xtask/msvc/sop/RustSOP.vcxproj
@@ -61,7 +61,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;$(PreprocessorDefinitions);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>
@@ -81,7 +81,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;CPLUSPLUSSOPEXAMPLE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;$(PreprocessorDefinitions);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <PrecompiledHeader>
       </PrecompiledHeader>

diff --git a/td-rs-xtask/msvc/top/RustTOP.vcxproj b/td-rs-xtask/msvc/top/RustTOP.vcxproj
@@ -61,7 +61,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;$(PreprocessorDefinitions);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>
@@ -81,7 +81,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;CPLUSPLUSTOPEXAMPLE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;$(PreprocessorDefinitions);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <PrecompiledHeader>
       </PrecompiledHeader>

diff --git a/td-rs-xtask/src/macos/mod.rs b/td-rs-xtask/src/macos/mod.rs
@@ -1,3 +1,4 @@
+use std::fs::metadata;
 use crate::config::Config;
 use crate::metadata::PluginType;
 use crate::{build, PLUGIN_HOME};
@@ -43,7 +44,7 @@ pub(crate) fn build_plugin(
         &["--release", &format!("--target={target}")],
     )?;
 
-    let is_python_enabled = is_python_enabled(plugin, &plugin_type);
+    let is_python_enabled = crate::metadata::is_python_enabled(plugin, &plugin_type);
     let plugin = &plugin.replace('-', "_");
     let path = pbxproj_path(plugin);
 
@@ -56,14 +57,6 @@ pub(crate) fn build_plugin(
     Ok(())
 }
 
-fn is_python_enabled(plugin: &str, plugin_type: &PluginType) -> bool {
-    let pkg = crate::metadata::fetch_cargo_workspace_package(plugin).unwrap();
-    let parent_dep = pkg.dependencies.iter()
-        .find(|dep| dep.name == plugin_type.to_plugin_name())
-        .expect("Could not find plugin dependency");
-    parent_dep.features.iter().find(|feature| feature == &"python").is_some()
-}
-
 fn move_plugin(plugin: &str, path: &PathBuf) -> anyhow::Result<()> {
     fs_extra::dir::remove(path.parent().unwrap())
         .context("Could not remove xcode project directory")?;

diff --git a/td-rs-xtask/src/metadata.rs b/td-rs-xtask/src/metadata.rs
@@ -105,3 +105,11 @@ pub(crate) fn list_plugins() -> anyhow::Result<Vec<String>> {
         .collect::<Vec<String>>();
     Ok(ws_members)
 }
+
+pub fn is_python_enabled(plugin: &str, plugin_type: &PluginType) -> bool {
+    let pkg = crate::metadata::fetch_cargo_workspace_package(plugin).unwrap();
+    let parent_dep = pkg.dependencies.iter()
+        .find(|dep| dep.name == plugin_type.to_plugin_name())
+        .expect("Could not find plugin dependency");
+    parent_dep.features.iter().find(|feature| feature == &"python").is_some()
+}
diff --git a/td-rs-xtask/src/windows/mod.rs b/td-rs-xtask/src/windows/mod.rs
@@ -52,7 +52,8 @@ pub(crate) fn build_plugin(
 
     println!("Run msbuild");
     fs_extra::copy_items(&to_copy, ".", &CopyOptions::new().overwrite(true))?;
-    run_msbuild(config, &target, &plugin)?;
+    let is_python_enabled = crate::metadata::is_python_enabled(plugin, &plugin_type);
+    run_msbuild(config, &target, &plugin, is_python_enabled)?;
     fs_extra::remove_items(&files)?;
 
     println!("Move plugin to target");
@@ -85,7 +86,7 @@ fn plugin_target_path(plugin: &str) -> PathBuf {
     plugin_target_path
 }
 
-fn run_msbuild(config: &Config, target: &str, plugin: &str) -> anyhow::Result<()> {
+fn run_msbuild(config: &Config, target: &str, plugin: &str, is_python_enabled: bool) -> anyhow::Result<()> {
     let msbuild = find_msbuild()?;
     let msbuild = msbuild.to_str().expect("Could not find msbuild");
     let lib = format!("{}.lib", plugin.replace("-", "_"));
@@ -94,6 +95,7 @@ fn run_msbuild(config: &Config, target: &str, plugin: &str) -> anyhow::Result<()
     let mut cmd = Command::new(msbuild)
         .arg(format!("/p:AdditionalIncludeDirectories={py_include}"))
         .arg(format!("/p:AdditionalLibraryDirectories={py_lib}"))
+        .arg(if is_python_enabled {"/p:PreprocessorDefinitions=PYTHON_ENABLED"} else {""})
         .arg("/p:Configuration=Release")
         .arg("/t:Rebuild")
         .arg("/p:Platform=x64")