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

Merge branch 'dev' of github.com:preble/libpinproc into dev

Browse Source
This commit is contained in:
Gerry Stellenberg
2012-11-08 12:17:45 -06:00
parent 78ed8bbe67 063d19250b
commit 98d6e84d65
4 changed files with 26 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@@ -19,8 +19,8 @@ endif()
### ###
project(PINPROC) project(PINPROC)
set(PINPROC_VERSION_MAJOR "0") set(PINPROC_VERSION_MAJOR "1")
set(PINPROC_VERSION_MINOR "9") set(PINPROC_VERSION_MINOR "2")
set(PINPROC_VERSION "${PINPROC_VERSION_MAJOR}.${PINPROC_VERSION_MINOR}") set(PINPROC_VERSION "${PINPROC_VERSION_MAJOR}.${PINPROC_VERSION_MINOR}")

BIN
installers/Win/DPInst32.exe Normal file
View File

Binary file not shown.

BIN
installers/Win/DPInst64.exe Normal file
View File

Binary file not shown.

31
installers/Win/nsis_install_script.nsi
View File

@@ -2,7 +2,7 @@
; HM NIS Edit Wizard helper defines ; HM NIS Edit Wizard helper defines
!define PRODUCT_NAME "libpinproc" !define PRODUCT_NAME "libpinproc"
!define PRODUCT_VERSION "1.00" !define PRODUCT_VERSION "1.2"
!define PRODUCT_PUBLISHER "Gerry Stellenberg" !define PRODUCT_PUBLISHER "Gerry Stellenberg"
!define PRODUCT_WEB_SITE "http://www.pinballcontrollers.com" !define PRODUCT_WEB_SITE "http://www.pinballcontrollers.com"
!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\DPInst.exe" !define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\DPInst.exe"
@@ -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
@@ -36,12 +35,26 @@
; MUI end ------ ; MUI end ------
Name "${PRODUCT_NAME} ${PRODUCT_VERSION}" Name "${PRODUCT_NAME} ${PRODUCT_VERSION}"
OutFile "libpinproc_1.00_install.exe" OutFile "libpinproc_1.2_install.exe"
InstallDir "$PROGRAMFILES\P-ROC\libpinproc" InstallDir "$PROGRAMFILES\P-ROC\libpinproc"
InstallDirRegKey HKLM "${PRODUCT_DIR_REGKEY}" ""
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
@@ -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\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"
@@ -78,10 +92,11 @@ Section "MainSection" SEC01
File "C:\MinGW\bin\libstdc++-6.dll" File "C:\MinGW\bin\libstdc++-6.dll"
SetOutPath "$INSTDIR\ext\python" SetOutPath "$INSTDIR\ext\python"
SetOverwrite ifnewer 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" 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
@@ -125,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"
@@ -143,4 +160,4 @@ Section Uninstall
DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}"
DeleteRegKey HKLM "${PRODUCT_DIR_REGKEY}" DeleteRegKey HKLM "${PRODUCT_DIR_REGKEY}"
SetAutoClose true SetAutoClose true
SectionEnd SectionEnd