From 3b7173878b2a5fcd67875a463dbebb4605f6ce74 Mon Sep 17 00:00:00 2001
From: "SND\\air_max_cp" <SND\air_max_cp@9b283d60-5439-405e-af05-b73fd8c4d996>
Date: Mon, 31 Dec 2012 11:00:32 +0000
Subject: [PATCH] setup: create Python 2.6/2.7 setup setup: changed output file
 name setup: version increment

git-svn-id: https://pykd.svn.codeplex.com/svn@82087 9b283d60-5439-405e-af05-b73fd8c4d996
---
 setup/pykd_setup_common.nsh       | 24 ++++++++----------------
 setup/pykd_setup_x64.nsi          |  2 ++
 setup/pykd_setup_x64_python27.nsi | 21 +++++++++++++++++++++
 setup/pykd_setup_x86.nsi          |  2 ++
 setup/pykd_setup_x86_python27.nsi | 21 +++++++++++++++++++++
 5 files changed, 54 insertions(+), 16 deletions(-)
 create mode 100644 setup/pykd_setup_x64_python27.nsi
 create mode 100644 setup/pykd_setup_x86_python27.nsi

diff --git a/setup/pykd_setup_common.nsh b/setup/pykd_setup_common.nsh
index 32fc8ef..5cefbe2 100644
--- a/setup/pykd_setup_common.nsh
+++ b/setup/pykd_setup_common.nsh
@@ -22,12 +22,9 @@ SetCompressor LZMA
 # General
 #------------------------------------------------------------------------------
 
-!define PYTHON_VERSION "2.6"
-!define PYTHON_URL_BASE "http://python.org/ftp/python/2.6.6/"
-
 !define PRODUCT_SHORT_NAME "pykd"
 !define PRODUCT_FULL_NAME  "Python extension for WinDbg"
-!define PRODUCT_VERSION "0.1.0.14"
+!define PRODUCT_VERSION "0.2.0.11"
 !define PRODUCT_URL  "http://pykd.codeplex.com/"
 !define PRODUCT_NAME_AND_VERSION "${PRODUCT_FULL_NAME} ${PRODUCT_ARCH} ${PRODUCT_VERSION}"
 !define PRODUCT_MANUFACTURER "PyKd Team"
@@ -38,9 +35,11 @@ SetCompressor LZMA
     !define ARCH "x86"
 !endif
 
+!define BINARIES_DIR "${PRODUCT_SHORT_NAME}-${PRODUCT_VERSION}-python-${PYTHON_VERSION}\${PRODUCT_ARCH}"
+
 # Main Install settings
 Name "${PRODUCT_NAME_AND_VERSION}"
-OutFile "${PRODUCT_SHORT_NAME}_${PRODUCT_ARCH}_${PRODUCT_VERSION}_setup.exe"
+OutFile "${PRODUCT_SHORT_NAME}-${PRODUCT_VERSION}-${PRODUCT_ARCH}-python-${PYTHON_VERSION}-setup.exe"
 
 BrandingText "${PRODUCT_FULL_NAME}"
 
@@ -189,12 +188,8 @@ Section "${PRODUCT_SHORT_NAME} ${PRODUCT_ARCH}" sec_pykd
 
     DetailPrint "Extracting extension..."
     SetOutPath "$INSTDIR"
-
-    !if ${PRODUCT_ARCH} == "x64"
-        File ".\binaries\x64\pykd.pyd"
-    !else
-        File ".\binaries\x86\pykd.pyd"
-    !endif
+    
+    File ".\${BINARIES_DIR}\pykd.pyd"
 SectionEnd
 
 Section "Snippets" sec_snippets
@@ -241,11 +236,8 @@ Section "Visual C++ 2008 SP1 (${PRODUCT_ARCH}) runtime" sec_vcruntime
     DetailPrint "Installing Microsoft Visual C++ 2008 SP1 (${PRODUCT_ARCH}) runtime library..."
 
     SetOutPath "$TEMP"
-    !if ${PRODUCT_ARCH} == "x64"
-        File ".\binaries\x64\vcredist_${PRODUCT_ARCH}.exe"
-    !else
-        File ".\binaries\x86\vcredist_${PRODUCT_ARCH}.exe"
-    !endif
+    
+    File ".\${BINARIES_DIR}\vcredist_${PRODUCT_ARCH}.exe"
     
     ExecWait "$TEMP\vcredist_${PRODUCT_ARCH}.exe"
     ${IfNot} ${Errors}
