Skip to content

Commit eee09af

Browse files
SteveALeeSteveALee
committed
Installer now uses version from .exes
1 parent b33e0b1 commit eee09af

File tree

3 files changed

+50
-21
lines changed

3 files changed

+50
-21
lines changed

‎listeners/GPII_RFIDListener/src/GPII_RFIDListener.rc‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,18 @@
11
#include <windows.h>
22

3-
#define VER_PRODUCTVERSION 1,4,0,0
4-
#define VER_PRODUCTVERSION_STR "1.4\0"
3+
#define VER_PRODUCTVERSION 1,2,0
54

5+
#define __str(a) #a
6+
#define _str(a) __str(a)
7+
#define VER_PRODUCTVERSION_STR _str(VER_PRODUCTVERSION)
68
#define VER_FILEVERSION VER_PRODUCTVERSION
79
#define VER_FILEVERSION_STR VER_PRODUCTVERSION_STR
810

911
#define VER_COMPANYNAME_STR "University of Wisconsin, Madison"
1012
#define VER_COPYRIGHT_STR "(c) 2014 University of Wisconsin, Madison. All rights reserved."
1113
#define VER_FILEDESCRIPTION_STR "GPII RFID User Listener"
1214
#define VER_ORIGINALFILENAME_STR "GPII_RFIDListener.exe"
13-
#define VER_PRODUCTNAME_STR "GPII Listeners"
15+
#define VER_PRODUCTNAME_STR "GPII RFID Listener"
1416

1517
#ifndef DEBUG
1618
#define VER_DEBUG 0

‎listeners/GPII_USBListener/src/GPII_USBListener.rc‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,18 @@
11
#include <windows.h>
22

3-
#define VER_PRODUCTVERSION 1,4,0,0
4-
#define VER_PRODUCTVERSION_STR "1.4\0"
3+
#define VER_PRODUCTVERSION 1,2,0
54

5+
#define __str(a) #a
6+
#define _str(a) __str(a)
7+
#define VER_PRODUCTVERSION_STR _str(VER_PRODUCTVERSION)
68
#define VER_FILEVERSION VER_PRODUCTVERSION
79
#define VER_FILEVERSION_STR VER_PRODUCTVERSION_STR
810

911
#define VER_COMPANYNAME_STR "University of Wisconsin, Madison"
1012
#define VER_COPYRIGHT_STR "(c) 2014 University of Wisconsin, Madison. All rights reserved."
1113
#define VER_FILEDESCRIPTION_STR "GPII USB User Listener"
1214
#define VER_ORIGINALFILENAME_STR "GPII_USBListener.exe"
13-
#define VER_PRODUCTNAME_STR "GPII Listeners"
15+
#define VER_PRODUCTNAME_STR "GPII USB Listener"
1416

1517
#ifndef DEBUG
1618
#define VER_DEBUG 0

‎listeners/installer/listeners.iss‎

