From b2391c7ae9adca12905db2e770cd0d501076e6bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ole=20Andr=C3=A9=20Vadla=20Ravn=C3=A5s?= <oleavr@gmail.com>
Date: Tue, 27 Sep 2022 11:59:44 +0200
Subject: [PATCH] Rename and simplify remaining MSVS project files

---
 frida-python-common.props                     | 43 -------------------
 frida-python3.vcxproj => frida-python.vcxproj | 40 ++++++++++++++++-
 ...oj.filters => frida-python.vcxproj.filters |  0
 3 files changed, 38 insertions(+), 45 deletions(-)
 delete mode 100644 frida-python-common.props
 rename frida-python3.vcxproj => frida-python.vcxproj (75%)
 rename frida-python3.vcxproj.filters => frida-python.vcxproj.filters (100%)

diff --git a/frida-python-common.props b/frida-python-common.props
deleted file mode 100644
index bac1a73..0000000
--- a/frida-python-common.props
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <ItemGroup>
-    <ClCompile Include="src\_frida.c" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <CustomBuild Include="frida\__init__.py">
-      <FileType>Document</FileType>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Installing frida package</Message>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Installing frida package</Message>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Installing frida package</Message>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Installing frida package</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">rmdir /S /Q $(OutDir)frida 2&gt;NUL
-mkdir $(OutDir)frida || exit 1
-copy /B /Y "$(ProjectDir)frida\*.py" $(OutDir)frida || exit 1
-echo. &gt; $(IntDir)frida-package.stamp</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)frida-package.stamp</Outputs>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)frida\core.py</AdditionalInputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">rmdir /S /Q $(OutDir)frida 2&gt;NUL
-mkdir $(OutDir)frida || exit 1
-copy /B /Y "$(ProjectDir)frida\*.py" $(OutDir)frida || exit 1
-echo. &gt; $(IntDir)frida-package.stamp</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)frida-package.stamp</Outputs>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)frida\core.py</AdditionalInputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">rmdir /S /Q $(OutDir)frida 2&gt;NUL
-mkdir $(OutDir)frida || exit 1
-copy /B /Y "$(ProjectDir)frida\*.py" $(OutDir)frida || exit 1
-echo. &gt; $(IntDir)frida-package.stamp</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)frida-package.stamp</Outputs>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectDir)frida\core.py</AdditionalInputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">rmdir /S /Q $(OutDir)frida 2&gt;NUL
-mkdir $(OutDir)frida || exit 1
-copy /B /Y "$(ProjectDir)frida\*.py" $(OutDir)frida || exit 1
-echo. &gt; $(IntDir)frida-package.stamp</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)frida-package.stamp</Outputs>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectDir)frida\core.py</AdditionalInputs>
-    </CustomBuild>
-    <None Include="frida\core.py" />
-  </ItemGroup>
-
-</Project>
diff --git a/frida-python3.vcxproj b/frida-python.vcxproj
similarity index 75%
rename from frida-python3.vcxproj
rename to frida-python.vcxproj
index 042298f..a12d550 100644
--- a/frida-python3.vcxproj
+++ b/frida-python.vcxproj
@@ -22,7 +22,7 @@
     <ProjectGuid>{7505F884-DD69-4F23-ADE6-1E0E049AB018}</ProjectGuid>
     <RootNamespace>frida</RootNamespace>
     <Keyword>Win32Proj</Keyword>
-    <ProjectName>frida-python3</ProjectName>
+    <ProjectName>frida-python</ProjectName>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -123,7 +123,6 @@
       <PreprocessorDefinitions>$(FridaComponentDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
   </ItemDefinitionGroup>
-  <Import Project="frida-python-common.props" />
   <ItemGroup>
     <ProjectReference Include="..\frida-core\frida-core.vcxproj">
       <Project>{b7dc9b02-a5ff-4aa1-b2a2-dc1653168d44}</Project>
@@ -134,6 +133,43 @@
       <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="src\_frida.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <CustomBuild Include="frida\__init__.py">
+      <FileType>Document</FileType>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Installing frida package</Message>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Installing frida package</Message>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Installing frida package</Message>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Installing frida package</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">rmdir /S /Q $(OutDir)frida 2&gt;NUL
+mkdir $(OutDir)frida || exit 1
+copy /B /Y "$(ProjectDir)frida\*.py" $(OutDir)frida || exit 1
+echo. &gt; $(IntDir)frida-package.stamp</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)frida-package.stamp</Outputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)frida\core.py</AdditionalInputs>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">rmdir /S /Q $(OutDir)frida 2&gt;NUL
+mkdir $(OutDir)frida || exit 1
+copy /B /Y "$(ProjectDir)frida\*.py" $(OutDir)frida || exit 1
+echo. &gt; $(IntDir)frida-package.stamp</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)frida-package.stamp</Outputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)frida\core.py</AdditionalInputs>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">rmdir /S /Q $(OutDir)frida 2&gt;NUL
+mkdir $(OutDir)frida || exit 1
+copy /B /Y "$(ProjectDir)frida\*.py" $(OutDir)frida || exit 1
+echo. &gt; $(IntDir)frida-package.stamp</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)frida-package.stamp</Outputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectDir)frida\core.py</AdditionalInputs>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">rmdir /S /Q $(OutDir)frida 2&gt;NUL
+mkdir $(OutDir)frida || exit 1
+copy /B /Y "$(ProjectDir)frida\*.py" $(OutDir)frida || exit 1
+echo. &gt; $(IntDir)frida-package.stamp</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)frida-package.stamp</Outputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectDir)frida\core.py</AdditionalInputs>
+    </CustomBuild>
+    <None Include="frida\core.py" />
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
diff --git a/frida-python3.vcxproj.filters b/frida-python.vcxproj.filters
similarity index 100%
rename from frida-python3.vcxproj.filters
rename to frida-python.vcxproj.filters