Skip to content

Commit a188357

Browse files
committed
Pre-release v2.0
1 parent e19b6eb commit a188357

File tree

8 files changed

+37
-11
lines changed

8 files changed

+37
-11
lines changed

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
*.lib
2323

2424
# Executables
25-
*.exe
2625
*.out
2726
*.app
2827

2.57 MB
Binary file not shown.
-1.48 MB
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
-4.84 MB
Binary file not shown.

installer/setup_1.2.0.iss renamed to installer/setup_2.0.0.iss

Lines changed: 37 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
33

44
#define MyAppName "Files Drag & Drop"
5-
#define MyAppVersion "1.2.0"
5+
#define MyAppVersion "2.0.0"
66
#define MyAppPublisher "Files Drag & Drop"
77
#define MyAppURL "http://www.filesdnd.fr/"
8-
#define MyAppExeName "Files Drag And Drop.exe"
8+
#define MyAppExeName "Files Drag and Drop.exe"
99

1010
[Setup]
1111
; NOTE: The value of AppId uniquely identifies this application.
@@ -23,7 +23,7 @@ DefaultDirName={pf}\{#MyAppName}
2323
DefaultGroupName={#MyAppName}
2424
AllowNoIcons=yes
2525
OutputDir=./
26-
OutputBaseFilename=filesdnd-1.2.0-setup
26+
OutputBaseFilename=filesdnd-2.0.0-setup
2727
SetupIconFile=./icons/fdnd_icon.ico
2828
Compression=lzma2/max
2929
SolidCompression=yes
@@ -57,7 +57,7 @@ Source: "./files/{#MyAppExeName}"; DestDir: "{app}"; Flags: ignoreversion
5757
Source: "./files/depfiles/*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
5858
Source: "./msi/BonjourX86.msi"; DestDir: "{tmp}"; Flags: ignoreversion deleteafterinstall
5959
Source: "./msi/BonjourX64.msi"; DestDir: "{tmp}"; Flags: ignoreversion deleteafterinstall
60-
Source: "./redists/vcredist_x86_2010.exe"; DestDir: {tmp}; Flags: deleteafterinstall
60+
Source: "./redists/vcredist_x86_2013.exe"; DestDir: {tmp}; Flags: deleteafterinstall
6161
; NOTE: Don't use "Flags: ignoreversion" on any shared system files
6262

6363
[Icons]
@@ -68,7 +68,7 @@ Name: "{commondesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks:
6868
Name: "{userappdata}\Microsoft\Internet Explorer\Quick Launch\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: quicklaunchicon
6969

7070
[Run]
71-
Filename: "{tmp}\vcredist_x86_2010.exe"; Check: VCRedistNeedsInstall
71+
Filename: "{tmp}\vcredist_x86_2013.exe"; Check: VCRedistNeedsInstall
7272
Filename: "msiexec.exe"; Parameters: "/i ""{tmp}\BonjourX86.msi"""; Check: CheckBonjourX86
7373
Filename: "msiexec.exe"; Parameters: "/i ""{tmp}\BonjourX64.msi"""; Check: CheckBonjourX64
7474
Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall skipifsilent
@@ -89,11 +89,39 @@ const
8989
INSTALLSTATE_ABSENT = 2; // The product is installed for a different user.
9090
INSTALLSTATE_DEFAULT = 5; // The product is installed for the current user.
9191
92+
VC_2005_REDIST_X86 = '{A49F249F-0C91-497F-86DF-B2585E8E76B7}';
93+
VC_2005_REDIST_X64 = '{6E8E85E8-CE4B-4FF5-91F7-04999C9FAE6A}';
94+
VC_2005_REDIST_IA64 = '{03ED71EA-F531-4927-AABD-1C31BCE8E187}';
95+
VC_2005_SP1_REDIST_X86 = '{7299052B-02A4-4627-81F2-1818DA5D550D}';
96+
VC_2005_SP1_REDIST_X64 = '{071C9B48-7C32-4621-A0AC-3F809523288F}';
97+
VC_2005_SP1_REDIST_IA64 = '{0F8FB34E-675E-42ED-850B-29D98C2ECE08}';
98+
VC_2005_SP1_ATL_SEC_UPD_REDIST_X86 = '{837B34E3-7C30-493C-8F6A-2B0F04E2912C}';
99+
VC_2005_SP1_ATL_SEC_UPD_REDIST_X64 = '{6CE5BAE9-D3CA-4B99-891A-1DC6C118A5FC}';
100+
VC_2005_SP1_ATL_SEC_UPD_REDIST_IA64 = '{85025851-A784-46D8-950D-05CB3CA43A13}';
101+
102+
VC_2008_REDIST_X86 = '{FF66E9F6-83E7-3A3E-AF14-8DE9A809A6A4}';
103+
VC_2008_REDIST_X64 = '{350AA351-21FA-3270-8B7A-835434E766AD}';
104+
VC_2008_REDIST_IA64 = '{2B547B43-DB50-3139-9EBE-37D419E0F5FA}';
105+
VC_2008_SP1_REDIST_X86 = '{9A25302D-30C0-39D9-BD6F-21E6EC160475}';
106+
VC_2008_SP1_REDIST_X64 = '{8220EEFE-38CD-377E-8595-13398D740ACE}';
107+
VC_2008_SP1_REDIST_IA64 = '{5827ECE1-AEB0-328E-B813-6FC68622C1F9}';
108+
VC_2008_SP1_ATL_SEC_UPD_REDIST_X86 = '{1F1C2DFC-2D24-3E06-BCB8-725134ADF989}';
109+
VC_2008_SP1_ATL_SEC_UPD_REDIST_X64 = '{4B6C7001-C7D6-3710-913E-5BC23FCE91E6}';
110+
VC_2008_SP1_ATL_SEC_UPD_REDIST_IA64 = '{977AD349-C2A8-39DD-9273-285C08987C7B}';
111+
VC_2008_SP1_MFC_SEC_UPD_REDIST_X86 = '{9BE518E6-ECC6-35A9-88E4-87755C07200F}';
112+
VC_2008_SP1_MFC_SEC_UPD_REDIST_X64 = '{5FCE6D76-F5DC-37AB-B2B8-22AB8CEDB1D4}';
113+
VC_2008_SP1_MFC_SEC_UPD_REDIST_IA64 = '{515643D1-4E9E-342F-A75A-D1F16448DC04}';
114+
92115
VC_2010_REDIST_X86 = '{196BB40D-1578-3D01-B289-BEFC77A11A1E}';
93116
VC_2010_REDIST_X64 = '{DA5E371C-6333-3D8A-93A4-6FD5B20BCC6E}';
94-
117+
VC_2010_REDIST_IA64 = '{C1A35166-4301-38E9-BA67-02823AD72A1B}';
95118
VC_2010_SP1_REDIST_X86 = '{F0C3E5D1-1ADE-321E-8167-68EF0DE699A5}';
96119
VC_2010_SP1_REDIST_X64 = '{1D8E6291-B0D5-35EC-8441-6616F567A0F7}';
120+
VC_2010_SP1_REDIST_IA64 = '{88C73C1C-2DE5-3B01-AFB8-B46EF4AB41CD}';
121+
122+
VC_2013_REDIST_X86 = '{CE085A78-074E-4823-8DC1-8A721B94B76D}'; // 12.0.21005
123+
VC_2013_REDIST_X86_V2 = '{13A4EE12-23EA-3371-91EE-EFB36DDFFF3E}';
124+
VC_2013_REDIST_X64 = '{7F51BDB9-EE21-49EE-94D6-90AFC321780E}';
97125
98126
// Check vcredist
99127
// http://stackoverflow.com/questions/11137424/how-to-make-vcredist-x86-reinstall-only-if-not-yet-installed
@@ -108,10 +136,9 @@ end;
108136
109137
function VCRedistNeedsInstall: Boolean;
110138
begin
111-
Result := not (VCVersionInstalled(VC_2010_REDIST_X86) or
112-
VCVersionInstalled(VC_2010_REDIST_X64) or
113-
VCVersionInstalled(VC_2010_SP1_REDIST_X86)or
114-
VCVersionInstalled(VC_2010_SP1_REDIST_X64));
139+
Result := not (VCVersionInstalled(VC_2013_REDIST_X86) or
140+
VCVersionInstalled(VC_2013_REDIST_X86_V2) or
141+
VCVersionInstalled(VC_2013_REDIST_X64));
115142
end;
116143
117144
// Check Bonjour

0 commit comments

Comments
 (0)