mirror of
https://gitlab.com/freepascal.org/lazarus/lazarus.git
synced 2025-04-13 21:39:39 +02:00
Fixed running installer on more than one disk drive.
git-svn-id: trunk@6104 -
This commit is contained in:
parent
17fcabd221
commit
c770b9b6d2
@ -1,4 +1,5 @@
|
||||
SET OLDCURDIR=%CD%
|
||||
SET OLDCURDRIVE=%CD:~,2%
|
||||
|
||||
SET SOURCE_DIR=%FPCCVSDIR%
|
||||
SET INSTALL_BASE=%BUILDDIR%\pp
|
||||
@ -7,6 +8,7 @@ SET INSTALL_BINDIR=%INSTALL_BASE%\bin\win32
|
||||
copy %FPCBINDIR%\as.exe %FPCBINDIR%\asw.exe
|
||||
copy %FPCBINDIR%\ld.exe %FPCBINDIR%\ldw.exe
|
||||
|
||||
%SOURCE_DIR:~,2%
|
||||
cd %SOURCE_DIR%
|
||||
%MAKEEXE% clean PP=%RELEASE_PPC% >> %LOGFILE%
|
||||
%MAKEEXE% compiler_cycle PP=%RELEASE_PPC% >> %LOGFILE%
|
||||
@ -27,4 +29,5 @@ set COMPILER=%SOURCE_DIR%/compiler/ppc386
|
||||
SET COMPILER=%INSTALL_BASE%\bin\win32\ppc386.exe
|
||||
%MAKEEXE% clean PP=%COMPILER% >> %LOGFILE%
|
||||
|
||||
cd %OLDCURDIR%
|
||||
%OLDCURDRIVE%
|
||||
cd %OLDCURDIR%
|
||||
|
@ -1,7 +1,9 @@
|
||||
SET OLDCURDRIVE=%CD:~,2%
|
||||
SET OLDCURDIR=%CD%
|
||||
|
||||
SET COMPILER=%BUILDDIR%\pp\bin\win32\ppc386.exe
|
||||
|
||||
%BUILDDRIVE%
|
||||
cd %BUILDDIR%
|
||||
%MAKEEXE% clean PP=%COMPILER% >> %LOGFILE%
|
||||
%MAKEEXE% all OPT="-gl -Xs" PP=%COMPILER% >> %LOGFILE%
|
||||
@ -9,4 +11,5 @@ cd %BUILDDIR%
|
||||
|
||||
%FPCBINDIR%\strip.exe startlazarus.exe
|
||||
|
||||
%OLDCURDRIVE%
|
||||
cd %OLDCURDIR%
|
@ -1,5 +1,5 @@
|
||||
:: These settings need to change for every build
|
||||
SET LAZVERSION=0.9.2.2a
|
||||
SET LAZVERSION=0.9.2.2
|
||||
|
||||
:: These setting are dependent on the configuration of the build machine
|
||||
:: Path to the Inno Setup Compiler
|
||||
@ -24,7 +24,7 @@ SET FPCBINDIR=c:\lazarus\source\fpcbindir
|
||||
SET BUILDDIR=c:\temp\lazbuild
|
||||
|
||||
:: Path to the tool to create an export using a local cvs directory
|
||||
SET EXPORTCVS=%LAZCVSDIR%\tools\install\copycvsdir\copycvsdir.exe
|
||||
SET EXPORTCVS=%LAZCVSDIR%\tools\install\cvsexportlocal.exe
|
||||
|
||||
|
||||
::=====================================================================
|
||||
@ -34,6 +34,7 @@ SET EXPORTCVS=%LAZCVSDIR%\tools\install\copycvsdir\copycvsdir.exe
|
||||
SET MAKEEXE=%FPCBINDIR%\mingw32-make.exe
|
||||
SET LOGFILE=%CD%\installer.log
|
||||
SET DATESTAMP=%date:~-4,4%%date:~-7,2%%date:~-10,2%
|
||||
SET BUILDDRIVE=%BUILDDIR:~,2%
|
||||
|
||||
ECHO Starting at: > %LOGFILE%
|
||||
%FPCBINDIR%\gdate >> %LOGFILE%
|
||||
@ -60,7 +61,7 @@ call build-lazarus.bat
|
||||
%ISCC% lazarus.iss >> installer.log
|
||||
|
||||
:: delete build dir
|
||||
del /s /q %BUILDDIR% > NUL
|
||||
rd /s /q %BUILDDIR% > NUL
|
||||
|
||||
SET PATH=%OLDPATH%
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user