Lines changed: 40 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,49 @@
1+
#define binPath "..\bin\debug\"
2+
3+
; Our version is the greater of the version of listners
4+
#define maxVersion(str fileA, str fileB) \
5+
ParseVersion(fileA, Local[0], Local[1], Local[2], Local[3]), \
6+
Local[4] = EncodeVer(Local[0], Local[1], Local[2], Local[3]), \
7+
ParseVersion(fileB, Local[0], Local[1], Local[2], Local[3]), \
8+
Local[5] = EncodeVer(Local[0], Local[1], Local[2], Local[3]), \
9+
DecodeVer(Max(Local[4], Local[5]))
10+
11+
#define USB Str(AddBackslash(SourcePath) + binPath + "GPII_USBListener.exe")
12+
#define RFID Str(AddBackslash(SourcePath) + binPath + "GPII_RFIDListener.exe")
13+
#if GetFileVersion(USB) == "" || GetFileVersion(RFID) == ""
14+
#error A Listener EXE file is missing - check bin\Release
15+
#endif
16+
#define AppVersion maxVersion(USB, RFID)
17+
18+
; Define this to write the preprocessed output to a file Preprocessed.iss and open it in the IDE
19+
;#define DebugPP
20+
121
[Setup]
222
AppName=GPII Listeners
3-
AppVersion=1.4
23+
AppVersion={#AppVersion}
24+
VersionInfoVersion={#AppVersion}
425
DefaultDirName={pf}\GPII
526
DefaultGroupName=GPII
6-
UninstallDisplayIcon={app}\MyProg.exe
7-
OutputDir=..\bin
8-
OutputBaseFilename=GPIIListenersSetup-1_4
27+
UninstallDisplayIcon={app}\GPII_RFIDListener.exe
28+
OutputDir=..\bin\Release
29+
OutputBaseFilename=GPIIListenerSetup-{#AppVersion}
930

1031
AppPublisher=OpenDirective for RtF
1132
AppCopyright=Copyright (C) 2014 OpenDirective
1233
AppPublisherURL=http://opendirective.com
1334
;SetupIconFile=GPII.ico
1435

1536
[Tasks]
16-
Name: "usb"; Description: "Install the &USB Listener"; Flags: checkedonce checkablealone
17-
Name: "usb/turnkey"; Description: "Run the U&SB listener whenever this user logs on to Windows"; Flags: unchecked checkedonce
18-
Name: "rfid"; Description: "Install the &RFID / NFC Listener"; Flags: checkedonce checkablealone
19-
Name: "rfid/turnkey"; Description: "Run the R&FID listener whenever this user logs on to Windows"; Flags: unchecked checkedonce
37+
Name: "usb"; Description: "Install the &USB Listener"; Flags:
38+
Name: "usbturnkey"; Description: "Run the U&SB listener on startup"; Flags: unchecked checkedonce
39+
Name: "rfid"; Description: "Install the &RFID / NFC Listener"; Flags:
40+
Name: "rfidturnkey"; Description: "Run the R&FID listener on startup"; Flags: unchecked checkedonce
2041
Name: "desktop"; Description: "Add icons to desktop"; Flags: unchecked
2142
Name: "startmenu"; Description: "Add icons to start menu"; Flags: unchecked
2243

2344
[Files]
24-
Source: "..\bin\Debug\GPII_USBListener.exe"; DestDir: "{app}"; Tasks: usb
25-
Source: "..\bin\Debug\GPII_RFIDListener.exe"; DestDir: "{app}"; Tasks: rfid
45+
Source: "{#binPath}GPII_USBListener.exe"; DestDir: "{app}"; Tasks: usb
46+
Source: "{#binPath}GPII_RFIDListener.exe"; DestDir: "{app}"; Tasks: rfid
2647
Source: "..\..\LICENSE.txt"; DestDir: "{app}"; Flags: ignoreversion
2748
Source: "GPII.ico"; DestDir: "{app}"; Flags: ignoreversion
2849
Source: "GPII_USBListener.ico"; DestDir: "{app}"; Flags: ignoreversion
@@ -35,11 +56,15 @@ Name: "{group}\RFID Listener"; Filename: "{app}\GPII_RFIDListener.exe"; Comment:
3556
Name: "{group}\GPII Website"; Filename: "http://GPII.net"; Comment: "Visit the GPII website"; IconFilename: "{app}\GPII.ico"; Tasks: startmenu
3657

3758
; desktop - optional
38-
Name: "{userdesktop}\GPII USB Listener"; Filename: "{app}\GPII_USBListener.exe"; Comment: "Run USB listener"; IconFilename: "{app}\GPII_USBListener.ico"; Tasks:desktop
39-
Name: "{userdesktop}\GPII RFID Listener"; Filename: "{app}\GPII_RFIDListener.exe"; Comment: "Run RFID listener"; IconFilename: "{app}\GPII_RFIDListener.ico"; Tasks:desktop
40-
Name: "{userdesktop}\GPII Website"; Filename: "http://GPII.net"; Comment: "Visit the GPII website"; IconFilename: "{app}\GPII.ico"; Tasks: desktop
59+
Name: "{userdesktop}\GPII USB Listener"; Filename: "{app}\GPII_USBListener.exe"; Comment: "Run GPII USB listener"; IconFilename: "{app}\GPII_USBListener.ico"; Tasks:desktop
60+
Name: "{userdesktop}\GPII RFID Listener"; Filename: "{app}\GPII_RFIDListener.exe"; Comment: "Run GPII RFID listener"; IconFilename: "{app}\GPII_RFIDListener.ico"; Tasks:desktop
61+
Name: "{userdesktop}\GPII Website"; Filename: "http://GPII.net"; IconFilename: "{app}\GPII.ico"; Tasks: desktop
4162

4263
; startup items - optional
43-
Name: "{userstartup}\GPII USB Listener"; Filename: "{app}\GPII_USBListener.exe"; Comment: "Run USB listener"; IconFilename: "{app}\GPII_USBListener.ico"; Tasks:usb/turnkey and startmenu
44-
Name: "{userstartup}\GPII RFID Listener"; Filename: "{app}\GPII_RFIDListener.exe"; Comment: "Run RFID listener"; IconFilename: "{app}\GPII_RFIDListener.ico"; Tasks:rfid/turnkey and startmenu
64+
Name: "{commonstartup}\GPII USB Listener"; Filename: "{app}\GPII_USBListener.exe"; Comment: "Run GPII USB listener"; IconFilename: "{app}\GPII_USBListener.ico"; Tasks:usbturnkey and startmenu
65+
Name: "{commonstartup}\GPII RFID Listener"; Filename: "{app}\GPII_RFIDListener.exe"; Comment: "Run GPII RFID listener"; IconFilename: "{app}\GPII_RFIDListener.ico"; Tasks:rfidturnkey and startmenu
4566

67+
#ifdef DebugPP
68+
#expr SaveToFile(AddBackslash(SourcePath) + binPath + "Preprocessed.iss"), \
69+
Exec(AddBackslash(CompilerPath) + "Compil32.exe", """" + AddBackslash(SourcePath) + binPath+ "Preprocessed.iss""")
70+
#endif

0 commit comments

Comments
 (0)