diff --git a/kdlibcpp b/kdlibcpp index 4154e46..e1c23a1 160000 --- a/kdlibcpp +++ b/kdlibcpp @@ -1 +1 @@ -Subproject commit 4154e469221fb023121657d3acf4d51d6caa5ef4 +Subproject commit e1c23a11b80caa81218e50d5ff9ab3fe98b72647 diff --git a/pykd.sln b/pykd.sln index 2658042..c8b5465 100644 --- a/pykd.sln +++ b/pykd.sln @@ -50,6 +50,8 @@ Global Debug_3.7|x64 = Debug_3.7|x64 Debug_3.8|Win32 = Debug_3.8|Win32 Debug_3.8|x64 = Debug_3.8|x64 + Debug_3.9|Win32 = Debug_3.9|Win32 + Debug_3.9|x64 = Debug_3.9|x64 Release_2.7|Win32 = Release_2.7|Win32 Release_2.7|x64 = Release_2.7|x64 Release_3.5|Win32 = Release_3.5|Win32 @@ -60,6 +62,8 @@ Global Release_3.7|x64 = Release_3.7|x64 Release_3.8|Win32 = Release_3.8|Win32 Release_3.8|x64 = Release_3.8|x64 + Release_3.9|Win32 = Release_3.9|Win32 + Release_3.9|x64 = Release_3.9|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {3F0BE77E-19B0-4192-B432-44A25805BCB8}.Debug_2.7|Win32.ActiveCfg = Debug|Any CPU @@ -73,6 +77,8 @@ Global {3F0BE77E-19B0-4192-B432-44A25805BCB8}.Debug_3.7|x64.ActiveCfg = Debug|Any CPU {3F0BE77E-19B0-4192-B432-44A25805BCB8}.Debug_3.8|Win32.ActiveCfg = Debug|Any CPU {3F0BE77E-19B0-4192-B432-44A25805BCB8}.Debug_3.8|x64.ActiveCfg = Debug|Any CPU + {3F0BE77E-19B0-4192-B432-44A25805BCB8}.Debug_3.9|Win32.ActiveCfg = Debug|Any CPU + {3F0BE77E-19B0-4192-B432-44A25805BCB8}.Debug_3.9|x64.ActiveCfg = Debug|Any CPU {3F0BE77E-19B0-4192-B432-44A25805BCB8}.Release_2.7|Win32.ActiveCfg = Release|Any CPU {3F0BE77E-19B0-4192-B432-44A25805BCB8}.Release_2.7|x64.ActiveCfg = Release|Any CPU {3F0BE77E-19B0-4192-B432-44A25805BCB8}.Release_3.5|Win32.ActiveCfg = Release|Any CPU @@ -83,6 +89,8 @@ Global {3F0BE77E-19B0-4192-B432-44A25805BCB8}.Release_3.7|x64.ActiveCfg = Release|Any CPU {3F0BE77E-19B0-4192-B432-44A25805BCB8}.Release_3.8|Win32.ActiveCfg = Release|Any CPU {3F0BE77E-19B0-4192-B432-44A25805BCB8}.Release_3.8|x64.ActiveCfg = Release|Any CPU + {3F0BE77E-19B0-4192-B432-44A25805BCB8}.Release_3.9|Win32.ActiveCfg = Release|Any CPU + {3F0BE77E-19B0-4192-B432-44A25805BCB8}.Release_3.9|x64.ActiveCfg = Release|Any CPU {6471FEDC-3129-410F-BFFC-4BC89707E5EC}.Debug_2.7|Win32.ActiveCfg = Debug|Any CPU {6471FEDC-3129-410F-BFFC-4BC89707E5EC}.Debug_2.7|x64.ActiveCfg = Debug|Any CPU {6471FEDC-3129-410F-BFFC-4BC89707E5EC}.Debug_3.5|Win32.ActiveCfg = Debug|Any CPU @@ -93,6 +101,8 @@ Global {6471FEDC-3129-410F-BFFC-4BC89707E5EC}.Debug_3.7|x64.ActiveCfg = Debug|Any CPU {6471FEDC-3129-410F-BFFC-4BC89707E5EC}.Debug_3.8|Win32.ActiveCfg = Debug|Any CPU {6471FEDC-3129-410F-BFFC-4BC89707E5EC}.Debug_3.8|x64.ActiveCfg = Debug|Any CPU + {6471FEDC-3129-410F-BFFC-4BC89707E5EC}.Debug_3.9|Win32.ActiveCfg = Debug|Any CPU + {6471FEDC-3129-410F-BFFC-4BC89707E5EC}.Debug_3.9|x64.ActiveCfg = Debug|Any CPU {6471FEDC-3129-410F-BFFC-4BC89707E5EC}.Release_2.7|Win32.ActiveCfg = Release|Any CPU {6471FEDC-3129-410F-BFFC-4BC89707E5EC}.Release_2.7|x64.ActiveCfg = Release|Any CPU {6471FEDC-3129-410F-BFFC-4BC89707E5EC}.Release_3.5|Win32.ActiveCfg = Release|Any CPU @@ -103,6 +113,8 @@ Global {6471FEDC-3129-410F-BFFC-4BC89707E5EC}.Release_3.7|x64.ActiveCfg = Release|Any CPU {6471FEDC-3129-410F-BFFC-4BC89707E5EC}.Release_3.8|Win32.ActiveCfg = Release|Any CPU {6471FEDC-3129-410F-BFFC-4BC89707E5EC}.Release_3.8|x64.ActiveCfg = Release|Any CPU + {6471FEDC-3129-410F-BFFC-4BC89707E5EC}.Release_3.9|Win32.ActiveCfg = Release|Any CPU + {6471FEDC-3129-410F-BFFC-4BC89707E5EC}.Release_3.9|x64.ActiveCfg = Release|Any CPU {D78837DC-BF31-4FC4-88A5-7F2FADAFA795}.Debug_2.7|Win32.ActiveCfg = Debug|Any CPU {D78837DC-BF31-4FC4-88A5-7F2FADAFA795}.Debug_2.7|x64.ActiveCfg = Debug|Any CPU {D78837DC-BF31-4FC4-88A5-7F2FADAFA795}.Debug_3.5|Win32.ActiveCfg = Debug|Any CPU @@ -113,6 +125,8 @@ Global {D78837DC-BF31-4FC4-88A5-7F2FADAFA795}.Debug_3.7|x64.ActiveCfg = Debug|Any CPU {D78837DC-BF31-4FC4-88A5-7F2FADAFA795}.Debug_3.8|Win32.ActiveCfg = Debug|Any CPU {D78837DC-BF31-4FC4-88A5-7F2FADAFA795}.Debug_3.8|x64.ActiveCfg = Debug|Any CPU + {D78837DC-BF31-4FC4-88A5-7F2FADAFA795}.Debug_3.9|Win32.ActiveCfg = Debug|Any CPU + {D78837DC-BF31-4FC4-88A5-7F2FADAFA795}.Debug_3.9|x64.ActiveCfg = Debug|Any CPU {D78837DC-BF31-4FC4-88A5-7F2FADAFA795}.Release_2.7|Win32.ActiveCfg = Release|Any CPU {D78837DC-BF31-4FC4-88A5-7F2FADAFA795}.Release_2.7|x64.ActiveCfg = Release|Any CPU {D78837DC-BF31-4FC4-88A5-7F2FADAFA795}.Release_3.5|Win32.ActiveCfg = Release|Any CPU @@ -123,6 +137,8 @@ Global {D78837DC-BF31-4FC4-88A5-7F2FADAFA795}.Release_3.7|x64.ActiveCfg = Release|Any CPU {D78837DC-BF31-4FC4-88A5-7F2FADAFA795}.Release_3.8|Win32.ActiveCfg = Release|Any CPU {D78837DC-BF31-4FC4-88A5-7F2FADAFA795}.Release_3.8|x64.ActiveCfg = Release|Any CPU + {D78837DC-BF31-4FC4-88A5-7F2FADAFA795}.Release_3.9|Win32.ActiveCfg = Release|Any CPU + {D78837DC-BF31-4FC4-88A5-7F2FADAFA795}.Release_3.9|x64.ActiveCfg = Release|Any CPU {3E9C538F-F060-4E86-AB7D-D44439615B63}.Debug_2.7|Win32.ActiveCfg = Debug|Win32 {3E9C538F-F060-4E86-AB7D-D44439615B63}.Debug_2.7|Win32.Build.0 = Debug|Win32 {3E9C538F-F060-4E86-AB7D-D44439615B63}.Debug_2.7|x64.ActiveCfg = Debug|x64 @@ -143,6 +159,10 @@ Global {3E9C538F-F060-4E86-AB7D-D44439615B63}.Debug_3.8|Win32.Build.0 = Debug|Win32 {3E9C538F-F060-4E86-AB7D-D44439615B63}.Debug_3.8|x64.ActiveCfg = Debug|x64 {3E9C538F-F060-4E86-AB7D-D44439615B63}.Debug_3.8|x64.Build.0 = Debug|x64 + {3E9C538F-F060-4E86-AB7D-D44439615B63}.Debug_3.9|Win32.ActiveCfg = Debug|Win32 + {3E9C538F-F060-4E86-AB7D-D44439615B63}.Debug_3.9|Win32.Build.0 = Debug|Win32 + {3E9C538F-F060-4E86-AB7D-D44439615B63}.Debug_3.9|x64.ActiveCfg = Debug|x64 + {3E9C538F-F060-4E86-AB7D-D44439615B63}.Debug_3.9|x64.Build.0 = Debug|x64 {3E9C538F-F060-4E86-AB7D-D44439615B63}.Release_2.7|Win32.ActiveCfg = Release_Static|Win32 {3E9C538F-F060-4E86-AB7D-D44439615B63}.Release_2.7|Win32.Build.0 = Release_Static|Win32 {3E9C538F-F060-4E86-AB7D-D44439615B63}.Release_2.7|x64.ActiveCfg = Release_Static|x64 @@ -163,6 +183,10 @@ Global {3E9C538F-F060-4E86-AB7D-D44439615B63}.Release_3.8|Win32.Build.0 = Release_Static|Win32 {3E9C538F-F060-4E86-AB7D-D44439615B63}.Release_3.8|x64.ActiveCfg = Release_Static|x64 {3E9C538F-F060-4E86-AB7D-D44439615B63}.Release_3.8|x64.Build.0 = Release_Static|x64 + {3E9C538F-F060-4E86-AB7D-D44439615B63}.Release_3.9|Win32.ActiveCfg = Release_Static|Win32 + {3E9C538F-F060-4E86-AB7D-D44439615B63}.Release_3.9|Win32.Build.0 = Release_Static|Win32 + {3E9C538F-F060-4E86-AB7D-D44439615B63}.Release_3.9|x64.ActiveCfg = Release_Static|x64 + {3E9C538F-F060-4E86-AB7D-D44439615B63}.Release_3.9|x64.Build.0 = Release_Static|x64 {C4C45791-0201-4406-BC5C-A384B01E3BF5}.Debug_2.7|Win32.ActiveCfg = Debug_2.7|Win32 {C4C45791-0201-4406-BC5C-A384B01E3BF5}.Debug_2.7|Win32.Build.0 = Debug_2.7|Win32 {C4C45791-0201-4406-BC5C-A384B01E3BF5}.Debug_2.7|x64.ActiveCfg = Debug_2.7|x64 @@ -183,6 +207,10 @@ Global {C4C45791-0201-4406-BC5C-A384B01E3BF5}.Debug_3.8|Win32.Build.0 = Debug_3.8|Win32 {C4C45791-0201-4406-BC5C-A384B01E3BF5}.Debug_3.8|x64.ActiveCfg = Debug_3.8|x64 {C4C45791-0201-4406-BC5C-A384B01E3BF5}.Debug_3.8|x64.Build.0 = Debug_3.8|x64 + {C4C45791-0201-4406-BC5C-A384B01E3BF5}.Debug_3.9|Win32.ActiveCfg = Debug_3.9|Win32 + {C4C45791-0201-4406-BC5C-A384B01E3BF5}.Debug_3.9|Win32.Build.0 = Debug_3.9|Win32 + {C4C45791-0201-4406-BC5C-A384B01E3BF5}.Debug_3.9|x64.ActiveCfg = Debug_3.9|x64 + {C4C45791-0201-4406-BC5C-A384B01E3BF5}.Debug_3.9|x64.Build.0 = Debug_3.9|x64 {C4C45791-0201-4406-BC5C-A384B01E3BF5}.Release_2.7|Win32.ActiveCfg = Release_2.7|Win32 {C4C45791-0201-4406-BC5C-A384B01E3BF5}.Release_2.7|Win32.Build.0 = Release_2.7|Win32 {C4C45791-0201-4406-BC5C-A384B01E3BF5}.Release_2.7|x64.ActiveCfg = Release_2.7|x64 @@ -203,6 +231,10 @@ Global {C4C45791-0201-4406-BC5C-A384B01E3BF5}.Release_3.8|Win32.Build.0 = Release_3.8|Win32 {C4C45791-0201-4406-BC5C-A384B01E3BF5}.Release_3.8|x64.ActiveCfg = Release_3.8|x64 {C4C45791-0201-4406-BC5C-A384B01E3BF5}.Release_3.8|x64.Build.0 = Release_3.8|x64 + {C4C45791-0201-4406-BC5C-A384B01E3BF5}.Release_3.9|Win32.ActiveCfg = Release_3.9|Win32 + {C4C45791-0201-4406-BC5C-A384B01E3BF5}.Release_3.9|Win32.Build.0 = Release_3.9|Win32 + {C4C45791-0201-4406-BC5C-A384B01E3BF5}.Release_3.9|x64.ActiveCfg = Release_3.9|x64 + {C4C45791-0201-4406-BC5C-A384B01E3BF5}.Release_3.9|x64.Build.0 = Release_3.9|x64 {0E4CC688-F2F5-499F-9C07-0F2CAEE0D3EF}.Debug_2.7|Win32.ActiveCfg = Debug|Win32 {0E4CC688-F2F5-499F-9C07-0F2CAEE0D3EF}.Debug_2.7|Win32.Build.0 = Debug|Win32 {0E4CC688-F2F5-499F-9C07-0F2CAEE0D3EF}.Debug_2.7|x64.ActiveCfg = Debug|x64 @@ -223,26 +255,34 @@ Global {0E4CC688-F2F5-499F-9C07-0F2CAEE0D3EF}.Debug_3.8|Win32.Build.0 = Debug|Win32 {0E4CC688-F2F5-499F-9C07-0F2CAEE0D3EF}.Debug_3.8|x64.ActiveCfg = Debug|x64 {0E4CC688-F2F5-499F-9C07-0F2CAEE0D3EF}.Debug_3.8|x64.Build.0 = Debug|x64 - {0E4CC688-F2F5-499F-9C07-0F2CAEE0D3EF}.Release_2.7|Win32.ActiveCfg = Release|Win32 - {0E4CC688-F2F5-499F-9C07-0F2CAEE0D3EF}.Release_2.7|Win32.Build.0 = Release|Win32 - {0E4CC688-F2F5-499F-9C07-0F2CAEE0D3EF}.Release_2.7|x64.ActiveCfg = Release|x64 - {0E4CC688-F2F5-499F-9C07-0F2CAEE0D3EF}.Release_2.7|x64.Build.0 = Release|x64 - {0E4CC688-F2F5-499F-9C07-0F2CAEE0D3EF}.Release_3.5|Win32.ActiveCfg = Release|Win32 - {0E4CC688-F2F5-499F-9C07-0F2CAEE0D3EF}.Release_3.5|Win32.Build.0 = Release|Win32 - {0E4CC688-F2F5-499F-9C07-0F2CAEE0D3EF}.Release_3.5|x64.ActiveCfg = Release|x64 - {0E4CC688-F2F5-499F-9C07-0F2CAEE0D3EF}.Release_3.5|x64.Build.0 = Release|x64 - {0E4CC688-F2F5-499F-9C07-0F2CAEE0D3EF}.Release_3.6|Win32.ActiveCfg = Release|Win32 - {0E4CC688-F2F5-499F-9C07-0F2CAEE0D3EF}.Release_3.6|Win32.Build.0 = Release|Win32 - {0E4CC688-F2F5-499F-9C07-0F2CAEE0D3EF}.Release_3.6|x64.ActiveCfg = Release|x64 - {0E4CC688-F2F5-499F-9C07-0F2CAEE0D3EF}.Release_3.6|x64.Build.0 = Release|x64 - {0E4CC688-F2F5-499F-9C07-0F2CAEE0D3EF}.Release_3.7|Win32.ActiveCfg = Release|Win32 - {0E4CC688-F2F5-499F-9C07-0F2CAEE0D3EF}.Release_3.7|Win32.Build.0 = Release|Win32 - {0E4CC688-F2F5-499F-9C07-0F2CAEE0D3EF}.Release_3.7|x64.ActiveCfg = Release|x64 - {0E4CC688-F2F5-499F-9C07-0F2CAEE0D3EF}.Release_3.7|x64.Build.0 = Release|x64 - {0E4CC688-F2F5-499F-9C07-0F2CAEE0D3EF}.Release_3.8|Win32.ActiveCfg = Release|Win32 - {0E4CC688-F2F5-499F-9C07-0F2CAEE0D3EF}.Release_3.8|Win32.Build.0 = Release|Win32 - {0E4CC688-F2F5-499F-9C07-0F2CAEE0D3EF}.Release_3.8|x64.ActiveCfg = Release|x64 - {0E4CC688-F2F5-499F-9C07-0F2CAEE0D3EF}.Release_3.8|x64.Build.0 = Release|x64 + {0E4CC688-F2F5-499F-9C07-0F2CAEE0D3EF}.Debug_3.9|Win32.ActiveCfg = Debug|Win32 + {0E4CC688-F2F5-499F-9C07-0F2CAEE0D3EF}.Debug_3.9|Win32.Build.0 = Debug|Win32 + {0E4CC688-F2F5-499F-9C07-0F2CAEE0D3EF}.Debug_3.9|x64.ActiveCfg = Debug|x64 + {0E4CC688-F2F5-499F-9C07-0F2CAEE0D3EF}.Debug_3.9|x64.Build.0 = Debug|x64 + {0E4CC688-F2F5-499F-9C07-0F2CAEE0D3EF}.Release_2.7|Win32.ActiveCfg = Debug|Win32 + {0E4CC688-F2F5-499F-9C07-0F2CAEE0D3EF}.Release_2.7|Win32.Build.0 = Debug|Win32 + {0E4CC688-F2F5-499F-9C07-0F2CAEE0D3EF}.Release_2.7|x64.ActiveCfg = Debug|x64 + {0E4CC688-F2F5-499F-9C07-0F2CAEE0D3EF}.Release_2.7|x64.Build.0 = Debug|x64 + {0E4CC688-F2F5-499F-9C07-0F2CAEE0D3EF}.Release_3.5|Win32.ActiveCfg = Debug|Win32 + {0E4CC688-F2F5-499F-9C07-0F2CAEE0D3EF}.Release_3.5|Win32.Build.0 = Debug|Win32 + {0E4CC688-F2F5-499F-9C07-0F2CAEE0D3EF}.Release_3.5|x64.ActiveCfg = Debug|x64 + {0E4CC688-F2F5-499F-9C07-0F2CAEE0D3EF}.Release_3.5|x64.Build.0 = Debug|x64 + {0E4CC688-F2F5-499F-9C07-0F2CAEE0D3EF}.Release_3.6|Win32.ActiveCfg = Debug|Win32 + {0E4CC688-F2F5-499F-9C07-0F2CAEE0D3EF}.Release_3.6|Win32.Build.0 = Debug|Win32 + {0E4CC688-F2F5-499F-9C07-0F2CAEE0D3EF}.Release_3.6|x64.ActiveCfg = Debug|x64 + {0E4CC688-F2F5-499F-9C07-0F2CAEE0D3EF}.Release_3.6|x64.Build.0 = Debug|x64 + {0E4CC688-F2F5-499F-9C07-0F2CAEE0D3EF}.Release_3.7|Win32.ActiveCfg = Debug|Win32 + {0E4CC688-F2F5-499F-9C07-0F2CAEE0D3EF}.Release_3.7|Win32.Build.0 = Debug|Win32 + {0E4CC688-F2F5-499F-9C07-0F2CAEE0D3EF}.Release_3.7|x64.ActiveCfg = Debug|x64 + {0E4CC688-F2F5-499F-9C07-0F2CAEE0D3EF}.Release_3.7|x64.Build.0 = Debug|x64 + {0E4CC688-F2F5-499F-9C07-0F2CAEE0D3EF}.Release_3.8|Win32.ActiveCfg = Debug|Win32 + {0E4CC688-F2F5-499F-9C07-0F2CAEE0D3EF}.Release_3.8|Win32.Build.0 = Debug|Win32 + {0E4CC688-F2F5-499F-9C07-0F2CAEE0D3EF}.Release_3.8|x64.ActiveCfg = Debug|x64 + {0E4CC688-F2F5-499F-9C07-0F2CAEE0D3EF}.Release_3.8|x64.Build.0 = Debug|x64 + {0E4CC688-F2F5-499F-9C07-0F2CAEE0D3EF}.Release_3.9|Win32.ActiveCfg = Release|Win32 + {0E4CC688-F2F5-499F-9C07-0F2CAEE0D3EF}.Release_3.9|Win32.Build.0 = Release|Win32 + {0E4CC688-F2F5-499F-9C07-0F2CAEE0D3EF}.Release_3.9|x64.ActiveCfg = Release|x64 + {0E4CC688-F2F5-499F-9C07-0F2CAEE0D3EF}.Release_3.9|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/pykd/packages.config b/pykd/packages.config index 55f9184..fc0a8e9 100644 --- a/pykd/packages.config +++ b/pykd/packages.config @@ -12,6 +12,7 @@ + diff --git a/pykd/pykd.vcxproj b/pykd/pykd.vcxproj index b6aca9e..c08859d 100644 --- a/pykd/pykd.vcxproj +++ b/pykd/pykd.vcxproj @@ -41,6 +41,14 @@ Debug_3.8 x64 + + Debug_3.9 + Win32 + + + Debug_3.9 + x64 + Release_2.7 Win32 @@ -81,6 +89,14 @@ Release_3.8 x64 + + Release_3.9 + Win32 + + + Release_3.9 + x64 + {C4C45791-0201-4406-BC5C-A384B01E3BF5} @@ -132,6 +148,14 @@ 3.8 MDd + + DynamicLibrary + true + Unicode + v141 + 3.9 + MDd + DynamicLibrary true @@ -172,6 +196,14 @@ 3.8 MDd + + DynamicLibrary + true + Unicode + v141 + 3.9 + MDd + DynamicLibrary false @@ -217,6 +249,15 @@ 3.8 MT + + DynamicLibrary + false + true + Unicode + v141 + 3.9 + MT + DynamicLibrary false @@ -262,6 +303,15 @@ 3.8 MT + + DynamicLibrary + false + true + Unicode + v141 + 3.9 + MT + @@ -280,6 +330,9 @@ + + + @@ -295,6 +348,9 @@ + + + @@ -310,6 +366,9 @@ + + + @@ -325,6 +384,9 @@ + + + bb9fbdf7 @@ -368,6 +430,14 @@ $(Platform)\$(Configuration)\ $(SolutionDir)out\$(Platform)\$(Configuration)\ + + true + .pyd + true + $(ProjectName) + $(Platform)\$(Configuration)\ + $(SolutionDir)out\$(Platform)\$(Configuration)\ + true .pyd @@ -408,6 +478,14 @@ $(SolutionDir)out\$(Platform)\$(Configuration)\ $(Platform)\$(Configuration)\ + + true + .pyd + true + $(ProjectName) + $(SolutionDir)out\$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + false .pyd @@ -443,6 +521,13 @@ $(Platform)\$(Configuration)\ $(SolutionDir)out\$(Platform)\$(Configuration)\ + + false + .pyd + $(ProjectName) + $(Platform)\$(Configuration)\ + $(SolutionDir)out\$(Platform)\$(Configuration)\ + false .pyd @@ -478,6 +563,13 @@ $(SolutionDir)out\$(Platform)\$(Configuration)\ $(Platform)\$(Configuration)\ + + false + .pyd + $(ProjectName) + $(SolutionDir)out\$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + Use @@ -589,6 +681,28 @@ + + + Use + Level3 + Disabled + WIN32;BOOST_PYTHON_STATIC_LIB;BOOST_PYTHON_NO_LIB;_DEBUG;_WINDOWS;_USRDLL;PYKD_EXPORTS;%(PreprocessorDefinitions);BOOST_PYTHON_NUMPY_INTERNAL + $(SolutionDir)\kdlibcpp\kdlib\include;$(SolutionDir)\numpy\include; + + + Windows + DebugFull + pykd.def + %(AdditionalLibraryDirectories) + + + copy $(OutDir)..\Debug\targetapp.exe $(OutDir) + + + + + + Use @@ -699,6 +813,28 @@ + + + Use + Level3 + Disabled + WIN32;BOOST_PYTHON_STATIC_LIB;BOOST_PYTHON_NO_LIB;_DEBUG;_WINDOWS;_USRDLL;PYKD_EXPORTS;%(PreprocessorDefinitions);BOOST_PYTHON_NUMPY_INTERNAL + $(SolutionDir)\kdlibcpp\kdlib\include;$(SolutionDir)\numpy\include; + + + Windows + DebugFull + pykd.def + %(AdditionalLibraryDirectories) + + + copy $(OutDir)..\Debug\targetapp.exe $(OutDir) + + + + + + Level3 @@ -719,7 +855,7 @@ %(AdditionalLibraryDirectories) - copy $(OutDir)..\Release\targetapp.exe $(OutDir) + copy $(OutDir)..\Debug\targetapp.exe $(OutDir) @@ -742,7 +878,7 @@ %(AdditionalLibraryDirectories) - copy $(OutDir)..\Release\targetapp.exe $(OutDir) + copy $(OutDir)..\Debug\targetapp.exe $(OutDir) @@ -765,7 +901,7 @@ %(AdditionalLibraryDirectories) - copy $(OutDir)..\Release\targetapp.exe $(OutDir) + copy $(OutDir)..\Debug\targetapp.exe $(OutDir) @@ -788,7 +924,7 @@ %(AdditionalLibraryDirectories) - copy $(OutDir)..\Release\targetapp.exe $(OutDir) + copy $(OutDir)..\Debug\targetapp.exe $(OutDir) @@ -811,7 +947,30 @@ %(AdditionalLibraryDirectories) - copy $(OutDir)..\Release\targetapp.exe $(OutDir) + copy $(OutDir)..\Debug\targetapp.exe $(OutDir) + + + + + Level3 + Use + MaxSpeed + true + true + WIN32;BOOST_PYTHON_STATIC_LIB;BOOST_PYTHON_NO_LIB;NDEBUG;_WINDOWS;_USRDLL;PYKD_EXPORTS;%(PreprocessorDefinitions); + $(SolutionDir)\kdlibcpp\kdlib\include;$(SolutionDir)\numpy\include; + MultiThreaded + + + Windows + DebugFull + true + true + pykd.def + %(AdditionalLibraryDirectories) + + + copy $(OutDir)..\Debug\targetapp.exe $(OutDir) @@ -834,7 +993,7 @@ %(AdditionalLibraryDirectories) - copy $(OutDir)..\Release\targetapp.exe $(OutDir) + copy $(OutDir)..\Debug\targetapp.exe $(OutDir) @@ -857,7 +1016,7 @@ %(AdditionalLibraryDirectories) - copy $(OutDir)..\Release\targetapp.exe $(OutDir) + copy $(OutDir)..\Debug\targetapp.exe $(OutDir) @@ -880,7 +1039,7 @@ %(AdditionalLibraryDirectories) - copy $(OutDir)..\Release\targetapp.exe $(OutDir) + copy $(OutDir)..\Debug\targetapp.exe $(OutDir) @@ -903,7 +1062,7 @@ %(AdditionalLibraryDirectories) - copy $(OutDir)..\Release\targetapp.exe $(OutDir) + copy $(OutDir)..\Debug\targetapp.exe $(OutDir) @@ -926,7 +1085,30 @@ %(AdditionalLibraryDirectories) - copy $(OutDir)..\Release\targetapp.exe $(OutDir) + copy $(OutDir)..\Debug\targetapp.exe $(OutDir) + + + + + Level3 + Use + MaxSpeed + true + true + WIN32;BOOST_PYTHON_STATIC_LIB;BOOST_PYTHON_NO_LIB;NDEBUG;_WINDOWS;_USRDLL;PYKD_EXPORTS;%(PreprocessorDefinitions); + $(SolutionDir)\kdlibcpp\kdlib\include;$(SolutionDir)\numpy\include; + MultiThreaded + + + Windows + DebugFull + true + true + pykd.def + %(AdditionalLibraryDirectories) + + + copy $(OutDir)..\Debug\targetapp.exe $(OutDir) @@ -1083,6 +1265,7 @@ + @@ -1101,6 +1284,7 @@ - + + \ No newline at end of file diff --git a/pykd/pykdver.h b/pykd/pykdver.h index 106c876..8a77994 100644 --- a/pykd/pykdver.h +++ b/pykd/pykdver.h @@ -2,7 +2,7 @@ #define PYKD_VERSION_MAJOR 0 #define PYKD_VERSION_MINOR 3 #define PYKD_VERSION_SUBVERSION 4 -#define PYKD_VERSION_BUILDNO 14 +#define PYKD_VERSION_BUILDNO 15 #define __VER_STR2__(x) #x #define __VER_STR1__(x) __VER_STR2__(x) diff --git a/setup/buildall.cmd b/setup/buildall.cmd index 9cbbd78..9e038de 100644 --- a/setup/buildall.cmd +++ b/setup/buildall.cmd @@ -23,4 +23,9 @@ py -3.8 setup.py bdist_zip --plat-name=win-amd64 py -3.8 setup.py bdist_wheel --plat-name=win32 --python-tag=cp38 py -3.8 setup.py bdist_wheel --plat-name=win-amd64 --python-tag=cp38 +py -3.9 setup.py bdist_zip --plat-name=win32 +py -3.9 setup.py bdist_zip --plat-name=win-amd64 +py -3.9 setup.py bdist_wheel --plat-name=win32 --python-tag=cp39 +py -3.9 setup.py bdist_wheel --plat-name=win-amd64 --python-tag=cp39 + py setup.py bdist_pdb \ No newline at end of file diff --git a/setup/setup.py b/setup/setup.py index f608ec0..9e56212 100644 --- a/setup/setup.py +++ b/setup/setup.py @@ -9,7 +9,7 @@ import itertools _name = "pykd" _desc = "python windbg extension" -_version = '0.3.4.10' +_version = '0.3.4.15' def getReleaseSrc(): return 'Release_%d.%d' % sys.version_info[0:2] @@ -110,7 +110,7 @@ elif "bdist_zip" in sys.argv: elif "bdist_pdb" in sys.argv: #make pdb archive - pyVersion = ('2.7', '3.5', '3.6', '3.7', '3.8') + pyVersion = ('2.7', '3.5', '3.6', '3.7', '3.8', '3.9') platform = ('Win32', 'x64') pdbFiles = [ os.path.join( platform, 'Release_' + version, 'pykd.pdb') for version, platform in itertools.product( pyVersion, platform ) ] diff --git a/test/scripts/typedvar.py b/test/scripts/typedvar.py index 0777c7c..024431d 100644 --- a/test/scripts/typedvar.py +++ b/test/scripts/typedvar.py @@ -303,8 +303,8 @@ class TypedVarTest( unittest.TestCase ): def testUdtSubscribe(self): tv = pykd.typedVar( "g_virtChild" ) self.assertEqual( 6, len(tv) ) - fieldName = tv.fieldName(5) - fieldVal = tv.field(5) + fieldName = tv.fieldName(3) + fieldVal = tv.field(3) self.assertEqual( fieldName, "m_baseField" ) self.assertEqual( fieldVal, tv.m_baseField )