diff --git a/pykd-0.3-2013.sln b/pykd-0.3-2013.sln index d7bd3d8..fdb6011 100644 --- a/pykd-0.3-2013.sln +++ b/pykd-0.3-2013.sln @@ -61,10 +61,14 @@ Global Debug_2.7|x64 = Debug_2.7|x64 Debug_3.5|Win32 = Debug_3.5|Win32 Debug_3.5|x64 = Debug_3.5|x64 + Debug_3.6|Win32 = Debug_3.6|Win32 + Debug_3.6|x64 = Debug_3.6|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 Release_3.5|x64 = Release_3.5|x64 + Release_3.6|Win32 = Release_3.6|Win32 + Release_3.6|x64 = Release_3.6|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {3F0BE77E-19B0-4192-B432-44A25805BCB8}.Debug_2.7|Win32.ActiveCfg = Debug|Any CPU @@ -72,34 +76,50 @@ Global {3F0BE77E-19B0-4192-B432-44A25805BCB8}.Debug_2.7|x64.ActiveCfg = Debug|Any CPU {3F0BE77E-19B0-4192-B432-44A25805BCB8}.Debug_3.5|Win32.ActiveCfg = Debug|Any CPU {3F0BE77E-19B0-4192-B432-44A25805BCB8}.Debug_3.5|x64.ActiveCfg = Debug|Any CPU + {3F0BE77E-19B0-4192-B432-44A25805BCB8}.Debug_3.6|Win32.ActiveCfg = Debug|Any CPU + {3F0BE77E-19B0-4192-B432-44A25805BCB8}.Debug_3.6|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 {3F0BE77E-19B0-4192-B432-44A25805BCB8}.Release_3.5|x64.ActiveCfg = Release|Any CPU + {3F0BE77E-19B0-4192-B432-44A25805BCB8}.Release_3.6|Win32.ActiveCfg = Release|Any CPU + {3F0BE77E-19B0-4192-B432-44A25805BCB8}.Release_3.6|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 {6471FEDC-3129-410F-BFFC-4BC89707E5EC}.Debug_3.5|x64.ActiveCfg = Debug|Any CPU + {6471FEDC-3129-410F-BFFC-4BC89707E5EC}.Debug_3.6|Win32.ActiveCfg = Debug|Any CPU + {6471FEDC-3129-410F-BFFC-4BC89707E5EC}.Debug_3.6|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 {6471FEDC-3129-410F-BFFC-4BC89707E5EC}.Release_3.5|x64.ActiveCfg = Release|Any CPU + {6471FEDC-3129-410F-BFFC-4BC89707E5EC}.Release_3.6|Win32.ActiveCfg = Release|Any CPU + {6471FEDC-3129-410F-BFFC-4BC89707E5EC}.Release_3.6|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 {D78837DC-BF31-4FC4-88A5-7F2FADAFA795}.Debug_3.5|x64.ActiveCfg = Debug|Any CPU + {D78837DC-BF31-4FC4-88A5-7F2FADAFA795}.Debug_3.6|Win32.ActiveCfg = Debug|Any CPU + {D78837DC-BF31-4FC4-88A5-7F2FADAFA795}.Debug_3.6|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 {D78837DC-BF31-4FC4-88A5-7F2FADAFA795}.Release_3.5|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 + {D78837DC-BF31-4FC4-88A5-7F2FADAFA795}.Release_3.6|Win32.ActiveCfg = Release|Any CPU + {D78837DC-BF31-4FC4-88A5-7F2FADAFA795}.Release_3.6|x64.ActiveCfg = Release|Any CPU + {3E9C538F-F060-4E86-AB7D-D44439615B63}.Debug_2.7|Win32.ActiveCfg = Debug_Static|Win32 + {3E9C538F-F060-4E86-AB7D-D44439615B63}.Debug_2.7|Win32.Build.0 = Debug_Static|Win32 {3E9C538F-F060-4E86-AB7D-D44439615B63}.Debug_2.7|x64.ActiveCfg = Debug|x64 {3E9C538F-F060-4E86-AB7D-D44439615B63}.Debug_2.7|x64.Build.0 = Debug|x64 {3E9C538F-F060-4E86-AB7D-D44439615B63}.Debug_3.5|Win32.ActiveCfg = Debug|Win32 {3E9C538F-F060-4E86-AB7D-D44439615B63}.Debug_3.5|Win32.Build.0 = Debug|Win32 {3E9C538F-F060-4E86-AB7D-D44439615B63}.Debug_3.5|x64.ActiveCfg = Debug|x64 {3E9C538F-F060-4E86-AB7D-D44439615B63}.Debug_3.5|x64.Build.0 = Debug|x64 + {3E9C538F-F060-4E86-AB7D-D44439615B63}.Debug_3.6|Win32.ActiveCfg = Debug|Win32 + {3E9C538F-F060-4E86-AB7D-D44439615B63}.Debug_3.6|Win32.Build.0 = Debug|Win32 + {3E9C538F-F060-4E86-AB7D-D44439615B63}.Debug_3.6|x64.ActiveCfg = Debug|x64 + {3E9C538F-F060-4E86-AB7D-D44439615B63}.Debug_3.6|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 @@ -108,6 +128,10 @@ Global {3E9C538F-F060-4E86-AB7D-D44439615B63}.Release_3.5|Win32.Build.0 = Release_Static|Win32 {3E9C538F-F060-4E86-AB7D-D44439615B63}.Release_3.5|x64.ActiveCfg = Release_Static|x64 {3E9C538F-F060-4E86-AB7D-D44439615B63}.Release_3.5|x64.Build.0 = Release_Static|x64 + {3E9C538F-F060-4E86-AB7D-D44439615B63}.Release_3.6|Win32.ActiveCfg = Release_Static|Win32 + {3E9C538F-F060-4E86-AB7D-D44439615B63}.Release_3.6|Win32.Build.0 = Release_Static|Win32 + {3E9C538F-F060-4E86-AB7D-D44439615B63}.Release_3.6|x64.ActiveCfg = Release_Static|x64 + {3E9C538F-F060-4E86-AB7D-D44439615B63}.Release_3.6|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 @@ -116,6 +140,10 @@ Global {C4C45791-0201-4406-BC5C-A384B01E3BF5}.Debug_3.5|Win32.Build.0 = Debug_3.5|Win32 {C4C45791-0201-4406-BC5C-A384B01E3BF5}.Debug_3.5|x64.ActiveCfg = Debug_3.5|x64 {C4C45791-0201-4406-BC5C-A384B01E3BF5}.Debug_3.5|x64.Build.0 = Debug_3.5|x64 + {C4C45791-0201-4406-BC5C-A384B01E3BF5}.Debug_3.6|Win32.ActiveCfg = Debug_3.6|Win32 + {C4C45791-0201-4406-BC5C-A384B01E3BF5}.Debug_3.6|Win32.Build.0 = Debug_3.6|Win32 + {C4C45791-0201-4406-BC5C-A384B01E3BF5}.Debug_3.6|x64.ActiveCfg = Debug_3.6|x64 + {C4C45791-0201-4406-BC5C-A384B01E3BF5}.Debug_3.6|x64.Build.0 = Debug_3.6|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 @@ -124,6 +152,10 @@ Global {C4C45791-0201-4406-BC5C-A384B01E3BF5}.Release_3.5|Win32.Build.0 = Release_3.5|Win32 {C4C45791-0201-4406-BC5C-A384B01E3BF5}.Release_3.5|x64.ActiveCfg = Release_3.5|x64 {C4C45791-0201-4406-BC5C-A384B01E3BF5}.Release_3.5|x64.Build.0 = Release_3.5|x64 + {C4C45791-0201-4406-BC5C-A384B01E3BF5}.Release_3.6|Win32.ActiveCfg = Release_3.6|Win32 + {C4C45791-0201-4406-BC5C-A384B01E3BF5}.Release_3.6|Win32.Build.0 = Release_3.6|Win32 + {C4C45791-0201-4406-BC5C-A384B01E3BF5}.Release_3.6|x64.ActiveCfg = Release_3.6|x64 + {C4C45791-0201-4406-BC5C-A384B01E3BF5}.Release_3.6|x64.Build.0 = Release_3.6|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 @@ -132,6 +164,10 @@ Global {0E4CC688-F2F5-499F-9C07-0F2CAEE0D3EF}.Debug_3.5|Win32.Build.0 = Debug|Win32 {0E4CC688-F2F5-499F-9C07-0F2CAEE0D3EF}.Debug_3.5|x64.ActiveCfg = Debug|x64 {0E4CC688-F2F5-499F-9C07-0F2CAEE0D3EF}.Debug_3.5|x64.Build.0 = Debug|x64 + {0E4CC688-F2F5-499F-9C07-0F2CAEE0D3EF}.Debug_3.6|Win32.ActiveCfg = Debug|Win32 + {0E4CC688-F2F5-499F-9C07-0F2CAEE0D3EF}.Debug_3.6|Win32.Build.0 = Debug|Win32 + {0E4CC688-F2F5-499F-9C07-0F2CAEE0D3EF}.Debug_3.6|x64.ActiveCfg = Debug|x64 + {0E4CC688-F2F5-499F-9C07-0F2CAEE0D3EF}.Debug_3.6|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 @@ -140,6 +176,10 @@ Global {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 {CA0252CE-EF81-4DD8-A96F-A0E0E3644B7B}.Debug_2.7|Win32.ActiveCfg = Debug_2.7|Win32 {CA0252CE-EF81-4DD8-A96F-A0E0E3644B7B}.Debug_2.7|Win32.Build.0 = Debug_2.7|Win32 {CA0252CE-EF81-4DD8-A96F-A0E0E3644B7B}.Debug_2.7|x64.ActiveCfg = Debug_2.7|x64 @@ -148,6 +188,8 @@ Global {CA0252CE-EF81-4DD8-A96F-A0E0E3644B7B}.Debug_3.5|Win32.Build.0 = Debug_2.7|Win32 {CA0252CE-EF81-4DD8-A96F-A0E0E3644B7B}.Debug_3.5|x64.ActiveCfg = Debug_2.7|x64 {CA0252CE-EF81-4DD8-A96F-A0E0E3644B7B}.Debug_3.5|x64.Build.0 = Debug_2.7|x64 + {CA0252CE-EF81-4DD8-A96F-A0E0E3644B7B}.Debug_3.6|Win32.ActiveCfg = Debug_2.7|Win32 + {CA0252CE-EF81-4DD8-A96F-A0E0E3644B7B}.Debug_3.6|x64.ActiveCfg = Debug_2.7|x64 {CA0252CE-EF81-4DD8-A96F-A0E0E3644B7B}.Release_2.7|Win32.ActiveCfg = Release_2.7|Win32 {CA0252CE-EF81-4DD8-A96F-A0E0E3644B7B}.Release_2.7|Win32.Build.0 = Release_2.7|Win32 {CA0252CE-EF81-4DD8-A96F-A0E0E3644B7B}.Release_2.7|x64.ActiveCfg = Release_2.7|x64 @@ -156,6 +198,8 @@ Global {CA0252CE-EF81-4DD8-A96F-A0E0E3644B7B}.Release_3.5|Win32.Build.0 = Release_2.7|Win32 {CA0252CE-EF81-4DD8-A96F-A0E0E3644B7B}.Release_3.5|x64.ActiveCfg = Release_2.7|x64 {CA0252CE-EF81-4DD8-A96F-A0E0E3644B7B}.Release_3.5|x64.Build.0 = Release_2.7|x64 + {CA0252CE-EF81-4DD8-A96F-A0E0E3644B7B}.Release_3.6|Win32.ActiveCfg = Release_2.7|Win32 + {CA0252CE-EF81-4DD8-A96F-A0E0E3644B7B}.Release_3.6|x64.ActiveCfg = Release_2.7|x64 {583F9A6C-AF6D-45E0-A8F4-290D93611185}.Debug_2.7|Win32.ActiveCfg = Debug|Win32 {583F9A6C-AF6D-45E0-A8F4-290D93611185}.Debug_2.7|Win32.Build.0 = Debug|Win32 {583F9A6C-AF6D-45E0-A8F4-290D93611185}.Debug_2.7|x64.ActiveCfg = Debug|x64 @@ -164,6 +208,10 @@ Global {583F9A6C-AF6D-45E0-A8F4-290D93611185}.Debug_3.5|Win32.Build.0 = Debug|Win32 {583F9A6C-AF6D-45E0-A8F4-290D93611185}.Debug_3.5|x64.ActiveCfg = Debug|x64 {583F9A6C-AF6D-45E0-A8F4-290D93611185}.Debug_3.5|x64.Build.0 = Debug|x64 + {583F9A6C-AF6D-45E0-A8F4-290D93611185}.Debug_3.6|Win32.ActiveCfg = Debug|Win32 + {583F9A6C-AF6D-45E0-A8F4-290D93611185}.Debug_3.6|Win32.Build.0 = Debug|Win32 + {583F9A6C-AF6D-45E0-A8F4-290D93611185}.Debug_3.6|x64.ActiveCfg = Debug|x64 + {583F9A6C-AF6D-45E0-A8F4-290D93611185}.Debug_3.6|x64.Build.0 = Debug|x64 {583F9A6C-AF6D-45E0-A8F4-290D93611185}.Release_2.7|Win32.ActiveCfg = Release|Win32 {583F9A6C-AF6D-45E0-A8F4-290D93611185}.Release_2.7|Win32.Build.0 = Release|Win32 {583F9A6C-AF6D-45E0-A8F4-290D93611185}.Release_2.7|x64.ActiveCfg = Release|x64 @@ -172,6 +220,10 @@ Global {583F9A6C-AF6D-45E0-A8F4-290D93611185}.Release_3.5|Win32.Build.0 = Release|Win32 {583F9A6C-AF6D-45E0-A8F4-290D93611185}.Release_3.5|x64.ActiveCfg = Release|x64 {583F9A6C-AF6D-45E0-A8F4-290D93611185}.Release_3.5|x64.Build.0 = Release|x64 + {583F9A6C-AF6D-45E0-A8F4-290D93611185}.Release_3.6|Win32.ActiveCfg = Release|Win32 + {583F9A6C-AF6D-45E0-A8F4-290D93611185}.Release_3.6|Win32.Build.0 = Release|Win32 + {583F9A6C-AF6D-45E0-A8F4-290D93611185}.Release_3.6|x64.ActiveCfg = Release|x64 + {583F9A6C-AF6D-45E0-A8F4-290D93611185}.Release_3.6|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/pykd/packages.pykd_vc120.config b/pykd/packages.pykd_vc120.config index 45e0112..e0dd492 100644 --- a/pykd/packages.pykd_vc120.config +++ b/pykd/packages.pykd_vc120.config @@ -8,4 +8,5 @@ + diff --git a/pykd/pykd_vc120.vcxproj b/pykd/pykd_vc120.vcxproj index e35a436..590c1ef 100644 --- a/pykd/pykd_vc120.vcxproj +++ b/pykd/pykd_vc120.vcxproj @@ -17,6 +17,14 @@ Debug_3.5 x64 + + Debug_3.6 + Win32 + + + Debug_3.6 + x64 + Release_2.7 Win32 @@ -33,6 +41,14 @@ Release_3.5 x64 + + Release_3.6 + Win32 + + + Release_3.6 + x64 + {C4C45791-0201-4406-BC5C-A384B01E3BF5} @@ -57,6 +73,13 @@ v120_xp 3.5 + + DynamicLibrary + true + Unicode + v120_xp + 3.6 + DynamicLibrary true @@ -71,6 +94,13 @@ v120_xp 3.5 + + DynamicLibrary + true + Unicode + v120_xp + 3.6 + DynamicLibrary false @@ -87,6 +117,14 @@ v120_xp 3.5 + + DynamicLibrary + false + true + Unicode + v120_xp + 3.6 + DynamicLibrary false @@ -103,12 +141,26 @@ v120_xp 3.5 + + DynamicLibrary + false + true + Unicode + v120_xp + 3.6 + v120 + + v120 + v120 + + v120 + @@ -118,26 +170,38 @@ + + + + + + + + + + + + - 4bf1ae88 + 67fda795 true @@ -155,6 +219,14 @@ $(Platform)\$(Configuration)\ $(SolutionDir)out\$(Platform)\$(Configuration)\ + + true + .pyd + true + $(ProjectName) + $(Platform)\$(Configuration)\ + $(SolutionDir)out\$(Platform)\$(Configuration)\ + true .pyd @@ -171,6 +243,14 @@ $(SolutionDir)out\$(Platform)\$(Configuration)\ $(Platform)\$(Configuration)\ + + true + .pyd + true + $(ProjectName) + $(SolutionDir)out\$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + false .pyd @@ -185,6 +265,13 @@ $(Platform)\$(Configuration)\ $(SolutionDir)out\$(Platform)\$(Configuration)\ + + false + .pyd + $(ProjectName) + $(Platform)\$(Configuration)\ + $(SolutionDir)out\$(Platform)\$(Configuration)\ + false .pyd @@ -199,7 +286,37 @@ $(SolutionDir)out\$(Platform)\$(Configuration)\ $(Platform)\$(Configuration)\ + + false + .pyd + $(ProjectName) + $(SolutionDir)out\$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + + + Use + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;PYKD_EXPORTS;%(PreprocessorDefinitions) + $(ProjectDir)..\kdlibcpp\include; + MultiThreadedDebug + + + Windows + true + pykd.def + %(AdditionalLibraryDirectories) + + + copy $(OutDir)..\Debug\targetapp.exe $(OutDir) + + + + + + + Use Level3 @@ -221,7 +338,7 @@ - + Use Level3 @@ -287,6 +404,28 @@ + + + Use + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;PYKD_EXPORTS;%(PreprocessorDefinitions) + $(ProjectDir)..\kdlibcpp\include; + + + Windows + true + pykd.def + %(AdditionalLibraryDirectories) + + + copy $(OutDir)..\Debug\targetapp.exe $(OutDir) + + + + + + Level3 @@ -333,6 +472,29 @@ copy $(OutDir)..\Release\targetapp.exe $(OutDir) + + + Level3 + Use + MaxSpeed + true + true + WIN32;NDEBUG;_WINDOWS;_USRDLL;PYKD_EXPORTS;%(PreprocessorDefinitions) + $(ProjectDir)..\kdlibcpp\include + MultiThreaded + + + Windows + true + true + true + pykd.def + %(AdditionalLibraryDirectories) + + + copy $(OutDir)..\Release\targetapp.exe $(OutDir) + + Level3 @@ -379,6 +541,29 @@ copy $(OutDir)..\Release\targetapp.exe $(OutDir) + + + Level3 + Use + MaxSpeed + true + true + WIN32;NDEBUG;_WINDOWS;_USRDLL;PYKD_EXPORTS;%(PreprocessorDefinitions) + $(ProjectDir)..\kdlibcpp\include; + MultiThreaded + + + Windows + true + true + true + pykd.def + %(AdditionalLibraryDirectories) + + + copy $(OutDir)..\Release\targetapp.exe $(OutDir) + + @@ -411,12 +596,16 @@ /bigobj %(AdditionalOptions) + /bigobj %(AdditionalOptions) /bigobj %(AdditionalOptions) /bigobj %(AdditionalOptions) + /bigobj %(AdditionalOptions) /bigobj %(AdditionalOptions) /bigobj %(AdditionalOptions) + /bigobj %(AdditionalOptions) /bigobj %(AdditionalOptions) /bigobj %(AdditionalOptions) + /bigobj %(AdditionalOptions) /bigobj %(AdditionalOptions) @@ -426,12 +615,16 @@ Create Create + Create Create Create + Create Create Create + Create Create Create + Create @@ -455,6 +648,7 @@ + @@ -474,5 +668,6 @@ + \ No newline at end of file diff --git a/setup/buildall.cmd b/setup/buildall.cmd index f746ea3..f3cb827 100644 --- a/setup/buildall.cmd +++ b/setup/buildall.cmd @@ -1,9 +1,14 @@ py -2.7 setup.py bdist_zip --plat-name=win32 py -2.7 setup.py bdist_zip --plat-name=win-amd64 -py -2.7 setup.py bdist_wheel --plat-name=win32 -py -2.7 setup.py bdist_wheel --plat-name=win-amd64 +py -2.7 setup.py bdist_wheel --plat-name=win32 --python-tag=cp27 +py -2.7 setup.py bdist_wheel --plat-name=win-amd64 --python-tag=cp27 py -3.5 setup.py bdist_zip --plat-name=win32 py -3.5 setup.py bdist_zip --plat-name=win-amd64 -py -3.5 setup.py bdist_wheel --plat-name=win32 -py -3.5 setup.py bdist_wheel --plat-name=win-amd64 \ No newline at end of file +py -3.5 setup.py bdist_wheel --plat-name=win32 --python-tag=cp35 +py -3.5 setup.py bdist_wheel --plat-name=win-amd64 --python-tag=cp35 + +py -3.6 setup.py bdist_zip --plat-name=win32 +py -3.6 setup.py bdist_zip --plat-name=win-amd64 +py -3.6 setup.py bdist_wheel --plat-name=win32 --python-tag=cp36 +py -3.6 setup.py bdist_wheel --plat-name=win-amd64 --python-tag=cp36 \ No newline at end of file diff --git a/setup/setup.py b/setup/setup.py index 07cddc8..95f697a 100644 --- a/setup/setup.py +++ b/setup/setup.py @@ -1,7 +1,6 @@ from setuptools import setup -from setuptools.dist import Distribution -import pkg_resources -import argparse +from wheel.bdist_wheel import bdist_wheel + import os import shutil import zipfile @@ -9,12 +8,12 @@ import sys _name = "pykd" _desc = "python windbg extension" -_version = '0.3.0.39' +_version = '0.3.1.8' def getReleaseSrc(): return 'Release_%d.%d' % sys.version_info[0:2] -def makeWheel(args): +if "bdist_wheel" in sys.argv: # remove build catalog build_dir = os.path.join(os.path.curdir, 'build' ) @@ -31,10 +30,10 @@ def makeWheel(args): bin_dir = os.path.join( os.path.curdir, '..', 'bin') pykd_dir = os.path.join( os.path.curdir, '..', 'out') - if args.plat_name == 'win32': + if "--plat-name=win32" in sys.argv: bin_dir = os.path.join( bin_dir, 'x86') pykd_dir = os.path.join(pykd_dir, 'Win32', getReleaseSrc()) - elif args.plat_name == 'win-amd64': + elif "--plat-name=win-amd64" in sys.argv: bin_dir = os.path.join( bin_dir, 'x64') pykd_dir = os.path.join(pykd_dir, 'X64', getReleaseSrc()) else: @@ -47,25 +46,27 @@ def makeWheel(args): shutil.copy( os.path.join(pykd_dir, 'pykd.pyd'), os.path.join(package_dir, 'pykd.pyd') ) - class BinaryDistribution(Distribution): - def is_pure(self): - return False - setup( name = _name, version = _version, description = _desc, + # cmdclass = { 'bdist_wheel' : bdist_wheel }, packages = ['pykd'], package_dir = {'pykd': package_dir}, package_data = { 'pykd' :["*.pyd", "*.dll"]}, include_package_data=True, - zip_safe = False, - distclass = BinaryDistribution, + zip_safe = False ) -def makeZip(args): +elif "bdist_zip" in sys.argv: + #make package catalog + if "--plat-name=win32" in sys.argv: + plat_name="win32" + elif "--plat-name=win-amd64" in sys.argv: + plat_name="win-amd64" + package_dir = os.path.join(os.path.curdir, _name ) if os.path.exists(package_dir): shutil.rmtree(package_dir) @@ -73,10 +74,10 @@ def makeZip(args): bin_dir = os.path.join( os.path.curdir, '..', 'bin') pykd_dir = os.path.join( os.path.curdir, '..', 'out') - if args.plat_name == 'win32': + if plat_name=="win32": bin_dir = os.path.join( bin_dir, 'x86') pykd_dir = os.path.join(pykd_dir, 'Win32', getReleaseSrc()) - elif args.plat_name == 'win-amd64': + elif plat_name=="win-amd64": bin_dir = os.path.join( bin_dir, 'x64') pykd_dir = os.path.join(pykd_dir, 'X64', getReleaseSrc()) else: @@ -84,7 +85,7 @@ def makeZip(args): pyver="%d%d" % sys.version_info[0:2] - zip_str = "pykd-%s-py%s-%s" % ( _version, pyver, args.plat_name ) + zip_str = "pykd-%s-cp%s-%s" % ( _version, pyver, plat_name ) zip_name = zip_str + ".zip" assert(os.path.isdir(bin_dir)) @@ -108,18 +109,140 @@ def makeZip(args): -parser = argparse.ArgumentParser() - -subparsers = parser.add_subparsers() -wheelParser = subparsers.add_parser('bdist_wheel') -wheelParser.add_argument('--plat-name', choices = ['win32', 'win-amd64'], default=pkg_resources.get_build_platform() ) -wheelParser.set_defaults(func=makeWheel) - -zipParser = subparsers.add_parser('bdist_zip') -zipParser.add_argument('--plat-name', choices = ['win32', 'win-amd64'], default=pkg_resources.get_build_platform() ) -zipParser.set_defaults(func=makeZip) - -args = parser.parse_args() -args.func(args) + + + + + + + + + + + + + +#from setuptools import setup +#from wheel.bdist_wheel import bdist_wheel +#import pkg_resources +#import argparse +#import os +#import shutil +#import zipfile +#import sys + +#_name = "pykd" +#_desc = "python windbg extension" +#_version = '0.3.1.2' + +#def getReleaseSrc(): +# return 'Release_%d.%d' % sys.version_info[0:2] + +#def makeWheel(args): + +# # remove build catalog +# build_dir = os.path.join(os.path.curdir, 'build' ) +# if os.path.exists(build_dir): +# shutil.rmtree(build_dir) + +# # make package catalog +# package_dir = os.path.join(os.path.curdir, _name ) +# if os.path.exists(package_dir): +# shutil.rmtree(package_dir) +# os.mkdir(package_dir) + +# shutil.copy("__init__.py", package_dir) + +# bin_dir = os.path.join( os.path.curdir, '..', 'bin') +# pykd_dir = os.path.join( os.path.curdir, '..', 'out') +# if args.plat_name == 'win32': +# bin_dir = os.path.join( bin_dir, 'x86') +# pykd_dir = os.path.join(pykd_dir, 'Win32', getReleaseSrc()) +# elif args.plat_name == 'win-amd64': +# bin_dir = os.path.join( bin_dir, 'x64') +# pykd_dir = os.path.join(pykd_dir, 'X64', getReleaseSrc()) +# else: +# assert(0) + +# assert(os.path.isdir(bin_dir)) + +# for binFile in [ f for f in os.listdir(bin_dir) if not os.path.isdir(f) ]: +# shutil.copy( os.path.join(bin_dir, binFile), os.path.join(package_dir, binFile) ) + +# shutil.copy( os.path.join(pykd_dir, 'pykd.pyd'), os.path.join(package_dir, 'pykd.pyd') ) + +# setup( +# name = _name, +# version = _version, +# description = _desc, +# cmdclass = { 'bdist_wheel' : bdist_wheel }, +# packages = ['pykd'], +# package_dir = {'pykd': package_dir}, +# package_data = { 'pykd' :["*.pyd", "*.dll"]}, +# include_package_data=True, +# zip_safe = False, +# universal = True, +# #python_tag = args.python_tag +# ) + +#def makeZip(args): +# #make package catalog + +# package_dir = os.path.join(os.path.curdir, _name ) +# if os.path.exists(package_dir): +# shutil.rmtree(package_dir) +# os.mkdir(package_dir) + +# bin_dir = os.path.join( os.path.curdir, '..', 'bin') +# pykd_dir = os.path.join( os.path.curdir, '..', 'out') +# if args.plat_name == 'win32': +# bin_dir = os.path.join( bin_dir, 'x86') +# pykd_dir = os.path.join(pykd_dir, 'Win32', getReleaseSrc()) +# elif args.plat_name == 'win-amd64': +# bin_dir = os.path.join( bin_dir, 'x64') +# pykd_dir = os.path.join(pykd_dir, 'X64', getReleaseSrc()) +# else: +# assert(0) + +# pyver="%d%d" % sys.version_info[0:2] + +# zip_str = "pykd-%s-py%s-%s" % ( _version, pyver, args.plat_name ) +# zip_name = zip_str + ".zip" + +# assert(os.path.isdir(bin_dir)) + +# for binFile in [ f for f in os.listdir(bin_dir) if not os.path.isdir(f) ]: +# shutil.copy( os.path.join(bin_dir, binFile), os.path.join(package_dir, binFile) ) + +# shutil.copy( os.path.join(pykd_dir, 'pykd.pyd'), os.path.join(package_dir, 'pykd.pyd') ) + +# dist_dir = os.path.join(os.path.curdir, 'dist') +# if not os.path.exists(dist_dir): +# os.mkdir(dist_dir) + +# with zipfile.ZipFile(os.path.join(os.path.curdir, 'dist', zip_name), mode='w' ) as archive: +# for srcFile in os.listdir(package_dir): +# print( "zipped %s" % (srcFile) ) +# archive.write( os.path.join(package_dir, srcFile), compress_type = zipfile.ZIP_DEFLATED) + +# print("OK") + + + + +#parser = argparse.ArgumentParser() + +#subparsers = parser.add_subparsers() +#wheelParser = subparsers.add_parser('bdist_wheel') +#wheelParser.add_argument('--plat-name', choices = ['win32', 'win-amd64'], default=pkg_resources.get_build_platform() ) +#wheelParser.add_argument('--python-tag', choices=['2.7', '3.5']) +#wheelParser.set_defaults(func=makeWheel) + +#zipParser = subparsers.add_parser('bdist_zip') +#zipParser.add_argument('--plat-name', choices = ['win32', 'win-amd64'], default=pkg_resources.get_build_platform() ) +#zipParser.set_defaults(func=makeZip) + +#args = parser.parse_args() +#args.func(args)