mirror of
https://gitlab.com/freepascal.org/lazarus/lazarus.git
synced 2025-04-17 21:49:33 +02:00
windows installers: support for full fpc version (e.g. fpc 2.2.2rc1) in installer file name
git-svn-id: trunk@15359 -
This commit is contained in:
parent
f9241cd65d
commit
6b50bd835b
tools/install/win
@ -29,7 +29,7 @@ cp -pr %SOURCE_DIR%\packages %BUILDDIR%\fpc\source\packages >> %LOGFILE%
|
||||
|
||||
FOR /F %%L IN ('%SOURCE_DIR%\compiler\utils\fpc.exe -PB') DO SET COMPILER=%SOURCE_DIR%\compiler\%%L
|
||||
FOR /F %%L IN ('%COMPILER% -iV') DO SET FPCVERSION=%%L
|
||||
FOR /F %%L IN ('%COMPILER% -iW') DO SET FPCLONGVERSION=%%L
|
||||
FOR /F %%L IN ('%COMPILER% -iW') DO SET FPCFULLVERSION=%%L
|
||||
IF "%FPCVERSION:~,3%"=="2.0" SET HASFCL=1
|
||||
|
||||
%MAKEEXE% -C rtl clean PP=%COMPILER% >> %LOGFILE%
|
||||
|
@ -98,8 +98,8 @@ if not exist %BUILDDIR%\startlazarus.exe goto END
|
||||
if exist %GDBDIR% %SVN% export %GDBDIR% %BUILDDIR%\mingw
|
||||
|
||||
:: create the installer
|
||||
SET OutputFileName=lazarus-%LAZVERSION%-fpc-%FPCVERSION%-%DATESTAMP%-%FPCTARGETOS%
|
||||
if not [%IDE_WIDGETSET%]==[win32] SET OutputFileName=lazarus-%IDE_WIDGETSET%-%LAZVERSION%-fpc-%FPCVERSION%-%DATESTAMP%-%FPCTARGETOS%
|
||||
SET OutputFileName=lazarus-%LAZVERSION%-fpc-%FPCFULLVERSION%-%DATESTAMP%-%FPCTARGETOS%
|
||||
if not [%IDE_WIDGETSET%]==[win32] SET OutputFileName=lazarus-%IDE_WIDGETSET%-%LAZVERSION%-fpc-%FPCFULLVERSION%-%DATESTAMP%-%FPCTARGETOS%
|
||||
%ISCC% lazarus.iss >> installer.log
|
||||
|
||||
:: do not delete build dir, if installer failed.
|
||||
|
@ -3,7 +3,6 @@ EnableISX=true
|
||||
[Defines]
|
||||
#define AppVersion GetEnv('LazVersion')
|
||||
#define FPCVersion GetEnv('FPCVersion')
|
||||
#define FPCLongVersion GetEnv('FPCLongVersion')
|
||||
#define FPCTargetOS GetEnv('FPCTargetOS')
|
||||
#define FPCFullTarget GetEnv('FPCFullTarget')
|
||||
#define AppName "Lazarus"
|
||||
|
Loading…
Reference in New Issue
Block a user