1
0
mirror of https://github.com/preble/libpinproc synced 2026-02-24 18:25:23 +01:00

Merge branch 'dev'

This commit is contained in:
Jimmy Lipham
2012-11-08 13:13:36 -05:00
3 changed files with 20 additions and 2 deletions

BIN
installers/Win/DPInst32.exe Normal file

Binary file not shown.

BIN
installers/Win/DPInst64.exe Normal file

Binary file not shown.

View File

@@ -24,7 +24,6 @@
; Instfiles page ; Instfiles page
!insertmacro MUI_PAGE_INSTFILES !insertmacro MUI_PAGE_INSTFILES
; Finish page ; Finish page
!define MUI_FINISHPAGE_RUN "$INSTDIR\FTDI_2.08.14\DPInst.exe"
!insertmacro MUI_PAGE_FINISH !insertmacro MUI_PAGE_FINISH
; Uninstaller pages ; Uninstaller pages
@@ -41,6 +40,21 @@ InstallDir "$PROGRAMFILES\P-ROC\libpinproc"
ShowInstDetails show ShowInstDetails show
ShowUnInstDetails 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 Section "MainSection" SEC01
SetOutPath "$INSTDIR\FTDI_2.08.14\amd64" SetOutPath "$INSTDIR\FTDI_2.08.14\amd64"
SetOverwrite try SetOverwrite try
@@ -53,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\ftser2k.sys"
File "C:\P-ROC\Install\FTDI_2.08.14\amd64\ftserui2.dll" File "C:\P-ROC\Install\FTDI_2.08.14\amd64\ftserui2.dll"
SetOutPath "$INSTDIR\FTDI_2.08.14" 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\DPInst.xml"
File "C:\P-ROC\Install\FTDI_2.08.14\ftd2xx.h" File "C:\P-ROC\Install\FTDI_2.08.14\ftd2xx.h"
File "C:\P-ROC\Install\FTDI_2.08.14\ftdibus.cat" File "C:\P-ROC\Install\FTDI_2.08.14\ftdibus.cat"
@@ -81,6 +96,7 @@ Section "MainSection" SEC01
SetOutPath "$INSTDIR" SetOutPath "$INSTDIR"
SetOverwrite ifnewer SetOverwrite ifnewer
File "C:\P-ROC\libpinproc\installers\Win\README.txt" File "C:\P-ROC\libpinproc\installers\Win\README.txt"
Call InstallFTDI
SectionEnd SectionEnd
Section -Post Section -Post
@@ -124,6 +140,8 @@ Section Uninstall
Delete "$INSTDIR\FTDI_2.08.14\ftd2xx.h" Delete "$INSTDIR\FTDI_2.08.14\ftd2xx.h"
Delete "$INSTDIR\FTDI_2.08.14\DPInst.xml" Delete "$INSTDIR\FTDI_2.08.14\DPInst.xml"
Delete "$INSTDIR\FTDI_2.08.14\DPInst.exe" 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\CDM 2 04 16 Release Info.doc"
Delete "$INSTDIR\FTDI_2.08.14\amd64\ftserui2.dll" Delete "$INSTDIR\FTDI_2.08.14\amd64\ftserui2.dll"
Delete "$INSTDIR\FTDI_2.08.14\amd64\ftser2k.sys" Delete "$INSTDIR\FTDI_2.08.14\amd64\ftser2k.sys"