From 05ccbc9cf8bffac6aedea2c45e91ac125e0a6eef Mon Sep 17 00:00:00 2001 From: Colin Xu Date: Mon, 10 Feb 2025 16:42:02 +0800 Subject: [PATCH] Update pykd post-build events and package setup.py. kdlibcpp has changed the location of DIA SDK and WinDbg Engine binaries. Signed-off-by: Colin Xu --- pykd/pykd.vcxproj | 61 +++++++++++++++++++++++++++++++---------------- setup/setup.py | 5 +++- 2 files changed, 45 insertions(+), 21 deletions(-) diff --git a/pykd/pykd.vcxproj b/pykd/pykd.vcxproj index 60ce120..652030f 100644 --- a/pykd/pykd.vcxproj +++ b/pykd/pykd.vcxproj @@ -1799,7 +1799,8 @@ popd libboost_python27-vc$(PlatformToolsetVersion)-mt-s-x32-1_87.lib;ntdll.lib;Version.lib;clangAnalysis.lib;clangAPINotes.lib;clangAST.lib;clangASTMatchers.lib;clangBasic.lib;clangDriver.lib;clangEdit.lib;clangFrontend.lib;clangLex.lib;clangParse.lib;clangSema.lib;clangSerialization.lib;clangSupport.lib;clangTooling.lib;LLVMAnalysis.lib;LLVMAsmParser.lib;LLVMBinaryFormat.lib;LLVMBitReader.lib;LLVMBitstreamReader.lib;LLVMCore.lib;LLVMDebugInfoDWARF.lib;LLVMDemangle.lib;LLVMFrontendAtomic.lib;LLVMFrontendOffloading.lib;LLVMFrontendOpenMP.lib;LLVMIRReader.lib;LLVMMC.lib;LLVMMCParser.lib;LLVMObject.lib;LLVMOption.lib;LLVMProfileData.lib;LLVMRemarks.lib;LLVMScalarOpts.lib;LLVMSupport.lib;LLVMTargetParser.lib;LLVMTextAPI.lib;LLVMTransformUtils.lib;LLVMWindowsDriver.lib;%(AdditionalDependencies) - $(SolutionDir)packages\python2x86.$(PythonVersion)\tools\python.exe -m pip install --user gitpython setuptools wheel + xcopy /Y "$(VCInstallDir)..\DIA SDK\bin\msdia140.dll" "$(IntDir)" +$(SolutionDir)packages\python2x86.$(PythonVersion)\tools\python.exe -m pip install --user gitpython setuptools wheel $(SolutionDir)packages\python2x86.$(PythonVersion)\tools\python.exe $(SolutionDir)setup\setup.py bdist_wheel --plat-name=$(Platform) --build-base=$(SolutionDir)Obj\Wheel\$(Platform)\$(Configuration)\setuptools --dist-dir=$(SolutionDir)Out\$(Platform)\$(Configuration) --egg-base=$(SolutionDir)Obj\Wheel\$(Platform)\$(Configuration)\setuptools bdist_zip @@ -1841,7 +1842,8 @@ popd libboost_python35-vc$(PlatformToolsetVersion)-mt-s-x32-1_87.lib;ntdll.lib;Version.lib;clangAnalysis.lib;clangAPINotes.lib;clangAST.lib;clangASTMatchers.lib;clangBasic.lib;clangDriver.lib;clangEdit.lib;clangFrontend.lib;clangLex.lib;clangParse.lib;clangSema.lib;clangSerialization.lib;clangSupport.lib;clangTooling.lib;LLVMAnalysis.lib;LLVMAsmParser.lib;LLVMBinaryFormat.lib;LLVMBitReader.lib;LLVMBitstreamReader.lib;LLVMCore.lib;LLVMDebugInfoDWARF.lib;LLVMDemangle.lib;LLVMFrontendAtomic.lib;LLVMFrontendOffloading.lib;LLVMFrontendOpenMP.lib;LLVMIRReader.lib;LLVMMC.lib;LLVMMCParser.lib;LLVMObject.lib;LLVMOption.lib;LLVMProfileData.lib;LLVMRemarks.lib;LLVMScalarOpts.lib;LLVMSupport.lib;LLVMTargetParser.lib;LLVMTextAPI.lib;LLVMTransformUtils.lib;LLVMWindowsDriver.lib;%(AdditionalDependencies) - $(SolutionDir)packages\pythonx86.$(PythonVersion)\tools\python.exe -m pip install --user gitpython setuptools wheel + xcopy /Y "$(VCInstallDir)..\DIA SDK\bin\msdia140.dll" "$(IntDir)" +$(SolutionDir)packages\pythonx86.$(PythonVersion)\tools\python.exe -m pip install --user gitpython setuptools wheel $(SolutionDir)packages\pythonx86.$(PythonVersion)\tools\python.exe $(SolutionDir)setup\setup.py bdist_wheel --plat-name=$(Platform) --build-base=$(SolutionDir)Obj\Wheel\$(Platform)\$(Configuration)\setuptools --dist-dir=$(SolutionDir)Out\$(Platform)\$(Configuration) --egg-base=$(SolutionDir)Obj\Wheel\$(Platform)\$(Configuration)\setuptools bdist_zip @@ -1883,7 +1885,8 @@ popd libboost_python36-vc$(PlatformToolsetVersion)-mt-s-x32-1_87.lib;ntdll.lib;Version.lib;clangAnalysis.lib;clangAPINotes.lib;clangAST.lib;clangASTMatchers.lib;clangBasic.lib;clangDriver.lib;clangEdit.lib;clangFrontend.lib;clangLex.lib;clangParse.lib;clangSema.lib;clangSerialization.lib;clangSupport.lib;clangTooling.lib;LLVMAnalysis.lib;LLVMAsmParser.lib;LLVMBinaryFormat.lib;LLVMBitReader.lib;LLVMBitstreamReader.lib;LLVMCore.lib;LLVMDebugInfoDWARF.lib;LLVMDemangle.lib;LLVMFrontendAtomic.lib;LLVMFrontendOffloading.lib;LLVMFrontendOpenMP.lib;LLVMIRReader.lib;LLVMMC.lib;LLVMMCParser.lib;LLVMObject.lib;LLVMOption.lib;LLVMProfileData.lib;LLVMRemarks.lib;LLVMScalarOpts.lib;LLVMSupport.lib;LLVMTargetParser.lib;LLVMTextAPI.lib;LLVMTransformUtils.lib;LLVMWindowsDriver.lib;%(AdditionalDependencies) - $(SolutionDir)packages\pythonx86.$(PythonVersion)\tools\python.exe -m pip install --user gitpython setuptools wheel + xcopy /Y "$(VCInstallDir)..\DIA SDK\bin\msdia140.dll" "$(IntDir)" +$(SolutionDir)packages\pythonx86.$(PythonVersion)\tools\python.exe -m pip install --user gitpython setuptools wheel $(SolutionDir)packages\pythonx86.$(PythonVersion)\tools\python.exe $(SolutionDir)setup\setup.py bdist_wheel --plat-name=$(Platform) --build-base=$(SolutionDir)Obj\Wheel\$(Platform)\$(Configuration)\setuptools --dist-dir=$(SolutionDir)Out\$(Platform)\$(Configuration) --egg-base=$(SolutionDir)Obj\Wheel\$(Platform)\$(Configuration)\setuptools bdist_zip @@ -1925,7 +1928,8 @@ popd libboost_python37-vc$(PlatformToolsetVersion)-mt-s-x32-1_87.lib;ntdll.lib;Version.lib;clangAnalysis.lib;clangAPINotes.lib;clangAST.lib;clangASTMatchers.lib;clangBasic.lib;clangDriver.lib;clangEdit.lib;clangFrontend.lib;clangLex.lib;clangParse.lib;clangSema.lib;clangSerialization.lib;clangSupport.lib;clangTooling.lib;LLVMAnalysis.lib;LLVMAsmParser.lib;LLVMBinaryFormat.lib;LLVMBitReader.lib;LLVMBitstreamReader.lib;LLVMCore.lib;LLVMDebugInfoDWARF.lib;LLVMDemangle.lib;LLVMFrontendAtomic.lib;LLVMFrontendOffloading.lib;LLVMFrontendOpenMP.lib;LLVMIRReader.lib;LLVMMC.lib;LLVMMCParser.lib;LLVMObject.lib;LLVMOption.lib;LLVMProfileData.lib;LLVMRemarks.lib;LLVMScalarOpts.lib;LLVMSupport.lib;LLVMTargetParser.lib;LLVMTextAPI.lib;LLVMTransformUtils.lib;LLVMWindowsDriver.lib;%(AdditionalDependencies) - $(SolutionDir)packages\pythonx86.$(PythonVersion)\tools\python.exe -m pip install --user gitpython setuptools wheel + xcopy /Y "$(VCInstallDir)..\DIA SDK\bin\msdia140.dll" "$(IntDir)" +$(SolutionDir)packages\pythonx86.$(PythonVersion)\tools\python.exe -m pip install --user gitpython setuptools wheel $(SolutionDir)packages\pythonx86.$(PythonVersion)\tools\python.exe $(SolutionDir)setup\setup.py bdist_wheel --plat-name=$(Platform) --build-base=$(SolutionDir)Obj\Wheel\$(Platform)\$(Configuration)\setuptools --dist-dir=$(SolutionDir)Out\$(Platform)\$(Configuration) --egg-base=$(SolutionDir)Obj\Wheel\$(Platform)\$(Configuration)\setuptools bdist_zip @@ -1967,7 +1971,8 @@ popd libboost_python38-vc$(PlatformToolsetVersion)-mt-s-x32-1_87.lib;ntdll.lib;Version.lib;clangAnalysis.lib;clangAPINotes.lib;clangAST.lib;clangASTMatchers.lib;clangBasic.lib;clangDriver.lib;clangEdit.lib;clangFrontend.lib;clangLex.lib;clangParse.lib;clangSema.lib;clangSerialization.lib;clangSupport.lib;clangTooling.lib;LLVMAnalysis.lib;LLVMAsmParser.lib;LLVMBinaryFormat.lib;LLVMBitReader.lib;LLVMBitstreamReader.lib;LLVMCore.lib;LLVMDebugInfoDWARF.lib;LLVMDemangle.lib;LLVMFrontendAtomic.lib;LLVMFrontendOffloading.lib;LLVMFrontendOpenMP.lib;LLVMIRReader.lib;LLVMMC.lib;LLVMMCParser.lib;LLVMObject.lib;LLVMOption.lib;LLVMProfileData.lib;LLVMRemarks.lib;LLVMScalarOpts.lib;LLVMSupport.lib;LLVMTargetParser.lib;LLVMTextAPI.lib;LLVMTransformUtils.lib;LLVMWindowsDriver.lib;%(AdditionalDependencies) - $(SolutionDir)packages\pythonx86.$(PythonVersion)\tools\python.exe -m pip install --user gitpython setuptools wheel + xcopy /Y "$(VCInstallDir)..\DIA SDK\bin\msdia140.dll" "$(IntDir)" +$(SolutionDir)packages\pythonx86.$(PythonVersion)\tools\python.exe -m pip install --user gitpython setuptools wheel $(SolutionDir)packages\pythonx86.$(PythonVersion)\tools\python.exe $(SolutionDir)setup\setup.py bdist_wheel --plat-name=$(Platform) --build-base=$(SolutionDir)Obj\Wheel\$(Platform)\$(Configuration)\setuptools --dist-dir=$(SolutionDir)Out\$(Platform)\$(Configuration) --egg-base=$(SolutionDir)Obj\Wheel\$(Platform)\$(Configuration)\setuptools bdist_zip @@ -2009,7 +2014,8 @@ popd libboost_python39-vc$(PlatformToolsetVersion)-mt-s-x32-1_87.lib;ntdll.lib;Version.lib;clangAnalysis.lib;clangAPINotes.lib;clangAST.lib;clangASTMatchers.lib;clangBasic.lib;clangDriver.lib;clangEdit.lib;clangFrontend.lib;clangLex.lib;clangParse.lib;clangSema.lib;clangSerialization.lib;clangSupport.lib;clangTooling.lib;LLVMAnalysis.lib;LLVMAsmParser.lib;LLVMBinaryFormat.lib;LLVMBitReader.lib;LLVMBitstreamReader.lib;LLVMCore.lib;LLVMDebugInfoDWARF.lib;LLVMDemangle.lib;LLVMFrontendAtomic.lib;LLVMFrontendOffloading.lib;LLVMFrontendOpenMP.lib;LLVMIRReader.lib;LLVMMC.lib;LLVMMCParser.lib;LLVMObject.lib;LLVMOption.lib;LLVMProfileData.lib;LLVMRemarks.lib;LLVMScalarOpts.lib;LLVMSupport.lib;LLVMTargetParser.lib;LLVMTextAPI.lib;LLVMTransformUtils.lib;LLVMWindowsDriver.lib;%(AdditionalDependencies) - $(SolutionDir)packages\pythonx86.$(PythonVersion)\tools\python.exe -m pip install --user gitpython setuptools wheel + xcopy /Y "$(VCInstallDir)..\DIA SDK\bin\msdia140.dll" "$(IntDir)" +$(SolutionDir)packages\pythonx86.$(PythonVersion)\tools\python.exe -m pip install --user gitpython setuptools wheel $(SolutionDir)packages\pythonx86.$(PythonVersion)\tools\python.exe $(SolutionDir)setup\setup.py bdist_wheel --plat-name=$(Platform) --build-base=$(SolutionDir)Obj\Wheel\$(Platform)\$(Configuration)\setuptools --dist-dir=$(SolutionDir)Out\$(Platform)\$(Configuration) --egg-base=$(SolutionDir)Obj\Wheel\$(Platform)\$(Configuration)\setuptools bdist_zip @@ -2051,7 +2057,8 @@ popd libboost_python310-vc$(PlatformToolsetVersion)-mt-s-x32-1_87.lib;ntdll.lib;Version.lib;clangAnalysis.lib;clangAPINotes.lib;clangAST.lib;clangASTMatchers.lib;clangBasic.lib;clangDriver.lib;clangEdit.lib;clangFrontend.lib;clangLex.lib;clangParse.lib;clangSema.lib;clangSerialization.lib;clangSupport.lib;clangTooling.lib;LLVMAnalysis.lib;LLVMAsmParser.lib;LLVMBinaryFormat.lib;LLVMBitReader.lib;LLVMBitstreamReader.lib;LLVMCore.lib;LLVMDebugInfoDWARF.lib;LLVMDemangle.lib;LLVMFrontendAtomic.lib;LLVMFrontendOffloading.lib;LLVMFrontendOpenMP.lib;LLVMIRReader.lib;LLVMMC.lib;LLVMMCParser.lib;LLVMObject.lib;LLVMOption.lib;LLVMProfileData.lib;LLVMRemarks.lib;LLVMScalarOpts.lib;LLVMSupport.lib;LLVMTargetParser.lib;LLVMTextAPI.lib;LLVMTransformUtils.lib;LLVMWindowsDriver.lib;%(AdditionalDependencies) - $(SolutionDir)packages\pythonx86.$(PythonVersion)\tools\python.exe -m pip install --user gitpython setuptools wheel + xcopy /Y "$(VCInstallDir)..\DIA SDK\bin\msdia140.dll" "$(IntDir)" +$(SolutionDir)packages\pythonx86.$(PythonVersion)\tools\python.exe -m pip install --user gitpython setuptools wheel $(SolutionDir)packages\pythonx86.$(PythonVersion)\tools\python.exe $(SolutionDir)setup\setup.py bdist_wheel --plat-name=$(Platform) --build-base=$(SolutionDir)Obj\Wheel\$(Platform)\$(Configuration)\setuptools --dist-dir=$(SolutionDir)Out\$(Platform)\$(Configuration) --egg-base=$(SolutionDir)Obj\Wheel\$(Platform)\$(Configuration)\setuptools bdist_zip @@ -2093,7 +2100,8 @@ popd libboost_python311-vc$(PlatformToolsetVersion)-mt-s-x32-1_87.lib;ntdll.lib;Version.lib;clangAnalysis.lib;clangAPINotes.lib;clangAST.lib;clangASTMatchers.lib;clangBasic.lib;clangDriver.lib;clangEdit.lib;clangFrontend.lib;clangLex.lib;clangParse.lib;clangSema.lib;clangSerialization.lib;clangSupport.lib;clangTooling.lib;LLVMAnalysis.lib;LLVMAsmParser.lib;LLVMBinaryFormat.lib;LLVMBitReader.lib;LLVMBitstreamReader.lib;LLVMCore.lib;LLVMDebugInfoDWARF.lib;LLVMDemangle.lib;LLVMFrontendAtomic.lib;LLVMFrontendOffloading.lib;LLVMFrontendOpenMP.lib;LLVMIRReader.lib;LLVMMC.lib;LLVMMCParser.lib;LLVMObject.lib;LLVMOption.lib;LLVMProfileData.lib;LLVMRemarks.lib;LLVMScalarOpts.lib;LLVMSupport.lib;LLVMTargetParser.lib;LLVMTextAPI.lib;LLVMTransformUtils.lib;LLVMWindowsDriver.lib;%(AdditionalDependencies) - $(SolutionDir)packages\pythonx86.$(PythonVersion)\tools\python.exe -m pip install --user gitpython setuptools wheel + xcopy /Y "$(VCInstallDir)..\DIA SDK\bin\msdia140.dll" "$(IntDir)" +$(SolutionDir)packages\pythonx86.$(PythonVersion)\tools\python.exe -m pip install --user gitpython setuptools wheel $(SolutionDir)packages\pythonx86.$(PythonVersion)\tools\python.exe $(SolutionDir)setup\setup.py bdist_wheel --plat-name=$(Platform) --build-base=$(SolutionDir)Obj\Wheel\$(Platform)\$(Configuration)\setuptools --dist-dir=$(SolutionDir)Out\$(Platform)\$(Configuration) --egg-base=$(SolutionDir)Obj\Wheel\$(Platform)\$(Configuration)\setuptools bdist_zip @@ -2135,7 +2143,8 @@ popd libboost_python312-vc$(PlatformToolsetVersion)-mt-s-x32-1_87.lib;ntdll.lib;Version.lib;clangAnalysis.lib;clangAPINotes.lib;clangAST.lib;clangASTMatchers.lib;clangBasic.lib;clangDriver.lib;clangEdit.lib;clangFrontend.lib;clangLex.lib;clangParse.lib;clangSema.lib;clangSerialization.lib;clangSupport.lib;clangTooling.lib;LLVMAnalysis.lib;LLVMAsmParser.lib;LLVMBinaryFormat.lib;LLVMBitReader.lib;LLVMBitstreamReader.lib;LLVMCore.lib;LLVMDebugInfoDWARF.lib;LLVMDemangle.lib;LLVMFrontendAtomic.lib;LLVMFrontendOffloading.lib;LLVMFrontendOpenMP.lib;LLVMIRReader.lib;LLVMMC.lib;LLVMMCParser.lib;LLVMObject.lib;LLVMOption.lib;LLVMProfileData.lib;LLVMRemarks.lib;LLVMScalarOpts.lib;LLVMSupport.lib;LLVMTargetParser.lib;LLVMTextAPI.lib;LLVMTransformUtils.lib;LLVMWindowsDriver.lib;%(AdditionalDependencies) - $(SolutionDir)packages\pythonx86.$(PythonVersion)\tools\python.exe -m pip install --user gitpython setuptools wheel + xcopy /Y "$(VCInstallDir)..\DIA SDK\bin\msdia140.dll" "$(IntDir)" +$(SolutionDir)packages\pythonx86.$(PythonVersion)\tools\python.exe -m pip install --user gitpython setuptools wheel $(SolutionDir)packages\pythonx86.$(PythonVersion)\tools\python.exe $(SolutionDir)setup\setup.py bdist_wheel --plat-name=$(Platform) --build-base=$(SolutionDir)Obj\Wheel\$(Platform)\$(Configuration)\setuptools --dist-dir=$(SolutionDir)Out\$(Platform)\$(Configuration) --egg-base=$(SolutionDir)Obj\Wheel\$(Platform)\$(Configuration)\setuptools bdist_zip @@ -2177,7 +2186,8 @@ popd libboost_python313-vc$(PlatformToolsetVersion)-mt-s-x32-1_87.lib;ntdll.lib;Version.lib;clangAnalysis.lib;clangAPINotes.lib;clangAST.lib;clangASTMatchers.lib;clangBasic.lib;clangDriver.lib;clangEdit.lib;clangFrontend.lib;clangLex.lib;clangParse.lib;clangSema.lib;clangSerialization.lib;clangSupport.lib;clangTooling.lib;LLVMAnalysis.lib;LLVMAsmParser.lib;LLVMBinaryFormat.lib;LLVMBitReader.lib;LLVMBitstreamReader.lib;LLVMCore.lib;LLVMDebugInfoDWARF.lib;LLVMDemangle.lib;LLVMFrontendAtomic.lib;LLVMFrontendOffloading.lib;LLVMFrontendOpenMP.lib;LLVMIRReader.lib;LLVMMC.lib;LLVMMCParser.lib;LLVMObject.lib;LLVMOption.lib;LLVMProfileData.lib;LLVMRemarks.lib;LLVMScalarOpts.lib;LLVMSupport.lib;LLVMTargetParser.lib;LLVMTextAPI.lib;LLVMTransformUtils.lib;LLVMWindowsDriver.lib;%(AdditionalDependencies) - $(SolutionDir)packages\pythonx86.$(PythonVersion)\tools\python.exe -m pip install --user gitpython setuptools wheel + xcopy /Y "$(VCInstallDir)..\DIA SDK\bin\msdia140.dll" "$(IntDir)" +$(SolutionDir)packages\pythonx86.$(PythonVersion)\tools\python.exe -m pip install --user gitpython setuptools wheel $(SolutionDir)packages\pythonx86.$(PythonVersion)\tools\python.exe $(SolutionDir)setup\setup.py bdist_wheel --plat-name=$(Platform) --build-base=$(SolutionDir)Obj\Wheel\$(Platform)\$(Configuration)\setuptools --dist-dir=$(SolutionDir)Out\$(Platform)\$(Configuration) --egg-base=$(SolutionDir)Obj\Wheel\$(Platform)\$(Configuration)\setuptools bdist_zip @@ -2219,7 +2229,8 @@ popd libboost_python27-vc$(PlatformToolsetVersion)-mt-s-x64-1_87.lib;ntdll.lib;Version.lib;clangAnalysis.lib;clangAPINotes.lib;clangAST.lib;clangASTMatchers.lib;clangBasic.lib;clangDriver.lib;clangEdit.lib;clangFrontend.lib;clangLex.lib;clangParse.lib;clangSema.lib;clangSerialization.lib;clangSupport.lib;clangTooling.lib;LLVMAnalysis.lib;LLVMAsmParser.lib;LLVMBinaryFormat.lib;LLVMBitReader.lib;LLVMBitstreamReader.lib;LLVMCore.lib;LLVMDebugInfoDWARF.lib;LLVMDemangle.lib;LLVMFrontendAtomic.lib;LLVMFrontendOffloading.lib;LLVMFrontendOpenMP.lib;LLVMIRReader.lib;LLVMMC.lib;LLVMMCParser.lib;LLVMObject.lib;LLVMOption.lib;LLVMProfileData.lib;LLVMRemarks.lib;LLVMScalarOpts.lib;LLVMSupport.lib;LLVMTargetParser.lib;LLVMTextAPI.lib;LLVMTransformUtils.lib;LLVMWindowsDriver.lib;%(AdditionalDependencies) - $(SolutionDir)packages\python2.$(PythonVersion)\tools\python.exe -m pip install --user gitpython setuptools wheel + xcopy /Y "$(VCInstallDir)..\DIA SDK\bin\amd64\msdia140.dll" "$(IntDir)" +$(SolutionDir)packages\python2.$(PythonVersion)\tools\python.exe -m pip install --user gitpython setuptools wheel $(SolutionDir)packages\python2.$(PythonVersion)\tools\python.exe $(SolutionDir)setup\setup.py bdist_wheel --plat-name=$(Platform) --build-base=$(SolutionDir)Obj\Wheel\$(Platform)\$(Configuration)\setuptools --dist-dir=$(SolutionDir)Out\$(Platform)\$(Configuration) --egg-base=$(SolutionDir)Obj\Wheel\$(Platform)\$(Configuration)\setuptools bdist_zip @@ -2261,7 +2272,8 @@ popd libboost_python35-vc$(PlatformToolsetVersion)-mt-s-x64-1_87.lib;ntdll.lib;Version.lib;clangAnalysis.lib;clangAPINotes.lib;clangAST.lib;clangASTMatchers.lib;clangBasic.lib;clangDriver.lib;clangEdit.lib;clangFrontend.lib;clangLex.lib;clangParse.lib;clangSema.lib;clangSerialization.lib;clangSupport.lib;clangTooling.lib;LLVMAnalysis.lib;LLVMAsmParser.lib;LLVMBinaryFormat.lib;LLVMBitReader.lib;LLVMBitstreamReader.lib;LLVMCore.lib;LLVMDebugInfoDWARF.lib;LLVMDemangle.lib;LLVMFrontendAtomic.lib;LLVMFrontendOffloading.lib;LLVMFrontendOpenMP.lib;LLVMIRReader.lib;LLVMMC.lib;LLVMMCParser.lib;LLVMObject.lib;LLVMOption.lib;LLVMProfileData.lib;LLVMRemarks.lib;LLVMScalarOpts.lib;LLVMSupport.lib;LLVMTargetParser.lib;LLVMTextAPI.lib;LLVMTransformUtils.lib;LLVMWindowsDriver.lib;%(AdditionalDependencies) - $(SolutionDir)packages\python.$(PythonVersion)\tools\python.exe -m pip install --user gitpython setuptools wheel + xcopy /Y "$(VCInstallDir)..\DIA SDK\bin\amd64\msdia140.dll" "$(IntDir)" +$(SolutionDir)packages\python.$(PythonVersion)\tools\python.exe -m pip install --user gitpython setuptools wheel $(SolutionDir)packages\python.$(PythonVersion)\tools\python.exe $(SolutionDir)setup\setup.py bdist_wheel --plat-name=$(Platform) --build-base=$(SolutionDir)Obj\Wheel\$(Platform)\$(Configuration)\setuptools --dist-dir=$(SolutionDir)Out\$(Platform)\$(Configuration) --egg-base=$(SolutionDir)Obj\Wheel\$(Platform)\$(Configuration)\setuptools bdist_zip @@ -2303,7 +2315,8 @@ popd libboost_python36-vc$(PlatformToolsetVersion)-mt-s-x64-1_87.lib;ntdll.lib;Version.lib;clangAnalysis.lib;clangAPINotes.lib;clangAST.lib;clangASTMatchers.lib;clangBasic.lib;clangDriver.lib;clangEdit.lib;clangFrontend.lib;clangLex.lib;clangParse.lib;clangSema.lib;clangSerialization.lib;clangSupport.lib;clangTooling.lib;LLVMAnalysis.lib;LLVMAsmParser.lib;LLVMBinaryFormat.lib;LLVMBitReader.lib;LLVMBitstreamReader.lib;LLVMCore.lib;LLVMDebugInfoDWARF.lib;LLVMDemangle.lib;LLVMFrontendAtomic.lib;LLVMFrontendOffloading.lib;LLVMFrontendOpenMP.lib;LLVMIRReader.lib;LLVMMC.lib;LLVMMCParser.lib;LLVMObject.lib;LLVMOption.lib;LLVMProfileData.lib;LLVMRemarks.lib;LLVMScalarOpts.lib;LLVMSupport.lib;LLVMTargetParser.lib;LLVMTextAPI.lib;LLVMTransformUtils.lib;LLVMWindowsDriver.lib;%(AdditionalDependencies) - $(SolutionDir)packages\python.$(PythonVersion)\tools\python.exe -m pip install --user gitpython setuptools wheel + xcopy /Y "$(VCInstallDir)..\DIA SDK\bin\amd64\msdia140.dll" "$(IntDir)" +$(SolutionDir)packages\python.$(PythonVersion)\tools\python.exe -m pip install --user gitpython setuptools wheel $(SolutionDir)packages\python.$(PythonVersion)\tools\python.exe $(SolutionDir)setup\setup.py bdist_wheel --plat-name=$(Platform) --build-base=$(SolutionDir)Obj\Wheel\$(Platform)\$(Configuration)\setuptools --dist-dir=$(SolutionDir)Out\$(Platform)\$(Configuration) --egg-base=$(SolutionDir)Obj\Wheel\$(Platform)\$(Configuration)\setuptools bdist_zip @@ -2345,7 +2358,9 @@ popd libboost_python37-vc$(PlatformToolsetVersion)-mt-s-x64-1_87.lib;ntdll.lib;Version.lib;clangAnalysis.lib;clangAPINotes.lib;clangAST.lib;clangASTMatchers.lib;clangBasic.lib;clangDriver.lib;clangEdit.lib;clangFrontend.lib;clangLex.lib;clangParse.lib;clangSema.lib;clangSerialization.lib;clangSupport.lib;clangTooling.lib;LLVMAnalysis.lib;LLVMAsmParser.lib;LLVMBinaryFormat.lib;LLVMBitReader.lib;LLVMBitstreamReader.lib;LLVMCore.lib;LLVMDebugInfoDWARF.lib;LLVMDemangle.lib;LLVMFrontendAtomic.lib;LLVMFrontendOffloading.lib;LLVMFrontendOpenMP.lib;LLVMIRReader.lib;LLVMMC.lib;LLVMMCParser.lib;LLVMObject.lib;LLVMOption.lib;LLVMProfileData.lib;LLVMRemarks.lib;LLVMScalarOpts.lib;LLVMSupport.lib;LLVMTargetParser.lib;LLVMTextAPI.lib;LLVMTransformUtils.lib;LLVMWindowsDriver.lib;%(AdditionalDependencies) - $(SolutionDir)packages\python.$(PythonVersion)\tools\python.exe -m pip install --user gitpython setuptools wheel + +xcopy /Y "$(VCInstallDir)..\DIA SDK\bin\amd64\msdia140.dll" "$(IntDir)" +$(SolutionDir)packages\python.$(PythonVersion)\tools\python.exe -m pip install --user gitpython setuptools wheel $(SolutionDir)packages\python.$(PythonVersion)\tools\python.exe $(SolutionDir)setup\setup.py bdist_wheel --plat-name=$(Platform) --build-base=$(SolutionDir)Obj\Wheel\$(Platform)\$(Configuration)\setuptools --dist-dir=$(SolutionDir)Out\$(Platform)\$(Configuration) --egg-base=$(SolutionDir)Obj\Wheel\$(Platform)\$(Configuration)\setuptools bdist_zip @@ -2387,7 +2402,8 @@ popd libboost_python38-vc$(PlatformToolsetVersion)-mt-s-x64-1_87.lib;ntdll.lib;Version.lib;clangAnalysis.lib;clangAPINotes.lib;clangAST.lib;clangASTMatchers.lib;clangBasic.lib;clangDriver.lib;clangEdit.lib;clangFrontend.lib;clangLex.lib;clangParse.lib;clangSema.lib;clangSerialization.lib;clangSupport.lib;clangTooling.lib;LLVMAnalysis.lib;LLVMAsmParser.lib;LLVMBinaryFormat.lib;LLVMBitReader.lib;LLVMBitstreamReader.lib;LLVMCore.lib;LLVMDebugInfoDWARF.lib;LLVMDemangle.lib;LLVMFrontendAtomic.lib;LLVMFrontendOffloading.lib;LLVMFrontendOpenMP.lib;LLVMIRReader.lib;LLVMMC.lib;LLVMMCParser.lib;LLVMObject.lib;LLVMOption.lib;LLVMProfileData.lib;LLVMRemarks.lib;LLVMScalarOpts.lib;LLVMSupport.lib;LLVMTargetParser.lib;LLVMTextAPI.lib;LLVMTransformUtils.lib;LLVMWindowsDriver.lib;%(AdditionalDependencies) - $(SolutionDir)packages\python.$(PythonVersion)\tools\python.exe -m pip install --user gitpython setuptools wheel + xcopy /Y "$(VCInstallDir)..\DIA SDK\bin\amd64\msdia140.dll" "$(IntDir)" +$(SolutionDir)packages\python.$(PythonVersion)\tools\python.exe -m pip install --user gitpython setuptools wheel $(SolutionDir)packages\python.$(PythonVersion)\tools\python.exe $(SolutionDir)setup\setup.py bdist_wheel --plat-name=$(Platform) --build-base=$(SolutionDir)Obj\Wheel\$(Platform)\$(Configuration)\setuptools --dist-dir=$(SolutionDir)Out\$(Platform)\$(Configuration) --egg-base=$(SolutionDir)Obj\Wheel\$(Platform)\$(Configuration)\setuptools bdist_zip @@ -2429,7 +2445,8 @@ popd libboost_python39-vc$(PlatformToolsetVersion)-mt-s-x64-1_87.lib;ntdll.lib;Version.lib;clangAnalysis.lib;clangAPINotes.lib;clangAST.lib;clangASTMatchers.lib;clangBasic.lib;clangDriver.lib;clangEdit.lib;clangFrontend.lib;clangLex.lib;clangParse.lib;clangSema.lib;clangSerialization.lib;clangSupport.lib;clangTooling.lib;LLVMAnalysis.lib;LLVMAsmParser.lib;LLVMBinaryFormat.lib;LLVMBitReader.lib;LLVMBitstreamReader.lib;LLVMCore.lib;LLVMDebugInfoDWARF.lib;LLVMDemangle.lib;LLVMFrontendAtomic.lib;LLVMFrontendOffloading.lib;LLVMFrontendOpenMP.lib;LLVMIRReader.lib;LLVMMC.lib;LLVMMCParser.lib;LLVMObject.lib;LLVMOption.lib;LLVMProfileData.lib;LLVMRemarks.lib;LLVMScalarOpts.lib;LLVMSupport.lib;LLVMTargetParser.lib;LLVMTextAPI.lib;LLVMTransformUtils.lib;LLVMWindowsDriver.lib;%(AdditionalDependencies) - $(SolutionDir)packages\python.$(PythonVersion)\tools\python.exe -m pip install --user gitpython setuptools wheel + xcopy /Y "$(VCInstallDir)..\DIA SDK\bin\amd64\msdia140.dll" "$(IntDir)" +$(SolutionDir)packages\python.$(PythonVersion)\tools\python.exe -m pip install --user gitpython setuptools wheel $(SolutionDir)packages\python.$(PythonVersion)\tools\python.exe $(SolutionDir)setup\setup.py bdist_wheel --plat-name=$(Platform) --build-base=$(SolutionDir)Obj\Wheel\$(Platform)\$(Configuration)\setuptools --dist-dir=$(SolutionDir)Out\$(Platform)\$(Configuration) --egg-base=$(SolutionDir)Obj\Wheel\$(Platform)\$(Configuration)\setuptools bdist_zip @@ -2471,7 +2488,8 @@ popd libboost_python310-vc$(PlatformToolsetVersion)-mt-s-x64-1_87.lib;ntdll.lib;Version.lib;clangAnalysis.lib;clangAPINotes.lib;clangAST.lib;clangASTMatchers.lib;clangBasic.lib;clangDriver.lib;clangEdit.lib;clangFrontend.lib;clangLex.lib;clangParse.lib;clangSema.lib;clangSerialization.lib;clangSupport.lib;clangTooling.lib;LLVMAnalysis.lib;LLVMAsmParser.lib;LLVMBinaryFormat.lib;LLVMBitReader.lib;LLVMBitstreamReader.lib;LLVMCore.lib;LLVMDebugInfoDWARF.lib;LLVMDemangle.lib;LLVMFrontendAtomic.lib;LLVMFrontendOffloading.lib;LLVMFrontendOpenMP.lib;LLVMIRReader.lib;LLVMMC.lib;LLVMMCParser.lib;LLVMObject.lib;LLVMOption.lib;LLVMProfileData.lib;LLVMRemarks.lib;LLVMScalarOpts.lib;LLVMSupport.lib;LLVMTargetParser.lib;LLVMTextAPI.lib;LLVMTransformUtils.lib;LLVMWindowsDriver.lib;%(AdditionalDependencies) - $(SolutionDir)packages\python.$(PythonVersion)\tools\python.exe -m pip install --user gitpython setuptools wheel + xcopy /Y "$(VCInstallDir)..\DIA SDK\bin\amd64\msdia140.dll" "$(IntDir)" +$(SolutionDir)packages\python.$(PythonVersion)\tools\python.exe -m pip install --user gitpython setuptools wheel $(SolutionDir)packages\python.$(PythonVersion)\tools\python.exe $(SolutionDir)setup\setup.py bdist_wheel --plat-name=$(Platform) --build-base=$(SolutionDir)Obj\Wheel\$(Platform)\$(Configuration)\setuptools --dist-dir=$(SolutionDir)Out\$(Platform)\$(Configuration) --egg-base=$(SolutionDir)Obj\Wheel\$(Platform)\$(Configuration)\setuptools bdist_zip @@ -2513,7 +2531,8 @@ popd libboost_python311-vc$(PlatformToolsetVersion)-mt-s-x64-1_87.lib;ntdll.lib;Version.lib;clangAnalysis.lib;clangAPINotes.lib;clangAST.lib;clangASTMatchers.lib;clangBasic.lib;clangDriver.lib;clangEdit.lib;clangFrontend.lib;clangLex.lib;clangParse.lib;clangSema.lib;clangSerialization.lib;clangSupport.lib;clangTooling.lib;LLVMAnalysis.lib;LLVMAsmParser.lib;LLVMBinaryFormat.lib;LLVMBitReader.lib;LLVMBitstreamReader.lib;LLVMCore.lib;LLVMDebugInfoDWARF.lib;LLVMDemangle.lib;LLVMFrontendAtomic.lib;LLVMFrontendOffloading.lib;LLVMFrontendOpenMP.lib;LLVMIRReader.lib;LLVMMC.lib;LLVMMCParser.lib;LLVMObject.lib;LLVMOption.lib;LLVMProfileData.lib;LLVMRemarks.lib;LLVMScalarOpts.lib;LLVMSupport.lib;LLVMTargetParser.lib;LLVMTextAPI.lib;LLVMTransformUtils.lib;LLVMWindowsDriver.lib;%(AdditionalDependencies) - $(SolutionDir)packages\python.$(PythonVersion)\tools\python.exe -m pip install --user gitpython setuptools wheel + xcopy /Y "$(VCInstallDir)..\DIA SDK\bin\amd64\msdia140.dll" "$(IntDir)" +$(SolutionDir)packages\python.$(PythonVersion)\tools\python.exe -m pip install --user gitpython setuptools wheel $(SolutionDir)packages\python.$(PythonVersion)\tools\python.exe $(SolutionDir)setup\setup.py bdist_wheel --plat-name=$(Platform) --build-base=$(SolutionDir)Obj\Wheel\$(Platform)\$(Configuration)\setuptools --dist-dir=$(SolutionDir)Out\$(Platform)\$(Configuration) --egg-base=$(SolutionDir)Obj\Wheel\$(Platform)\$(Configuration)\setuptools bdist_zip @@ -2555,7 +2574,8 @@ popd libboost_python312-vc$(PlatformToolsetVersion)-mt-s-x64-1_87.lib;ntdll.lib;Version.lib;clangAnalysis.lib;clangAPINotes.lib;clangAST.lib;clangASTMatchers.lib;clangBasic.lib;clangDriver.lib;clangEdit.lib;clangFrontend.lib;clangLex.lib;clangParse.lib;clangSema.lib;clangSerialization.lib;clangSupport.lib;clangTooling.lib;LLVMAnalysis.lib;LLVMAsmParser.lib;LLVMBinaryFormat.lib;LLVMBitReader.lib;LLVMBitstreamReader.lib;LLVMCore.lib;LLVMDebugInfoDWARF.lib;LLVMDemangle.lib;LLVMFrontendAtomic.lib;LLVMFrontendOffloading.lib;LLVMFrontendOpenMP.lib;LLVMIRReader.lib;LLVMMC.lib;LLVMMCParser.lib;LLVMObject.lib;LLVMOption.lib;LLVMProfileData.lib;LLVMRemarks.lib;LLVMScalarOpts.lib;LLVMSupport.lib;LLVMTargetParser.lib;LLVMTextAPI.lib;LLVMTransformUtils.lib;LLVMWindowsDriver.lib;%(AdditionalDependencies) - $(SolutionDir)packages\python.$(PythonVersion)\tools\python.exe -m pip install --user gitpython setuptools wheel + xcopy /Y "$(VCInstallDir)..\DIA SDK\bin\amd64\msdia140.dll" "$(IntDir)" +$(SolutionDir)packages\python.$(PythonVersion)\tools\python.exe -m pip install --user gitpython setuptools wheel $(SolutionDir)packages\python.$(PythonVersion)\tools\python.exe $(SolutionDir)setup\setup.py bdist_wheel --plat-name=$(Platform) --build-base=$(SolutionDir)Obj\Wheel\$(Platform)\$(Configuration)\setuptools --dist-dir=$(SolutionDir)Out\$(Platform)\$(Configuration) --egg-base=$(SolutionDir)Obj\Wheel\$(Platform)\$(Configuration)\setuptools bdist_zip @@ -2597,7 +2617,8 @@ popd libboost_python313-vc$(PlatformToolsetVersion)-mt-s-x64-1_87.lib;ntdll.lib;Version.lib;clangAnalysis.lib;clangAPINotes.lib;clangAST.lib;clangASTMatchers.lib;clangBasic.lib;clangDriver.lib;clangEdit.lib;clangFrontend.lib;clangLex.lib;clangParse.lib;clangSema.lib;clangSerialization.lib;clangSupport.lib;clangTooling.lib;LLVMAnalysis.lib;LLVMAsmParser.lib;LLVMBinaryFormat.lib;LLVMBitReader.lib;LLVMBitstreamReader.lib;LLVMCore.lib;LLVMDebugInfoDWARF.lib;LLVMDemangle.lib;LLVMFrontendAtomic.lib;LLVMFrontendOffloading.lib;LLVMFrontendOpenMP.lib;LLVMIRReader.lib;LLVMMC.lib;LLVMMCParser.lib;LLVMObject.lib;LLVMOption.lib;LLVMProfileData.lib;LLVMRemarks.lib;LLVMScalarOpts.lib;LLVMSupport.lib;LLVMTargetParser.lib;LLVMTextAPI.lib;LLVMTransformUtils.lib;LLVMWindowsDriver.lib;%(AdditionalDependencies) - $(SolutionDir)packages\python.$(PythonVersion)\tools\python.exe -m pip install --user gitpython setuptools wheel + xcopy /Y "$(VCInstallDir)..\DIA SDK\bin\amd64\msdia140.dll" "$(IntDir)" +$(SolutionDir)packages\python.$(PythonVersion)\tools\python.exe -m pip install --user gitpython setuptools wheel $(SolutionDir)packages\python.$(PythonVersion)\tools\python.exe $(SolutionDir)setup\setup.py bdist_wheel --plat-name=$(Platform) --build-base=$(SolutionDir)Obj\Wheel\$(Platform)\$(Configuration)\setuptools --dist-dir=$(SolutionDir)Out\$(Platform)\$(Configuration) --egg-base=$(SolutionDir)Obj\Wheel\$(Platform)\$(Configuration)\setuptools bdist_zip diff --git a/setup/setup.py b/setup/setup.py index 269ccc1..f82eee3 100644 --- a/setup/setup.py +++ b/setup/setup.py @@ -79,7 +79,7 @@ def main(): except: print("Skip using HEAD SHA as non git repo") - dir_dbgsdk_bin = os.path.join(dir_solution, 'kdlibcpp', 'bin', platform_alt) + dir_dbgsdk_bin = os.path.join(dir_solution, 'kdlibcpp', 'WinDbgExt', 'bin', platform_alt) if not os.path.exists(dir_dbgsdk_bin): print("DbgSDK bin path %s doesn't exist" %(dir_dbgsdk_bin)) sys.exit() @@ -128,6 +128,7 @@ def main(): shutil.copy2(os.path.join(dir_solution, 'setup', '__init__.py'), dir_wheel_package) shutil.copy2(os.path.join(dir_pykd_bin, 'pykd.pyd'), dir_wheel_package) + shutil.copy2(os.path.join(dir_solution, 'Obj', 'pykd', platform, "%s_%d.%d" %(configuration, sys.version_info.major, sys.version_info.minor), 'msdia140.dll'), dir_wheel_package) for dbgSdkBin in [ f for f in os.listdir(dir_dbgsdk_bin) if not os.path.isdir(f) ]: shutil.copy2(os.path.join(dir_dbgsdk_bin, dbgSdkBin), dir_wheel_package) @@ -159,6 +160,8 @@ def main(): zip_name = "pykd-%s-%s-%s.zip" %(_version, python_tag, args.plat_name) print("Building bdist_zip %s ..." %(zip_name)) with zipfile.ZipFile(os.path.join(dir_dist_wheel, zip_name), mode='w') as archive: + print("zipped msdia140.dll") + archive.write(os.path.join(dir_solution, 'Obj', 'pykd', platform, "%s_%d.%d" %(configuration, sys.version_info.major, sys.version_info.minor), 'msdia140.dll'), arcname = 'msdia140.dll', compress_type = zipfile.ZIP_DEFLATED) for dbgSdkBin in [ f for f in os.listdir(dir_dbgsdk_bin) if not os.path.isdir(f) ]: print("zipped %s" %(dbgSdkBin)) archive.write(os.path.join(dir_dbgsdk_bin, dbgSdkBin), arcname = dbgSdkBin, compress_type = zipfile.ZIP_DEFLATED)