From afb9640124235248592cfee168ce73fef00e897f Mon Sep 17 00:00:00 2001 From: Gerry Stellenberg Date: Sun, 6 Mar 2011 20:14:14 +0000 Subject: [PATCH] Updated for 0.91 --- installers/Win/README.txt | 4 +- installers/Win/nsis_install_script.nsi | 119 ++++++++++++------------- 2 files changed, 61 insertions(+), 62 deletions(-) diff --git a/installers/Win/README.txt b/installers/Win/README.txt index 46fee2e..6597c04 100644 --- a/installers/Win/README.txt +++ b/installers/Win/README.txt @@ -1,13 +1,13 @@ libpinproc installation notes: The install process should have created the following subdirectories: -.\FTDI_2.08.02 (includes the USB driver) +.\FTDI_2.08.12 (includes the USB driver) .\bin (includes pinprocfw.exe) .\ext\python (includes a setup file for the pinproc python extension) *** USB Driver *** The FTDI driver should have been installed automatically during the libpinproc installation. -If it did not, manually run .\FTDI_2.08.02\DPInst.exe. This is necessary to communicate with +If it did not, manually run .\FTDI_2.08.12\DPInst.exe. This is necessary to communicate with the P-ROC over USB. *** pinprocfw.exe *** diff --git a/installers/Win/nsis_install_script.nsi b/installers/Win/nsis_install_script.nsi index 1803178..cbe2d70 100644 --- a/installers/Win/nsis_install_script.nsi +++ b/installers/Win/nsis_install_script.nsi @@ -2,7 +2,7 @@ ; HM NIS Edit Wizard helper defines !define PRODUCT_NAME "libpinproc" -!define PRODUCT_VERSION "0.9" +!define PRODUCT_VERSION "0.91" !define PRODUCT_PUBLISHER "Gerry Stellenberg" !define PRODUCT_WEB_SITE "http://www.pinballcontrollers.com" !define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\DPInst.exe" @@ -24,7 +24,7 @@ ; Instfiles page !insertmacro MUI_PAGE_INSTFILES ; Finish page -!define MUI_FINISHPAGE_RUN "$INSTDIR\FTDI_2.08.02\DPInst.exe" +!define MUI_FINISHPAGE_RUN "$INSTDIR\FTDI_2.08.12\DPInst.exe" !insertmacro MUI_PAGE_FINISH ; Uninstaller pages @@ -36,48 +36,47 @@ ; MUI end ------ Name "${PRODUCT_NAME} ${PRODUCT_VERSION}" -OutFile "libpinproc_0.9_install.exe" +OutFile "libpinproc_0.91_install.exe" InstallDir "$PROGRAMFILES\P-ROC\libpinproc" InstallDirRegKey HKLM "${PRODUCT_DIR_REGKEY}" "" ShowInstDetails show ShowUnInstDetails show Section "MainSection" SEC01 - SetOutPath "$INSTDIR\FTDI_2.08.02\amd64" + SetOutPath "$INSTDIR\FTDI_2.08.12\amd64" SetOverwrite try - File "C:\P-ROC\Install\FTDI_2.08.02\amd64\ftbusui.dll" - File "C:\P-ROC\Install\FTDI_2.08.02\amd64\ftcserco.dll" - File "C:\P-ROC\Install\FTDI_2.08.02\amd64\ftd2xx.lib" - File "C:\P-ROC\Install\FTDI_2.08.02\amd64\ftd2xx64.dll" - File "C:\P-ROC\Install\FTDI_2.08.02\amd64\ftdibus.sys" - File "C:\P-ROC\Install\FTDI_2.08.02\amd64\ftlang.dll" - File "C:\P-ROC\Install\FTDI_2.08.02\amd64\ftser2k.sys" - File "C:\P-ROC\Install\FTDI_2.08.02\amd64\ftserui2.dll" - SetOutPath "$INSTDIR\FTDI_2.08.02" - File "C:\P-ROC\Install\FTDI_2.08.02\CDM 2 08 02 Release Info.rtf" - File "C:\P-ROC\Install\FTDI_2.08.02\DPInst.exe" - File "C:\P-ROC\Install\FTDI_2.08.02\DPInst.xml" - File "C:\P-ROC\Install\FTDI_2.08.02\ftd2xx.h" - File "C:\P-ROC\Install\FTDI_2.08.02\ftdibus.cat" - File "C:\P-ROC\Install\FTDI_2.08.02\ftdibus.inf" - File "C:\P-ROC\Install\FTDI_2.08.02\ftdiport.cat" - File "C:\P-ROC\Install\FTDI_2.08.02\ftdiport.inf" - SetOutPath "$INSTDIR\FTDI_2.08.02\i386" - File "C:\P-ROC\Install\FTDI_2.08.02\i386\ftbusui.dll" - File "C:\P-ROC\Install\FTDI_2.08.02\i386\ftcserco.dll" - File "C:\P-ROC\Install\FTDI_2.08.02\i386\ftd2xx.dll" - File "C:\P-ROC\Install\FTDI_2.08.02\i386\ftd2xx.lib" - File "C:\P-ROC\Install\FTDI_2.08.02\i386\ftdibus.sys" - File "C:\P-ROC\Install\FTDI_2.08.02\i386\ftlang.dll" - File "C:\P-ROC\Install\FTDI_2.08.02\i386\ftser2k.sys" - File "C:\P-ROC\Install\FTDI_2.08.02\i386\ftserui2.dll" + File "C:\P-ROC\Install\FTDI_2.08.12\amd64\ftbusui.dll" + File "C:\P-ROC\Install\FTDI_2.08.12\amd64\ftcserco.dll" + File "C:\P-ROC\Install\FTDI_2.08.12\amd64\ftd2xx.lib" + File "C:\P-ROC\Install\FTDI_2.08.12\amd64\ftd2xx64.dll" + File "C:\P-ROC\Install\FTDI_2.08.12\amd64\ftdibus.sys" + File "C:\P-ROC\Install\FTDI_2.08.12\amd64\ftlang.dll" + File "C:\P-ROC\Install\FTDI_2.08.12\amd64\ftser2k.sys" + File "C:\P-ROC\Install\FTDI_2.08.12\amd64\ftserui2.dll" + SetOutPath "$INSTDIR\FTDI_2.08.12" + File "C:\P-ROC\Install\FTDI_2.08.12\DPInst.exe" + File "C:\P-ROC\Install\FTDI_2.08.12\DPInst.xml" + File "C:\P-ROC\Install\FTDI_2.08.12\ftd2xx.h" + File "C:\P-ROC\Install\FTDI_2.08.12\ftdibus.cat" + File "C:\P-ROC\Install\FTDI_2.08.12\ftdibus.inf" + File "C:\P-ROC\Install\FTDI_2.08.12\ftdiport.cat" + File "C:\P-ROC\Install\FTDI_2.08.12\ftdiport.inf" + SetOutPath "$INSTDIR\FTDI_2.08.12\i386" + File "C:\P-ROC\Install\FTDI_2.08.12\i386\ftbusui.dll" + File "C:\P-ROC\Install\FTDI_2.08.12\i386\ftcserco.dll" + File "C:\P-ROC\Install\FTDI_2.08.12\i386\ftd2xx.dll" + File "C:\P-ROC\Install\FTDI_2.08.12\i386\ftd2xx.lib" + File "C:\P-ROC\Install\FTDI_2.08.12\i386\ftdibus.sys" + File "C:\P-ROC\Install\FTDI_2.08.12\i386\ftlang.dll" + File "C:\P-ROC\Install\FTDI_2.08.12\i386\ftser2k.sys" + File "C:\P-ROC\Install\FTDI_2.08.12\i386\ftserui2.dll" SetOutPath "$INSTDIR\bin" SetOverwrite ifnewer File "C:\P-ROC\libpinproc\bin\pinprocfw.exe" File "C:\P-ROC\libpinproc\bin\ftd2xx.dll" SetOutPath "$INSTDIR\ext\python" SetOverwrite ifnewer - File "C:\P-ROC\pypinproc\dist\pinproc-0.9.win32-py2.6.exe" + File "C:\P-ROC\pypinproc\dist\pinproc-0.91.win32-py2.6.exe" SetOutPath "$INSTDIR" SetOverwrite ifnewer File "C:\P-ROC\libpinproc\installers\Win\README.txt" @@ -85,10 +84,10 @@ SectionEnd Section -Post WriteUninstaller "$INSTDIR\uninst.exe" - WriteRegStr HKLM "${PRODUCT_DIR_REGKEY}" "" "$INSTDIR\FTDI_2.08.02\DPInst.exe" + WriteRegStr HKLM "${PRODUCT_DIR_REGKEY}" "" "$INSTDIR\FTDI_2.08.12\DPInst.exe" WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayName" "$(^Name)" WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "UninstallString" "$INSTDIR\uninst.exe" - WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayIcon" "$INSTDIR\FTDI_2.08.02\DPInst.exe" + WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayIcon" "$INSTDIR\FTDI_2.08.12\DPInst.exe" WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayVersion" "${PRODUCT_VERSION}" WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "URLInfoAbout" "${PRODUCT_WEB_SITE}" WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "Publisher" "${PRODUCT_PUBLISHER}" @@ -109,34 +108,34 @@ Section Uninstall Delete "$INSTDIR\uninst.exe" Delete "$INSTDIR\bin\ftd2xx.dll" Delete "$INSTDIR\bin\pinprocfw.exe" - Delete "$INSTDIR\FTDI_2.08.02\i386\ftserui2.dll" - Delete "$INSTDIR\FTDI_2.08.02\i386\ftser2k.sys" - Delete "$INSTDIR\FTDI_2.08.02\i386\ftlang.dll" - Delete "$INSTDIR\FTDI_2.08.02\i386\ftdibus.sys" - Delete "$INSTDIR\FTDI_2.08.02\i386\ftd2xx.lib" - Delete "$INSTDIR\FTDI_2.08.02\i386\ftd2xx.dll" - Delete "$INSTDIR\FTDI_2.08.02\i386\ftcserco.dll" - Delete "$INSTDIR\FTDI_2.08.02\i386\ftbusui.dll" - Delete "$INSTDIR\FTDI_2.08.02\ftdiport.inf" - Delete "$INSTDIR\FTDI_2.08.02\ftdiport.cat" - Delete "$INSTDIR\FTDI_2.08.02\ftdibus.inf" - Delete "$INSTDIR\FTDI_2.08.02\ftdibus.cat" - Delete "$INSTDIR\FTDI_2.08.02\ftd2xx.h" - Delete "$INSTDIR\FTDI_2.08.02\DPInst.xml" - Delete "$INSTDIR\FTDI_2.08.02\DPInst.exe" - Delete "$INSTDIR\FTDI_2.08.02\CDM 2 04 16 Release Info.doc" - Delete "$INSTDIR\FTDI_2.08.02\amd64\ftserui2.dll" - Delete "$INSTDIR\FTDI_2.08.02\amd64\ftser2k.sys" - Delete "$INSTDIR\FTDI_2.08.02\amd64\ftlang.dll" - Delete "$INSTDIR\FTDI_2.08.02\amd64\ftdibus.sys" - Delete "$INSTDIR\FTDI_2.08.02\amd64\ftd2xx64.dll" - Delete "$INSTDIR\FTDI_2.08.02\amd64\ftd2xx.lib" - Delete "$INSTDIR\FTDI_2.08.02\amd64\ftcserco.dll" - Delete "$INSTDIR\FTDI_2.08.02\amd64\ftbusui.dll" + Delete "$INSTDIR\FTDI_2.08.12\i386\ftserui2.dll" + Delete "$INSTDIR\FTDI_2.08.12\i386\ftser2k.sys" + Delete "$INSTDIR\FTDI_2.08.12\i386\ftlang.dll" + Delete "$INSTDIR\FTDI_2.08.12\i386\ftdibus.sys" + Delete "$INSTDIR\FTDI_2.08.12\i386\ftd2xx.lib" + Delete "$INSTDIR\FTDI_2.08.12\i386\ftd2xx.dll" + Delete "$INSTDIR\FTDI_2.08.12\i386\ftcserco.dll" + Delete "$INSTDIR\FTDI_2.08.12\i386\ftbusui.dll" + Delete "$INSTDIR\FTDI_2.08.12\ftdiport.inf" + Delete "$INSTDIR\FTDI_2.08.12\ftdiport.cat" + Delete "$INSTDIR\FTDI_2.08.12\ftdibus.inf" + Delete "$INSTDIR\FTDI_2.08.12\ftdibus.cat" + Delete "$INSTDIR\FTDI_2.08.12\ftd2xx.h" + Delete "$INSTDIR\FTDI_2.08.12\DPInst.xml" + Delete "$INSTDIR\FTDI_2.08.12\DPInst.exe" + Delete "$INSTDIR\FTDI_2.08.12\CDM 2 04 16 Release Info.doc" + Delete "$INSTDIR\FTDI_2.08.12\amd64\ftserui2.dll" + Delete "$INSTDIR\FTDI_2.08.12\amd64\ftser2k.sys" + Delete "$INSTDIR\FTDI_2.08.12\amd64\ftlang.dll" + Delete "$INSTDIR\FTDI_2.08.12\amd64\ftdibus.sys" + Delete "$INSTDIR\FTDI_2.08.12\amd64\ftd2xx64.dll" + Delete "$INSTDIR\FTDI_2.08.12\amd64\ftd2xx.lib" + Delete "$INSTDIR\FTDI_2.08.12\amd64\ftcserco.dll" + Delete "$INSTDIR\FTDI_2.08.12\amd64\ftbusui.dll" - RMDir "$INSTDIR\FTDI_2.08.02\i386" - RMDir "$INSTDIR\FTDI_2.08.02\amd64" - RMDir "$INSTDIR\FTDI_2.08.02" + RMDir "$INSTDIR\FTDI_2.08.12\i386" + RMDir "$INSTDIR\FTDI_2.08.12\amd64" + RMDir "$INSTDIR\FTDI_2.08.12" RMDir "$INSTDIR\bin" DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}"