Changeset 43 for trunk/Install/win

Timestamp:

May 11, 2020, 8:51:31 PM (5 years ago)

Author:

chronos

Message:

• Modified: Use InnoSetup 6 with modern style.
• Modified: Updated build.bat script.

Location:

trunk/Install/win

Files:

• CoolDisk.iss (modified) (4 diffs)
• build.bat (modified) (1 diff)

trunk/Install/win/CoolDisk.iss

@@ -24 +24 @@
 AppSupportURL={#MyAppURL}
 AppUpdatesURL={#MyAppURL}
-DefaultDirName={pf}\{#MyAppPublisherShort}\{#MyAppName}
+UninstallDisplayName={#MyAppName}
+UninstallDisplayIcon="{app}\{#MyAppExeName}"
+VersionInfoVersion={#MyAppVersion}
+VersionInfoCompany={#MyAppPublisher}
+DefaultDirName={commonpf}\{#MyAppPublisherShort}\{#MyAppName}
 DefaultGroupName={#MyAppPublisherShort}\{#MyAppName}
 AllowNoIcons=yes
@@ -32 +36 @@
 SolidCompression=yes
 ChangesAssociations=yes
+WizardStyle=modern
 ; "ArchitecturesInstallIn64BitMode=x64" requests that the install be
 ; done in "64-bit mode" on x64, meaning it should use the native
@@ -50 +55 @@
 
 [Registry]
-Root: HKCU; Subkey: "Software\Chronosoft\CoolDisk"; Flags: uninsdeletekey
+Root: HKLM; Subkey: "Software\Chronosoft\CoolDisk"; Flags: uninsdeletekey
 
 #define FileTypeName "CoolDisk project"
@@ -59 +64 @@
 
 [Files]
-Source: "{#MyAppSubDir}\lib\x86_64-win64\{#MyAppExeName}"; DestDir: "{app}"; Flags: ignoreversion; Check: Is64BitInstallMode
-Source: "{#MyAppSubDir}\lib\i386-win32\{#MyAppExeName}"; DestDir: "{app}"; Flags: ignoreversion; Check: not Is64BitInstallMode
+Source: "{#MyAppSubDir}\lib\x86_64-win64-Release\{#MyAppExeName}"; DestDir: "{app}"; Flags: ignoreversion; Check: Is64BitInstallMode
+Source: "{#MyAppSubDir}\lib\i386-win32-Release\{#MyAppExeName}"; DestDir: "{app}"; Flags: ignoreversion; Check: not Is64BitInstallMode
 ;Source: "{#MyAppSubDir}\Release notes.txt"; DestDir: "{app}"; Flags: ignoreversion
 Source: "{#MyAppSubDir}\Languages\*.po"; DestDir: "{app}\Languages"; Flags: ignoreversion

trunk/Install/win/build.bat

@@ -1 @@
-set LAZARUSDIR=C:\lazarus
+@echo off
 
-%LAZARUSDIR%\lazbuild ..\CoolDisk.lpi --build-mode="Windows 32-bit" --lazarusdir=%LAZARUSDIR%
-%LAZARUSDIR%\lazbuild ..\CoolDisk.lpi --build-mode="Windows 64-bit" --lazarusdir=%LAZARUSDIR%
+if not defined LAZDIR (
+  set LAZDIR=C:\lazarus
+)
+SET PROJECTNAME=CoolDisk
 
-"c:\Program Files (x86)\Inno Setup 5\ISCC.exe" "CoolDisk.iss"
+SET MAIN_EXE=..\..\%PROJECTNAME%.exe
+SET WIN32_EXE=..\..\lib\i386-win32-Release\%PROJECTNAME%.exe
+SET WIN64_EXE=..\..\lib\x86_64-win64-Release\%PROJECTNAME%.exe
+IF EXIST %MAIN_EXE% del %MAIN_EXE%
+IF EXIST %WIN32_EXE% del %WIN32_EXE%
+IF EXIST %WIN64_EXE% del %WIN64_EXE%
+
+%LAZDIR%\lazbuild.exe --lazarusdir=%LAZDIR% --build-mode="Release" --cpu=i386 --operating-system=Win32 ..\..\%PROJECTNAME%.lpi
+copy %MAIN_EXE% %WIN32_EXE%
+%LAZDIR%\lazbuild.exe --lazarusdir=%LAZDIR% --build-mode="Release" --cpu=x86_64 --operating-system=Win64 ..\..\%PROJECTNAME%.lpi
+copy %MAIN_EXE% %WIN64_EXE%
+
+
+"c:\Program Files (x86)\Inno Setup 6\ISCC.exe" "%PROJECTNAME%.iss"