diff options
Diffstat (limited to 'PCbuild')
| -rw-r--r-- | PCbuild/_freeze_importlib.vcxproj | 9 | ||||
| -rw-r--r-- | PCbuild/libeay.vcxproj | 6 | ||||
| -rw-r--r-- | PCbuild/pylauncher.vcxproj | 1 | ||||
| -rw-r--r-- | PCbuild/pyproject.props | 15 | ||||
| -rw-r--r-- | PCbuild/python.props | 8 | ||||
| -rw-r--r-- | PCbuild/pywlauncher.vcxproj | 1 | ||||
| -rw-r--r-- | PCbuild/ssleay.vcxproj | 6 |
7 files changed, 36 insertions, 10 deletions
diff --git a/PCbuild/_freeze_importlib.vcxproj b/PCbuild/_freeze_importlib.vcxproj index e331a67..7f4e419 100644 --- a/PCbuild/_freeze_importlib.vcxproj +++ b/PCbuild/_freeze_importlib.vcxproj @@ -81,7 +81,7 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> </ImportGroup> - <Target Name="RebuildImportLib" AfterTargets="AfterBuild"> + <Target Name="RebuildImportLib" AfterTargets="AfterBuild" Condition="$(Configuration) == 'Debug' or $(Configuration) == 'Release'"> <Exec Command='"$(TargetPath)" "$(PySourcePath)Lib\importlib\_bootstrap.py" "$(IntDir)importlib.g.h"' /> <PropertyGroup> @@ -93,9 +93,10 @@ DestinationFiles="$(PySourcePath)Python\importlib.h" Condition="Exists('$(IntDir)importlib.g.h') and '$(_OldContent)' != '$(_NewContent)'" /> - <Message Text="importlib.h has been updated. You will need to rebuild pythoncore to see the changes." - Importance="high" - Condition="Exists('$(IntDir)importlib.g.h') and '$(_OldContent)' != '$(_NewContent)'" /> + <Warning Text="importlib.h has been updated. You will need to rebuild pythoncore to see the changes." + Condition="Exists('$(IntDir)importlib.g.h') and '$(_OldContent)' != '$(_NewContent)' and $(Configuration) == 'Debug'" /> + <Error Text="importlib.h has been updated. You will need to rebuild pythoncore to see the changes." + Condition="Exists('$(IntDir)importlib.g.h') and '$(_OldContent)' != '$(_NewContent)' and $(Configuration) == 'Release'" /> </Target> <Target Name="_CleanImportLib" BeforeTargets="CoreClean"> <ItemGroup> diff --git a/PCbuild/libeay.vcxproj b/PCbuild/libeay.vcxproj index 8348bc0..dff5e71 100644 --- a/PCbuild/libeay.vcxproj +++ b/PCbuild/libeay.vcxproj @@ -41,8 +41,12 @@ <Import Project="python.props" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + + <PropertyGroup Label="Configuration"> + <ConfigurationType>StaticLibrary</ConfigurationType> + </PropertyGroup> + <Import Project="openssl.props" /> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Target Name="CreateBuildinfH" Inputs="$(MSBuildProjectFullPath)" Outputs="$(IntDir)\buildinf.h" AfterTargets="PrepareForBuild"> diff --git a/PCbuild/pylauncher.vcxproj b/PCbuild/pylauncher.vcxproj index c27d6f5..6a21785 100644 --- a/PCbuild/pylauncher.vcxproj +++ b/PCbuild/pylauncher.vcxproj @@ -61,6 +61,7 @@ <ItemDefinitionGroup> <ClCompile> <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <RuntimeLibrary>MultiThreaded</RuntimeLibrary> </ClCompile> <Link> <AdditionalDependencies>version.lib;%(AdditionalDependencies)</AdditionalDependencies> diff --git a/PCbuild/pyproject.props b/PCbuild/pyproject.props index 33570d7..1afbfe1 100644 --- a/PCbuild/pyproject.props +++ b/PCbuild/pyproject.props @@ -11,6 +11,9 @@ <GenerateManifest>false</GenerateManifest> <EmbedManifest>false</EmbedManifest> <SupportPGO Condition="'$(SupportPGO)' == ''">true</SupportPGO> + <SupportSigning Condition="'$(SupportSigning)' == ''">true</SupportSigning> + <SupportSigning Condition="'$(Configuration)' == 'Debug'">false</SupportSigning> + <SupportSigning Condition="'$(ConfigurationType)' == 'StaticLibrary'">false</SupportSigning> </PropertyGroup> <PropertyGroup> @@ -138,4 +141,16 @@ foreach (System.Diagnostics.Process p in System.Diagnostics.Process.GetProcesses Condition="Exists(%(FullPath))" Targets="CleanAll" /> </Target> + + <PropertyGroup Condition="'$(SigningCertificate)' != '' and $(SupportSigning)"> + <SignToolPath Condition="'$(SignToolPath)' == '' or !Exists($(SignToolPath))">$(registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Windows Kits\Installed Roots@KitsRoot81)\bin\x86\signtool.exe</SignToolPath> + <SignToolPath Condition="!Exists($(SignToolPath))">$(registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Windows Kits\Installed Roots@KitsRoot)\bin\x86\signtool.exe</SignToolPath> + <SignToolPath Condition="!Exists($(SignToolPath))">$(registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v7.1A@InstallationFolder)\Bin\signtool.exe</SignToolPath> + <_SignCommand Condition="Exists($(SignToolPath))">"$(SignToolPath)" sign /q /n "$(SigningCertificate)" /t http://timestamp.verisign.com/scripts/timestamp.dll /d "Python $(PythonVersion)"</_SignCommand> + </PropertyGroup> + + <Target Name="_SignBuild" AfterTargets="AfterBuild" Condition="'$(SigningCertificate)' != '' and $(SupportSigning)"> + <Error Text="Unable to locate signtool.exe. Set /p:SignToolPath and rebuild" Condition="'$(_SignCommand)' == ''" /> + <Exec Command='$(_SignCommand) "$(TargetPath)" || $(_SignCommand) "$(TargetPath)" || $(_SignCommand) "$(TargetPath)"' ContinueOnError="false" /> + </Target> </Project>
\ No newline at end of file diff --git a/PCbuild/python.props b/PCbuild/python.props index e41f8ac..51eceb8 100644 --- a/PCbuild/python.props +++ b/PCbuild/python.props @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" TreatAsLocalProperty="Platform"> +<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> - <Platform Condition="'$(Platform)' == '' or '$(Platform)' == 'x86'">Win32</Platform> + <Platform Condition="'$(Platform)' == ''">Win32</Platform> <Configuration Condition="'$(Configuration)' == ''">Release</Configuration> <!-- Use the latest available version of Visual Studio to build. To override @@ -98,12 +98,12 @@ <PyDllName>python$(MajorVersionNumber)$(MinorVersionNumber)$(PyDebugExt)</PyDllName> <!-- The version and platform tag to include in .pyd filenames --> - <PydTag Condition="$(Platform) == 'Win32'">.cp$(MajorVersionNumber)$(MinorVersionNumber)-win32</PydTag> + <PydTag Condition="$(Platform) == 'Win32' or $(Platform) == 'x86'">.cp$(MajorVersionNumber)$(MinorVersionNumber)-win32</PydTag> <PydTag Condition="$(Platform) == 'x64'">.cp$(MajorVersionNumber)$(MinorVersionNumber)-win_amd64</PydTag> <!-- The version number for sys.winver --> <SysWinVer>$(MajorVersionNumber).$(MinorVersionNumber)</SysWinVer> - <SysWinVer Condition="$(Platform) == 'Win32'">$(SysWinVer)-32</SysWinVer> + <SysWinVer Condition="$(Platform) == 'Win32' or $(Platform) == 'x86'">$(SysWinVer)-32</SysWinVer> </PropertyGroup> <!-- Displays the calculated version info --> diff --git a/PCbuild/pywlauncher.vcxproj b/PCbuild/pywlauncher.vcxproj index aeee1b1..882f1c4 100644 --- a/PCbuild/pywlauncher.vcxproj +++ b/PCbuild/pywlauncher.vcxproj @@ -61,6 +61,7 @@ <ItemDefinitionGroup> <ClCompile> <PreprocessorDefinitions>_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <RuntimeLibrary>MultiThreaded</RuntimeLibrary> </ClCompile> <Link> <AdditionalDependencies>version.lib;%(AdditionalDependencies)</AdditionalDependencies> diff --git a/PCbuild/ssleay.vcxproj b/PCbuild/ssleay.vcxproj index f00c606..fa8c5d3 100644 --- a/PCbuild/ssleay.vcxproj +++ b/PCbuild/ssleay.vcxproj @@ -41,8 +41,12 @@ <Import Project="python.props" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + + <PropertyGroup Label="Configuration"> + <ConfigurationType>StaticLibrary</ConfigurationType> + </PropertyGroup> + <Import Project="openssl.props" /> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <ItemGroup> |