diff --git a/setup/pykd_setup_x64.nsi b/setup/pykd_setup_x64.nsi
index 9e23cbe..fa09e10 100644
--- a/setup/pykd_setup_x64.nsi
+++ b/setup/pykd_setup_x64.nsi
@@ -6,6 +6,8 @@
 !define PRODUCT_ARCH "x64"
 
 # When changing Python vesion don't forget to update ProductCode appropriately
+!define PYTHON_VERSION "2.6"
+!define PYTHON_URL_BASE "http://python.org/ftp/python/2.6.6/"
 !define PYTHON_INSTALLER "python-2.6.6.amd64.msi"
 !define PYTHON_PRODUCT_CODE "{6151CF20-0BD8-4023-A4A0-6A86DCFE58E6}"
 
diff --git a/setup/pykd_setup_x64_python27.nsi b/setup/pykd_setup_x64_python27.nsi
new file mode 100644
index 0000000..7d41046
--- /dev/null
+++ b/setup/pykd_setup_x64_python27.nsi
@@ -0,0 +1,21 @@
+#
+# This is setup script for pykd project.
+# Author: Maksim K. aka airmax
+#
+
+!define PRODUCT_ARCH "x64"
+
+# When changing Python vesion don't forget to update ProductCode appropriately
+!define PYTHON_VERSION "2.7"
+!define PYTHON_URL_BASE "http://python.org/ftp/python/2.7.3/"
+!define PYTHON_INSTALLER "python-2.7.3.amd64.msi"
+!define PYTHON_PRODUCT_CODE "{C0C31BCC-56FB-42A7-8766-D29E1BD74C7D}"
+
+# When changing VC runtime vesion don't forget to update ProductCode appropriately
+# VC9 (VS2008) SP1 + MFC Security Update
+!define VCRUNTIME_PRODUCT_CODE "{5FCE6D76-F5DC-37AB-B2B8-22AB8CEDB1D4}"
+
+!define MSDIA_DLL_NAME "msdia90.dll"
+!define CLSID_DiaSource "{4C41678E-887B-4365-A09E-925D28DB33C2}"
+
+!include "pykd_setup_common.nsh"
diff --git a/setup/pykd_setup_x86.nsi b/setup/pykd_setup_x86.nsi
index 11d3237..9261416 100644
--- a/setup/pykd_setup_x86.nsi
+++ b/setup/pykd_setup_x86.nsi
@@ -6,6 +6,8 @@
 !define PRODUCT_ARCH "x86"
 
 # When changing Python vesion don't forget to update ProductCode appropriately
+!define PYTHON_VERSION "2.6"
+!define PYTHON_URL_BASE "http://python.org/ftp/python/2.6.6/"
 !define PYTHON_INSTALLER "python-2.6.6.msi"
 !define PYTHON_PRODUCT_CODE "{6151CF20-0BD8-4023-A4A0-6A86DCFE58E5}"
 
diff --git a/setup/pykd_setup_x86_python27.nsi b/setup/pykd_setup_x86_python27.nsi
new file mode 100644
index 0000000..77ab6fd
--- /dev/null
+++ b/setup/pykd_setup_x86_python27.nsi
@@ -0,0 +1,21 @@
+#
+# This is setup script for pykd project.
+# Author: Maksim K. aka airmax
+#
+
+!define PRODUCT_ARCH "x86"
+
+# When changing Python vesion don't forget to update ProductCode appropriately
+!define PYTHON_VERSION "2.7"
+!define PYTHON_URL_BASE "http://python.org/ftp/python/2.7.3/"
+!define PYTHON_INSTALLER "python-2.7.3.msi"
+!define PYTHON_PRODUCT_CODE "{C0C31BCC-56FB-42A7-8766-D29E1BD74C7C}"
+
+# When changing VC runtime vesion don't forget to update ProductCode appropriately
+# VC9 (VS2008) SP1 + MFC Security Update
+!define VCRUNTIME_PRODUCT_CODE "{9BE518E6-ECC6-35A9-88E4-87755C07200F}"
+
+!define MSDIA_DLL_NAME "msdia90.dll"
+!define CLSID_DiaSource "{4C41678E-887B-4365-A09E-925D28DB33C2}"
+
+!include "pykd_setup_common.nsh"