zjgcjy/pykd
1
0
Fork 0
mirror of https://github.com/ivellioscolin/pykd.git synced 2025-04-20 03:23:23 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

[~] setup: incorporated vc_redist package.

Browse Source 
[~] setup: version increment.


git-svn-id: https://pykd.svn.codeplex.com/svn@68861 9b283d60-5439-405e-af05-b73fd8c4d996
This commit is contained in:
SND\air_max_cp 2011-08-09 08:36:54 +00:00
parent a200243a76
commit a1f689530c
4 changed files with 21 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
setup/pykd_logo.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 68 KiB

26
setup/pykd_setup_common.nsh
View File

@ -27,7 +27,7 @@ SetCompressor LZMA
!define PRODUCT_SHORT_NAME "pykd" !define PRODUCT_SHORT_NAME "pykd"
!define PRODUCT_FULL_NAME "Python extension for WinDbg" !define PRODUCT_FULL_NAME "Python extension for WinDbg"
!define PRODUCT_VERSION "0.0.0.18" !define PRODUCT_VERSION "0.0.0.19"
!define PRODUCT_URL "http://pykd.codeplex.com/" !define PRODUCT_URL "http://pykd.codeplex.com/"
!define PRODUCT_NAME_AND_VERSION "${PRODUCT_FULL_NAME} ${PRODUCT_ARCH} ${PRODUCT_VERSION}" !define PRODUCT_NAME_AND_VERSION "${PRODUCT_FULL_NAME} ${PRODUCT_ARCH} ${PRODUCT_VERSION}"
!define PRODUCT_MANUFACTURER "PyKd Team" !define PRODUCT_MANUFACTURER "PyKd Team"
@ -135,7 +135,7 @@ VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion" "${PRODUCT_VERSION}"
!macro _IsVcRuntimeInstalled _a _b _t _f !macro _IsVcRuntimeInstalled _a _b _t _f
!insertmacro _LOGICLIB_TEMP !insertmacro _LOGICLIB_TEMP
Push 'msvcr80.dll' Push 'msvcr80.dll'
Push 'Microsoft.VC80.CRT,version="8.0.50727.4053",type="win32",processorArchitecture="${ARCH}",publicKeyToken="1fc8b3b9a1e18e3b"' Push 'Microsoft.VC80.CRT,version="8.0.50727.6195",type="win32",processorArchitecture="${ARCH}",publicKeyToken="1fc8b3b9a1e18e3b"'
${WinSxS_HasAssembly} ${WinSxS_HasAssembly}
Pop $_LOGICLIB_TEMP Pop $_LOGICLIB_TEMP
!insertmacro _== $_LOGICLIB_TEMP 1 `${_t}` `${_f}` !insertmacro _== $_LOGICLIB_TEMP 1 `${_t}` `${_f}`
@ -218,23 +218,23 @@ Section "Python ${PYTHON_VERSION} ${PRODUCT_ARCH}" sec_python
SectionEnd SectionEnd
Section "Visual C++ 2005 SP1 (${PRODUCT_ARCH}) runtime" sec_vcruntime Section "Visual C++ 2005 SP1 (${PRODUCT_ARCH}) runtime" sec_vcruntime
DetailPrint "Downloading Microsoft Visual C++ 2005 SP1 (${PRODUCT_ARCH}) runtime library..."
inetc::get /CAPTION "${PRODUCT_SHORT_NAME}" /QUESTION "" /POPUP "" /TIMEOUT=30000 "${VCRUNTIME_URL}" "$TEMP\vcredist_${PRODUCT_ARCH}.exe" /END
Pop $0
${If} $0 == "OK"
DetailPrint "Successfully downloaded."
DetailPrint "Installing Microsoft Visual C++ 2005 SP1 (${PRODUCT_ARCH}) runtime library..." DetailPrint "Installing Microsoft Visual C++ 2005 SP1 (${PRODUCT_ARCH}) runtime library..."
IfErrors ClearErrorFlag
ClearErrorFlag: SetOutPath "$TEMP"
!if ${PRODUCT_ARCH} == "x64"
File "..\x64\Release\vcredist_${PRODUCT_ARCH}.exe"
!else
File "..\Release\vcredist_${PRODUCT_ARCH}.exe"
!endif
ExecWait "$TEMP\vcredist_${PRODUCT_ARCH}.exe" ExecWait "$TEMP\vcredist_${PRODUCT_ARCH}.exe"
IfErrors RuntimeInstallFailed IfErrors RuntimeInstallFailed
DetailPrint "Successfully installed." DetailPrint "Successfully installed."
${Else} Return
RuntimeInstallFailed: RuntimeInstallFailed:
DetailPrint "Operation failed. Installation will be continued without Visual C++ runtime." DetailPrint "Operation failed. Installation will be continued without Visual C++ runtime."
DetailPrint "Please download and install it manually from product download page:" DetailPrint "Please download and install it manually."
DetailPrint "${VCRUNTIME_URL}"
${EndIf}
SectionEnd SectionEnd
Section -FinishSection Section -FinishSection

4
setup/pykd_setup_x64.nsi
View File

@ -9,9 +9,7 @@
!define PYTHON_INSTALLER "python-2.6.6.amd64.msi" !define PYTHON_INSTALLER "python-2.6.6.amd64.msi"
!define PYTHON_PRODUCT_CODE "{6151CF20-0BD8-4023-A4A0-6A86DCFE58E6}" !define PYTHON_PRODUCT_CODE "{6151CF20-0BD8-4023-A4A0-6A86DCFE58E6}"
# Source http://www.microsoft.com/downloads/en/details.aspx?FamilyID=766a6af7-ec73-40ff-b072-9112bab119c2
# When changing VC runtime vesion don't forget to update ProductCode appropriately # When changing VC runtime vesion don't forget to update ProductCode appropriately
!define VCRUNTIME_URL "http://download.microsoft.com/download/6/B/B/6BB661D6-A8AE-4819-B79F-236472F6070C/vcredist_x64.exe" !define VCRUNTIME_PRODUCT_CODE "{ad8a2fa1-06e7-4b0d-927d-6e54b3d31028}"
!define VCRUNTIME_PRODUCT_CODE "{6ce5bae9-d3ca-4b99-891a-1dc6c118a5fc}"
!include "pykd_setup_common.nsh" !include "pykd_setup_common.nsh"

4
setup/pykd_setup_x86.nsi
View File

@ -9,9 +9,7 @@
!define PYTHON_INSTALLER "python-2.6.6.msi" !define PYTHON_INSTALLER "python-2.6.6.msi"
!define PYTHON_PRODUCT_CODE "{6151CF20-0BD8-4023-A4A0-6A86DCFE58E5}" !define PYTHON_PRODUCT_CODE "{6151CF20-0BD8-4023-A4A0-6A86DCFE58E5}"
# Source http://www.microsoft.com/downloads/en/details.aspx?FamilyID=766a6af7-ec73-40ff-b072-9112bab119c2
# When changing VC runtime vesion don't forget to update ProductCode appropriately # When changing VC runtime vesion don't forget to update ProductCode appropriately
!define VCRUNTIME_URL "http://download.microsoft.com/download/6/B/B/6BB661D6-A8AE-4819-B79F-236472F6070C/vcredist_x86.exe" !define VCRUNTIME_PRODUCT_CODE "{710f4c1c-cc18-4c49-8cbf-51240c89a1a2}"
!define VCRUNTIME_PRODUCT_CODE "{837b34e3-7c30-493c-8f6a-2b0f04e2912c}"
!include "pykd_setup_common.nsh" !include "pykd_setup_common.nsh"