diff --git a/CMakeLists.txt b/CMakeLists.txt index cf64d72..33b717f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -19,8 +19,8 @@ endif() ### project(PINPROC) -set(PINPROC_VERSION_MAJOR "0") -set(PINPROC_VERSION_MINOR "9") +set(PINPROC_VERSION_MAJOR "1") +set(PINPROC_VERSION_MINOR "2") set(PINPROC_VERSION "${PINPROC_VERSION_MAJOR}.${PINPROC_VERSION_MINOR}") diff --git a/installers/Win/DPInst32.exe b/installers/Win/DPInst32.exe new file mode 100644 index 0000000..4af96d0 Binary files /dev/null and b/installers/Win/DPInst32.exe differ diff --git a/installers/Win/DPInst64.exe b/installers/Win/DPInst64.exe new file mode 100644 index 0000000..1a09e67 Binary files /dev/null and b/installers/Win/DPInst64.exe differ diff --git a/installers/Win/nsis_install_script.nsi b/installers/Win/nsis_install_script.nsi index 47c9d6f..6ccc8c9 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 "1.00" +!define PRODUCT_VERSION "1.2" !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,6 @@ ; Instfiles page !insertmacro MUI_PAGE_INSTFILES ; Finish page -!define MUI_FINISHPAGE_RUN "$INSTDIR\FTDI_2.08.14\DPInst.exe" !insertmacro MUI_PAGE_FINISH ; Uninstaller pages @@ -36,12 +35,26 @@ ; MUI end ------ Name "${PRODUCT_NAME} ${PRODUCT_VERSION}" -OutFile "libpinproc_1.00_install.exe" +OutFile "libpinproc_1.2_install.exe" InstallDir "$PROGRAMFILES\P-ROC\libpinproc" -InstallDirRegKey HKLM "${PRODUCT_DIR_REGKEY}" "" ShowInstDetails show ShowUnInstDetails show +Function InstallFTDI + + IfFileExists $WINDIR\SYSWOW64\*.* Is64bit Is32bit + Is32bit: + CopyFiles "$INSTDIR\FTDI_2.08.14\DPInst32.exe" "$INSTDIR\FTDI_2.08.14\DPInst.exe" + GOTO End32Bitvs64BitCheck + + Is64bit: + CopyFiles "$INSTDIR\FTDI_2.08.14\DPInst64.exe" "$INSTDIR\FTDI_2.08.14\DPInst.exe" + End32Bitvs64BitCheck: + + ExecWait '"$INSTDIR\FTDI_2.08.14\DPInst.exe"' + +FunctionEnd + Section "MainSection" SEC01 SetOutPath "$INSTDIR\FTDI_2.08.14\amd64" SetOverwrite try @@ -54,7 +67,8 @@ Section "MainSection" SEC01 File "C:\P-ROC\Install\FTDI_2.08.14\amd64\ftser2k.sys" File "C:\P-ROC\Install\FTDI_2.08.14\amd64\ftserui2.dll" SetOutPath "$INSTDIR\FTDI_2.08.14" - File "C:\P-ROC\Install\FTDI_2.08.14\DPInst.exe" + File "C:\P-ROC\Install\FTDI_2.08.14\DPInst32.exe" + File "C:\P-ROC\Install\FTDI_2.08.14\DPInst64.exe" File "C:\P-ROC\Install\FTDI_2.08.14\DPInst.xml" File "C:\P-ROC\Install\FTDI_2.08.14\ftd2xx.h" File "C:\P-ROC\Install\FTDI_2.08.14\ftdibus.cat" @@ -78,10 +92,11 @@ Section "MainSection" SEC01 File "C:\MinGW\bin\libstdc++-6.dll" SetOutPath "$INSTDIR\ext\python" SetOverwrite ifnewer - File "C:\P-ROC\pypinproc\dist\pinproc-1.00.win32-py2.6.exe" + File "C:\P-ROC\pypinproc\dist\pinproc-1.2.win32-py2.6.exe" SetOutPath "$INSTDIR" SetOverwrite ifnewer File "C:\P-ROC\libpinproc\installers\Win\README.txt" + Call InstallFTDI SectionEnd Section -Post @@ -125,6 +140,8 @@ Section Uninstall Delete "$INSTDIR\FTDI_2.08.14\ftd2xx.h" Delete "$INSTDIR\FTDI_2.08.14\DPInst.xml" Delete "$INSTDIR\FTDI_2.08.14\DPInst.exe" + Delete "$INSTDIR\FTDI_2.08.14\DPInst32.exe" + Delete "$INSTDIR\FTDI_2.08.14\DPInst64.exe" Delete "$INSTDIR\FTDI_2.08.14\CDM 2 04 16 Release Info.doc" Delete "$INSTDIR\FTDI_2.08.14\amd64\ftserui2.dll" Delete "$INSTDIR\FTDI_2.08.14\amd64\ftser2k.sys" @@ -143,4 +160,4 @@ Section Uninstall DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" DeleteRegKey HKLM "${PRODUCT_DIR_REGKEY}" SetAutoClose true -SectionEnd +SectionEnd \ No newline at end of file