Changeset 94 for trunk/Install/win

Timestamp:

Jul 20, 2018, 10:29:49 AM (6 years ago)

Author:

chronos

Message:

• Fixed: Windows installer build script.

Location:

trunk/Install/win

Files:

• LazFuck.iss (modified) (1 diff)
• build.bat (modified) (1 diff)

trunk/Install/win/LazFuck.iss

@@ -59 +59 @@
 
 [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}\Examples\*"; DestDir: "{app}\Examples"; Flags: ignoreversion
 ;Source: "{#MyAppSubDir}\Release notes.txt"; DestDir: "{app}"; Flags: ignoreversion

trunk/Install/win/build.bat

@@ -1 @@
-%LAZDIR%\lazbuild --lazarusdir=%LAZDIR% --build-mode="Windows 32-bit" ..\..\LazFuck.lpi
-%LAZDIR%\lazbuild --lazarusdir=%LAZDIR% --build-mode="Windows 64-bit" ..\..\LazFuck.lpi
+@echo off
 
-"c:\Program Files (x86)\Inno Setup 5\ISCC.exe" "LazFuck.iss"
+if not defined LAZDIR (
+  set LAZDIR=C:\lazarus
+)
+SET PROJECTNAME=LazFuck
+
+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 5\ISCC.exe" "%PROJECTNAME%.iss"