paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-14 13:29:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

* logging enhanced, verbose support, error for non-4dos fixed

Browse Source
This commit is contained in:
Tomas Hajny 2000-01-29 16:24:01 +00:00
parent 997ddf88f9
commit f501e0a92a
2 changed files with 309 additions and 217 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

266
base/os2snap.bat
View File

@ -15,10 +15,14 @@ rem *** variable, which must end with \ if present). However, be sure which
rem *** version of AS.EXE, etc. gets called if several such files exist. rem *** version of AS.EXE, etc. gets called if several such files exist.
rem *** One of the following parameters may be specified: rtl, compiler, rem *** One of the following parameters may be specified: rtl, compiler,
rem *** both, cycle and snapshot ("snapshot" being the default), optionally rem *** both, cycle and snapshot ("snapshot" being the default), optionally
rem *** followed by a second parameter "debug" (causing debugging symbols rem *** followed by parameters "debug" (causing debugging symbols not to be
rem *** not to be stripped from the created compiler), or "release" (code rem *** stripped from the created compiler), "release" (code optimization,
rem *** optimization, debug info stripped out). Parameters _must_ be in rem *** debug info stripped out), and "verbose" (compiler messages are
rem *** lowercase to be recognized correctly, unless running under 4dos). rem *** shown; the same can be accomplished with setting environment
rem *** variable DOVERBOSE to 1). Parameters "debug" and "release" are
rem *** mutually exclusive (the later is used if both are present).
rem *** Parameters _must_ be in lowercase to be recognized correctly,
rem *** unless running under 4dos or compatible (e.g. NDOS).
rem *** Meaning of parameters: rem *** Meaning of parameters:
rem *** rtl .......... RTL only, _no_ snapshot created rem *** rtl .......... RTL only, _no_ snapshot created
rem *** compiler ..... compiler only, _no_ snapshot created rem *** compiler ..... compiler only, _no_ snapshot created
@ -38,10 +42,21 @@ rem *** reside in the same directory as the other required tools (AS.EXE,
rem *** LD.EXE, etc.). rem *** LD.EXE, etc.).
rem *** Environment variable OTHEROPTS may be used to specify additional rem *** Environment variable OTHEROPTS may be used to specify additional
rem *** switches (e.g. setting level of verbosity, etc.). rem *** switches (e.g. setting level of verbosity, etc.).
rem *** Environment variable FPCERRLOG can specify a file for error logging
rem *** (full path needed). Please, note, that the previous contents of
rem *** file will be overwritten each time the batch file is run.
rem *** Environment variable VERBOSEOPT may be used to specify level of
rem *** verbosity used with "verbose" parameter (-va by default, i.e. show
rem *** everything). Another way would be specifying this in OTHEROPTS
rem *** variable (see above) and not using "verbose" at all.
echo *"Makefile" for OS/2: if .%FPCERRLOG% == . set FPCERRLOG=CON
if .%FPCERRLOG% == . echo Error: Not enough environment space!!!
if .%FPCERRLOG% == . exit
echo *Setting up environment ... echo *"Makefile" for OS/2: > %FPCERRLOG%
echo *Setting up environment ... >> %FPCERRLOG%
rem Check whether FPCDIR exists rem Check whether FPCDIR exists
if %FPCDIR%. == . goto ErrorDir if %FPCDIR%. == . goto ErrorDir
@ -93,6 +108,9 @@ set RELEASEOPT2=-Xs
rem "Debug" options (add debug symbols, do all code generation checks) rem "Debug" options (add debug symbols, do all code generation checks)
set DEBUGOPT1=-g set DEBUGOPT1=-g
set DEBUGOPT2=-Crtoi set DEBUGOPT2=-Crtoi
rem "Verbose" options
if .%VERBOSEOPT% == . set VERBOSEOPT=-va
set DOVERBOSE=
rem Place for debug or release options, empty by default rem Place for debug or release options, empty by default
set CURRENTOPT1= set CURRENTOPT1=
set CURRENTOPT2= set CURRENTOPT2=
@ -116,15 +134,18 @@ rem Path to include files
set OS2INCP=-Fi%OS2RTL%;%OS2RTLC%;%OS2RTLO%;%OS2RTLP% set OS2INCP=-Fi%OS2RTL%;%OS2RTLC%;%OS2RTLO%;%OS2RTLP%
rem Default compiler for the first compilation rem Default compiler for the first compilation
set CYCLE=0 set CYCLE=0
if not .%CYCLE% == .0 goto EnvErr
set COMPILER=%FPCCOMPILER% set COMPILER=%FPCCOMPILER%
if not .%COMPILER% == .%FPCCOMPILER% goto EnvErr
if .%FPCCOMPILER% == . goto SetCompiler if .%FPCCOMPILER% == . goto SetCompiler
goto PrgFound goto PrgFound
:SetCompiler :SetCompiler
set COMPILER=PPC386.EXE set COMPILER=PPC386.EXE
if not .%COMPILER% == .PPC386.EXE goto EnvErr
:PrgFound :PrgFound
echo *Searching for tools ... echo *Searching for tools ... >> %FPCERRLOG%
set REALTOOLS=%FPCTOOLS% set REALTOOLS=%FPCTOOLS%
if %FPCTOOLS%. == . goto SetupTools if %FPCTOOLS%. == . goto SetupTools
@ -136,7 +157,7 @@ if exist %FPCDIR%\BIN\OS2\%COMPILER%.EXE goto Tools1
goto NoTools1 goto NoTools1
:Tools1 :Tools1
if exist %FPCDIR%\BIN\OS2\AS.EXE goto Tools1OK if exist %FPCDIR%\BIN\OS2\AS.EXE goto Tools1OK
echo *Warning: %COMPILER% found, but AS.EXE isn't in the same directory! echo *Warning: %COMPILER% found, but AS.EXE isn't in the same directory! >> %FPCERRLOG%
goto NoTools1 goto NoTools1
:Tools1OK :Tools1OK
set REALTOOLS=%FPCDIR%\BIN\OS2\ set REALTOOLS=%FPCDIR%\BIN\OS2\
@ -147,96 +168,102 @@ if exist %FPCDIR%\BIN\%COMPILER%.EXE goto Tools2
goto NoTools2 goto NoTools2
:Tools2 :Tools2
if exist %FPCDIR%\BIN\AS.EXE goto Tools2OK if exist %FPCDIR%\BIN\AS.EXE goto Tools2OK
echo *Warning: %COMPILER% found, but AS.EXE isn't in the same directory! echo *Warning: %COMPILER% found, but AS.EXE isn't in the same directory! >> %FPCERRLOG%
goto NoTools2 goto NoTools2
:Tools2OK :Tools2OK
set REALTOOLS=%FPCDIR%\BIN\ set REALTOOLS=%FPCDIR%\BIN\
goto ToolsOK goto ToolsOK
:NoTools2 :NoTools2
echo *Warning: Cannot locate your %COMPILER% and AS.EXE, make sure they're on PATH! echo *Warning: Cannot locate your %COMPILER% and AS.EXE, make sure they're on PATH! >> %FPCERRLOG%
:ToolsOK :ToolsOK
echo *Checking parameters echo *Checking parameters >> %FPCERRLOG%
set PARAMS=%1 set PARAMS=%1
if .%PARAMS% == . set PARAMS=snapshot if .%PARAMS% == . set PARAMS=snapshot
if %2. == debug set CURRENTOPT1=%DEBUGOPT1% :ParLoop
if %2. == debug set CURRENTOPT2=%DEBUGOPT2% shift
if %2. == release set CURRENTOPT1=%RELEASEOPT1% if %1. == . goto NoPars
if %2. == release set CURRENTOPT2=%RELEASEOPT2%
if %@EVAL[0] == 0 goto Shl1 if %@EVAL[0] == 0 goto Shl1
goto Cmd1 if %1 == debug set CURRENTOPT1=%DEBUGOPT1%
if %1 == debug set CURRENTOPT2=%DEBUGOPT2%
if %1 == release set CURRENTOPT1=%RELEASEOPT1%
if %1 == release set CURRENTOPT2=%RELEASEOPT2%
if %1 == verbose set DOVERBOSE=1
goto ParLoop
:Shl1 :Shl1
set PARAMS=%@LOWER[%PARAMS%] set PARAMS=%@LOWER[%PARAMS%]
if .%@LOWER[%2] == .debug set CURRENTOPT1=%DEBUGOPT1% if %@LOWER[%1] == debug set CURRENTOPT1=%DEBUGOPT1%
if .%@LOWER[%2] == .debug set CURRENTOPT2=%DEBUGOPT2% if %@LOWER[%1] == debug set CURRENTOPT2=%DEBUGOPT2%
if .%@LOWER[%2] == .release set CURRENTOPT1=%RELEASEOPT1% if %@LOWER[%1] == release set CURRENTOPT1=%RELEASEOPT1%
if .%@LOWER[%2] == .release set CURRENTOPT2=%RELEASEOPT2% if %@LOWER[%1] == release set CURRENTOPT2=%RELEASEOPT2%
:Cmd1 if %@LOWER[%1] == verbose set DOVERBOSE=1
goto ParLoop
:NoPars
if %PARAMS% == clean goto CleanRTL if %PARAMS% == clean goto CleanRTL
if %PARAMS% == both goto CleanRTL if %PARAMS% == both goto CleanRTL
if %PARAMS% == snapshot goto CleanRTL if %PARAMS% == snapshot goto CleanRTL
if %PARAMS% == rtl goto CleanRTL if %PARAMS% == rtl goto CleanRTL
if %PARAMS% == cycle goto CleanRTL if %PARAMS% == cycle goto CleanRTL
if %PARAMS% == compiler goto CleanCompiler if %PARAMS% == compiler goto CleanCompiler
echo *Error: Unknown parameter - %PARAMS% echo *Error: Unknown parameter - %PARAMS% >> %FPCERRLOG%
goto End goto End
:CleanRTL :CleanRTL
if %@eval[0] == 0 goto JPCleanRTL if %@eval[0] == 0 goto JPCleanRTL
echo *Cleaning up the RTL (error messages are OK here) ... echo *Cleaning up the RTL (error messages are OK here) ... >> %FPCERRLOG%
del %OS2OPTF% del %OS2OPTF% >> %FPCERRLOG%
del %OS2RTL%\*.ppo del %OS2RTL%\*.ppo >> %FPCERRLOG%
del %OS2RTL%\*.oo2 del %OS2RTL%\*.oo2 >> %FPCERRLOG%
del %OS2RTL%\ppas.bat del %OS2RTL%\ppas.bat >> %FPCERRLOG%
del %OS2RTL%\ppas.cmd del %OS2RTL%\ppas.cmd >> %FPCERRLOG%
del %OS2RTL%\link.res del %OS2RTL%\link.res >> %FPCERRLOG%
goto ContCleanRTL goto ContCleanRTL
:JPCleanRTL :JPCleanRTL
echo *Cleaning up the RTL ... echo *Cleaning up the RTL ... >> %FPCERRLOG%
del %OS2OPTF% >& nul del %OS2OPTF% >& nul >> %FPCERRLOG%
del %OS2RTL%\*.ppo >& nul del %OS2RTL%\*.ppo >& nul >> %FPCERRLOG%
del %OS2RTL%\*.oo2 >& nul del %OS2RTL%\*.oo2 >& nul >> %FPCERRLOG%
del %OS2RTL%\ppas.bat >& nul del %OS2RTL%\ppas.bat >& nul >> %FPCERRLOG%
del %OS2RTL%\ppas.cmd >& nul del %OS2RTL%\ppas.cmd >& nul >> %FPCERRLOG%
del %OS2RTL%\link.res >& nul del %OS2RTL%\link.res >& nul >> %FPCERRLOG%
:ContCleanRTL :ContCleanRTL
if %PARAMS% == rtl goto Branches if %PARAMS% == rtl goto Branches
:CleanCompiler :CleanCompiler
if %@eval[0] == 0 goto JPCleanComp if %@eval[0] == 0 goto JPCleanComp
echo *Cleaning up the compiler (error messages are OK here) ... echo *Cleaning up the compiler (error messages are OK here) ... >> %FPCERRLOG%
del %OS2OPTF% del %OS2OPTF% >> %FPCERRLOG%
del %COMPSPATH%\*.ppo del %COMPSPATH%\*.ppo >> %FPCERRLOG%
del %COMPSPATH%\*.oo2 del %COMPSPATH%\*.oo2 >> %FPCERRLOG%
del %COMPSPATH%\pp del %COMPSPATH%\pp >> %FPCERRLOG%
del %COMPSPATH%\pp.exe del %COMPSPATH%\pp.exe >> %FPCERRLOG%
del %COMPSPATH%\ppos2.exe del %COMPSPATH%\ppos2.exe >> %FPCERRLOG%
del %COMPSPATH%\ppas.bat del %COMPSPATH%\ppas.bat >> %FPCERRLOG%
del %COMPSPATH%\ppas.cmd del %COMPSPATH%\ppas.cmd >> %FPCERRLOG%
del %COMPSPATH%\link.res del %COMPSPATH%\link.res >> %FPCERRLOG%
goto ContCleanComp goto ContCleanComp
:JPCleanComp :JPCleanComp
echo *Cleaning up the compiler ... echo *Cleaning up the compiler ... >> %FPCERRLOG%
del %OS2OPTF% >& nul del %OS2OPTF% >& nul >> %FPCERRLOG%
del %COMPSPATH%\*.ppo >& nul del %COMPSPATH%\*.ppo >& nul >> %FPCERRLOG%
del %COMPSPATH%\*.oo2 >& nul del %COMPSPATH%\*.oo2 >& nul >> %FPCERRLOG%
del %COMPSPATH%\pp >& nul del %COMPSPATH%\pp >& nul >> %FPCERRLOG%
del %COMPSPATH%\pp.exe >& nul del %COMPSPATH%\pp.exe >& nul >> %FPCERRLOG%
del %COMPSPATH%\ppos2.exe >& nul del %COMPSPATH%\ppos2.exe >& nul >> %FPCERRLOG%
del %COMPSPATH%\ppas.bat >& nul del %COMPSPATH%\ppas.bat >& nul >> %FPCERRLOG%
del %COMPSPATH%\ppas.cmd >& nul del %COMPSPATH%\ppas.cmd >& nul >> %FPCERRLOG%
del %COMPSPATH%\link.res >& nul del %COMPSPATH%\link.res >& nul >> %FPCERRLOG%
:ContCleanComp :ContCleanComp
if %PARAMS% == compiler goto Branches if %PARAMS% == compiler goto Branches
if %PARAMS% == both goto Branches if %PARAMS% == both goto Branches
:CleanSnapshot :CleanSnapshot
if %@eval[0] == 0 goto JPCleanSnap if %@eval[0] == 0 goto JPCleanSnap
echo *Deleting the old snapshot (error messages are OK here) ... echo *Deleting the old snapshot (error messages are OK here) ... >> %FPCERRLOG%
del %FPCSRC%\snap-os2.zip del %FPCSRC%\snap-os2.zip >> %FPCERRLOG%
goto ContCleanSnap goto ContCleanSnap
:JPCleanSnap :JPCleanSnap
echo *Deleting the old snapshot ... echo *Deleting the old snapshot ... >> %FPCERRLOG%
del %FPCSRC%\snap-os2.zip >& nul del %FPCSRC%\snap-os2.zip >& nul >> %FPCERRLOG%
:ContCleanSnap :ContCleanSnap
if %PARAMS% == clean goto End if %PARAMS% == clean goto End
@ -246,11 +273,11 @@ if %PARAMS% == snapshot goto RTL1
if %PARAMS% == compiler goto Compiler if %PARAMS% == compiler goto Compiler
if %PARAMS% == rtl goto RTL1 if %PARAMS% == rtl goto RTL1
if %PARAMS% == cycle goto RTL1 if %PARAMS% == cycle goto RTL1
echo *Error: Unknown parameter - %PARAMS% echo *Error: Unknown parameter - %PARAMS% >> %FPCERRLOG%
goto End goto End
:RTL1 :RTL1
echo *Creating file with all the needed options and paths for RTL ... echo *Creating file with all the needed options and paths for RTL ... >> %FPCERRLOG%
echo %SKIPCFG% > %OS2OPTF% echo %SKIPCFG% > %OS2OPTF%
echo %OS2OPT1% >> %OS2OPTF% echo %OS2OPT1% >> %OS2OPTF%
echo %OS2OPT2% >> %OS2OPTF% echo %OS2OPT2% >> %OS2OPTF%
@ -264,62 +291,68 @@ echo -FD%REALTOOLS% >> %OS2OPTF%
if not .%CURRENTOPT1% == . echo %CURRENTOPT1% >> %OS2OPTF% if not .%CURRENTOPT1% == . echo %CURRENTOPT1% >> %OS2OPTF%
if not .%CURRENTOPT2% == . echo %CURRENTOPT2% >> %OS2OPTF% if not .%CURRENTOPT2% == . echo %CURRENTOPT2% >> %OS2OPTF%
if not .%FPCERRLOG% == . echo -Fe%FPCERRLOG% >> %OS2OPTF% if not .%FPCERRLOG% == . echo -Fe%FPCERRLOG% >> %OS2OPTF%
echo *Assembling the helpers ... if .%DOVERBOSE% == .1 echo %VERBOSEOPT% >> %OS2OPTF%
if not .%DOVERBOSE% == .1 goto CompStart1
echo *Start of options used for compilation >> %FPCERRLOG%
type %OS2OPTF% >> %FPCERRLOG%
echo *End of options used for compilation >> %FPCERRLOG%
:CompStart1
echo *Assembling the helpers ... >> %FPCERRLOG%
%REALTOOLS%\as -o %OS2RTL%\prt0.oo2 %OS2RTL%\prt0.as %REALTOOLS%\as -o %OS2RTL%\prt0.oo2 %OS2RTL%\prt0.as
%REALTOOLS%\as -o %OS2RTL%\prt1.oo2 %OS2RTL%\prt1.as %REALTOOLS%\as -o %OS2RTL%\prt1.oo2 %OS2RTL%\prt1.as
%REALTOOLS%\as -o %OS2RTL%\code2.oo2 %OS2RTL%\code2.as %REALTOOLS%\as -o %OS2RTL%\code2.oo2 %OS2RTL%\code2.as
%REALTOOLS%\as -o %OS2RTL%\code3.oo2 %OS2RTL%\code3.as %REALTOOLS%\as -o %OS2RTL%\code3.oo2 %OS2RTL%\code3.as
echo *Compiling the system unit ... echo *Compiling the system unit ... >> %FPCERRLOG%
%REALTOOLS%%COMPILER% @%OS2OPTF% -Us %OTHEROPTS% %OS2RTL%\SYSOS2.PAS %REALTOOLS%%COMPILER% @%OS2OPTF% -Us %OTHEROPTS% %OS2RTL%\SYSOS2.PAS
echo *Compiling unit Objects ... echo *Compiling unit Objects ... >> %FPCERRLOG%
%REALTOOLS%%COMPILER% @%OS2OPTF% %OTHEROPTS% %OS2RTLC%\OBJECTS.PP %REALTOOLS%%COMPILER% @%OS2OPTF% %OTHEROPTS% %OS2RTLC%\OBJECTS.PP
echo *Compiling unit Strings ... echo *Compiling unit Strings ... >> %FPCERRLOG%
%REALTOOLS%%COMPILER% @%OS2OPTF% %OTHEROPTS% %OS2RTLC%\STRINGS.PP %REALTOOLS%%COMPILER% @%OS2OPTF% %OTHEROPTS% %OS2RTLC%\STRINGS.PP
echo *Compiling unit HeapTrace ... echo *Compiling unit HeapTrace ... >> %FPCERRLOG%
%REALTOOLS%%COMPILER% @%OS2OPTF% %OTHEROPTS% %OS2RTLC%\HEAPTRC.PP %REALTOOLS%%COMPILER% @%OS2OPTF% %OTHEROPTS% %OS2RTLC%\HEAPTRC.PP
echo *Compiling unit CPU ... echo *Compiling unit CPU ... >> %FPCERRLOG%
%REALTOOLS%%COMPILER% @%OS2OPTF% %OTHEROPTS% %OS2RTLP%\CPU.PP %REALTOOLS%%COMPILER% @%OS2OPTF% %OTHEROPTS% %OS2RTLP%\CPU.PP
echo *Compiling unit MMX ... echo *Compiling unit MMX ... >> %FPCERRLOG%
%REALTOOLS%%COMPILER% @%OS2OPTF% %OTHEROPTS% %OS2RTLP%\MMX.PP %REALTOOLS%%COMPILER% @%OS2OPTF% %OTHEROPTS% %OS2RTLP%\MMX.PP
echo *Compiling unit TypInfo ... echo *Compiling unit TypInfo ... >> %FPCERRLOG%
%REALTOOLS%%COMPILER% @%OS2OPTF% %OTHEROPTS% %OS2RTLO%\TYPINFO.PP %REALTOOLS%%COMPILER% @%OS2OPTF% %OTHEROPTS% %OS2RTLO%\TYPINFO.PP
echo *Compiling unit DosCalls ... echo *Compiling unit DosCalls ... >> %FPCERRLOG%
%REALTOOLS%%COMPILER% @%OS2OPTF% %OTHEROPTS% %OS2RTL%\DOSCALLS.PAS %REALTOOLS%%COMPILER% @%OS2OPTF% %OTHEROPTS% %OS2RTL%\DOSCALLS.PAS
echo *Compiling unit DOS ... echo *Compiling unit DOS ... >> %FPCERRLOG%
%REALTOOLS%%COMPILER% @%OS2OPTF% %OTHEROPTS% %OS2RTL%\DOS.PAS %REALTOOLS%%COMPILER% @%OS2OPTF% %OTHEROPTS% %OS2RTL%\DOS.PAS
echo *Compiling unit CRT ... echo *Compiling unit CRT ... >> %FPCERRLOG%
%REALTOOLS%%COMPILER% @%OS2OPTF% %OTHEROPTS% %OS2RTL%\CRT.PAS %REALTOOLS%%COMPILER% @%OS2OPTF% %OTHEROPTS% %OS2RTL%\CRT.PAS
echo *Compiling unit Printer ... echo *Compiling unit Printer ... >> %FPCERRLOG%
%REALTOOLS%%COMPILER% @%OS2OPTF% %OTHEROPTS% %OS2RTL%\PRINTER.PAS %REALTOOLS%%COMPILER% @%OS2OPTF% %OTHEROPTS% %OS2RTL%\PRINTER.PAS
echo *Compiling unit SysUtils ... echo *Compiling unit SysUtils ... >> %FPCERRLOG%
%REALTOOLS%%COMPILER% @%OS2OPTF% %OTHEROPTS% %OS2RTLO%\SYSUTILS.PP %REALTOOLS%%COMPILER% @%OS2OPTF% %OTHEROPTS% %OS2RTLO%\SYSUTILS.PP
echo *Compiling unit Math ... echo *Compiling unit Math ... >> %FPCERRLOG%
%REALTOOLS%%COMPILER% @%OS2OPTF% %OTHEROPTS% %OS2RTLO%\MATH.PP %REALTOOLS%%COMPILER% @%OS2OPTF% %OTHEROPTS% %OS2RTLO%\MATH.PP
echo *Compiling unit UComplex ... echo *Compiling unit UComplex ... >> %FPCERRLOG%
%REALTOOLS%%COMPILER% @%OS2OPTF% %OTHEROPTS% %OS2RTLC%\UCOMPLEX.PP %REALTOOLS%%COMPILER% @%OS2OPTF% %OTHEROPTS% %OS2RTLC%\UCOMPLEX.PP
echo *Compiling unit GetOpts ... echo *Compiling unit GetOpts ... >> %FPCERRLOG%
%REALTOOLS%%COMPILER% @%OS2OPTF% %OTHEROPTS% %OS2RTLC%\GETOPTS.PP %REALTOOLS%%COMPILER% @%OS2OPTF% %OTHEROPTS% %OS2RTLC%\GETOPTS.PP
echo *Compiling unit KbdCalls ... echo *Compiling unit KbdCalls ... >> %FPCERRLOG%
%REALTOOLS%%COMPILER% @%OS2OPTF% %OTHEROPTS% %OS2RTL%\KBDCALLS.PAS %REALTOOLS%%COMPILER% @%OS2OPTF% %OTHEROPTS% %OS2RTL%\KBDCALLS.PAS
echo *Compiling unit MouCalls ... echo *Compiling unit MouCalls ... >> %FPCERRLOG%
%REALTOOLS%%COMPILER% @%OS2OPTF% %OTHEROPTS% %OS2RTL%\MOUCALLS.PAS %REALTOOLS%%COMPILER% @%OS2OPTF% %OTHEROPTS% %OS2RTL%\MOUCALLS.PAS
echo *Compiling unit VioCalls ... echo *Compiling unit VioCalls ... >> %FPCERRLOG%
%REALTOOLS%%COMPILER% @%OS2OPTF% %OTHEROPTS% %OS2RTL%\VIOCALLS.PAS %REALTOOLS%%COMPILER% @%OS2OPTF% %OTHEROPTS% %OS2RTL%\VIOCALLS.PAS
echo *Compiling unit MonCalls ... echo *Compiling unit MonCalls ... >> %FPCERRLOG%
%REALTOOLS%%COMPILER% @%OS2OPTF% %OTHEROPTS% %OS2RTL%\MONCALLS.PAS %REALTOOLS%%COMPILER% @%OS2OPTF% %OTHEROPTS% %OS2RTL%\MONCALLS.PAS
echo *Compiling unit Ports ... echo *Compiling unit Ports ... >> %FPCERRLOG%
%REALTOOLS%%COMPILER% @%OS2OPTF% %OTHEROPTS% %OS2RTL%\PORTS.PAS %REALTOOLS%%COMPILER% @%OS2OPTF% %OTHEROPTS% %OS2RTL%\PORTS.PAS
echo *Compiling PM units ... echo *Compiling PM units ... >> %FPCERRLOG%
%REALTOOLS%%COMPILER% @%OS2OPTF% %OTHEROPTS% %OS2RTL%\PMWIN.PAS %REALTOOLS%%COMPILER% @%OS2OPTF% %OTHEROPTS% %OS2RTL%\PMWIN.PAS
%REALTOOLS%%COMPILER% @%OS2OPTF% %OTHEROPTS% %OS2RTL%\PMBITMAP.PAS %REALTOOLS%%COMPILER% @%OS2OPTF% %OTHEROPTS% %OS2RTL%\PMBITMAP.PAS
%REALTOOLS%%COMPILER% @%OS2OPTF% %OTHEROPTS% %OS2RTL%\PMGPI.PAS %REALTOOLS%%COMPILER% @%OS2OPTF% %OTHEROPTS% %OS2RTL%\PMGPI.PAS
echo *Compiling MMOS2 units ... echo *Compiling MMOS2 units ... >> %FPCERRLOG%
%REALTOOLS%%COMPILER% @%OS2OPTF% %OTHEROPTS% %OS2RTL%\DIVE.PAS %REALTOOLS%%COMPILER% @%OS2OPTF% %OTHEROPTS% %OS2RTL%\DIVE.PAS
if %PARAMS% == rtl goto End if %PARAMS% == rtl goto End
:Compiler :Compiler
echo *Creating file with all the needed options and paths for the compiler ... echo *Creating file with all the needed options and paths for the compiler ... >> %FPCERRLOG%
echo %SKIPCFG% > %OS2OPTF% echo %SKIPCFG% > %OS2OPTF%
echo %OS2OPT1% >> %OS2OPTF% echo %OS2OPT1% >> %OS2OPTF%
echo %OS2OPT2% >> %OS2OPTF% echo %OS2OPT2% >> %OS2OPTF%
@ -336,23 +369,31 @@ echo %OS2EXET% >> %OS2OPTF%
if not .%CURRENTOPT1% == . echo %CURRENTOPT1% >> %OS2OPTF% if not .%CURRENTOPT1% == . echo %CURRENTOPT1% >> %OS2OPTF%
if not .%CURRENTOPT2% == . echo %CURRENTOPT2% >> %OS2OPTF% if not .%CURRENTOPT2% == . echo %CURRENTOPT2% >> %OS2OPTF%
if not .%FPCERRLOG% == . echo -Fe%FPCERRLOG% >> %OS2OPTF% if not .%FPCERRLOG% == . echo -Fe%FPCERRLOG% >> %OS2OPTF%
echo *Compiling the compiler ... if .%DOVERBOSE% == .1 echo %VERBOSEOPT% >> %OS2OPTF%
if not .%DOVERBOSE% == .1 goto CompStart2
echo *Start of options used for compilation >> %FPCERRLOG%
type %OS2OPTF% >> %FPCERRLOG%
echo *End of options used for compilation >> %FPCERRLOG%
:CompStart2
echo *Compiling the compiler ... >> %FPCERRLOG%
%REALTOOLS%%COMPILER% @%OS2OPTF% %OTHEROPTS% %COMPSPATH%\PP.PAS %REALTOOLS%%COMPILER% @%OS2OPTF% %OTHEROPTS% %COMPSPATH%\PP.PAS
:Comp2 :Comp2
ren %COMPSPATH%\pp.exe ppos2.exe ren %COMPSPATH%\pp.exe ppos2.exe >> %FPCERRLOG%
if exist %COMPSPATH%\ppos2.exe goto OKCompiler if exist %COMPSPATH%\ppos2.exe goto OKCompiler
if not exist %COMPSPATH%\pp goto C2Cont
if exist %COMPSPATH%\ppas.bat goto PPasBat if exist %COMPSPATH%\ppas.bat goto PPasBat
if exist %COMPSPATH%\ppas.cmd goto PPasCmd if exist %COMPSPATH%\ppas.cmd goto PPasCmd
echo *Error: The compiler wasn't compiled!! :C2Cont
echo *Error: The compiler wasn't compiled!! >> %FPCERRLOG%
goto End goto End
:PPasCmd :PPasCmd
ren %COMPSPATH%\ppas.cmd ppas.bat ren %COMPSPATH%\ppas.cmd ppas.bat >> %FPCERRLOG%
:PPasBat :PPasBat
echo *Automatic binding failed, trying again ... echo *Automatic binding failed, trying again ... >> %FPCERRLOG%
call %COMPSPATH%\ppas.bat call %COMPSPATH%\ppas.bat
del %COMPSPATH%\ppas.bat del %COMPSPATH%\ppas.bat >> %FPCERRLOG%
goto Comp2 goto Comp2
:OKCompiler :OKCompiler
@ -366,30 +407,33 @@ goto CheckEnv
rem Another loop? rem Another loop?
if %CYCLE% == 2 goto CheckEnv if %CYCLE% == 2 goto CheckEnv
echo *Backing up previous compiler version ... echo *Backing up previous compiler version ... >> %FPCERRLOG%
copy %REALTOOLS%ppos2.exe %REALTOOLS%ppos2.%CYCLE% copy %REALTOOLS%ppos2.exe %REALTOOLS%ppos2.%CYCLE% >> %FPCERRLOG%
echo *Copying the newly created compiler to %REALTOOLS% ... echo *Copying the newly created compiler to %REALTOOLS% ... >> %FPCERRLOG%
copy %COMPSPATH%\ppos2.exe %REALTOOLS%. copy %COMPSPATH%\ppos2.exe %REALTOOLS%. >> %FPCERRLOG%
if %CYCLE% == 1 goto Cycle2 if %CYCLE% == 1 goto Cycle2
set COMPILER=PPOS2.EXE set COMPILER=PPOS2.EXE
set CYCLE=1 set CYCLE=1
goto Cmd1 goto NoPars
:Cycle2 :Cycle2
set CYCLE=2 set CYCLE=2
goto Cmd1 goto NoPars
:CheckEnv :CheckEnv
if %@EVAL[0] == 0 goto Pack if %@EVAL[0] == 0 goto Pack
echo *Warning: Packing in this environment might fail. echo *Warning: Packing in this environment might fail. >> %FPCERRLOG%
echo *You should press Ctrl-Break now if the current drive is different from that echo *You should press Ctrl-Break now if the current drive is different from that >> %FPCERRLOG%
echo *of %FPCDIR%; otherwise press any key to continue. echo *of %FPCDIR%; otherwise press any key to continue. >> %FPCERRLOG%
if not %FPCERRLOG% == CON echo *Warning: Packing in this environment might fail.
if not %FPCERRLOG% == CON echo *You should press Ctrl-Break now if the current drive is different from that
if not %FPCERRLOG% == CON echo *of %FPCDIR%; otherwise press any key to continue.
pause>nul pause>nul
cd %FPCSRC% cd %FPCSRC%
:Pack :Pack
echo *Packing the snapshot ... echo *Packing the snapshot ... >> %FPCERRLOG%
if %@EVAL[0] == 0 goto SHL2 if %@EVAL[0] == 0 goto SHL2
goto Cmd2 goto Cmd2
:Shl2 :Shl2
@ -398,22 +442,30 @@ cdd %FPCSRC%
:Cmd2 :Cmd2
rem ZIP.EXE must be on the PATH rem ZIP.EXE must be on the PATH
zip -9 -r snap-os2.zip compiler\ppos2.exe rtl\os2\*.ppo rtl\os2\*.oo2 rtl\os2\*.ao2 zip -9 -r snap-os2.zip compiler\ppos2.exe rtl\os2\*.ppo rtl\os2\*.oo2 rtl\os2\*.ao2 >> %FPCERRLOG%
if exist snap-os2.zip goto ZipOK if exist snap-os2.zip goto ZipOK
echo *Error: The ZIP file hasn't been created!! echo *Error: The ZIP file hasn't been created!! >> %FPCERRLOG%
:ZipOK :ZipOK
if %@EVAL[0] == 0 popd if %@EVAL[0] == 0 popd
echo *Done. echo *Done. >> %FPCERRLOG%
goto End goto End
:ErrorDir :ErrorDir
echo *Error: Environment variable FPCDIR must point to your base FPC directory!!! echo *Error: Environment variable FPCDIR must point to your base FPC directory!!! >> %FPCERRLOG%
goto End
:EnvErr
echo *Error: Not enough environment space!!! >> %FPCERRLOG%
goto End goto End
$Log$ $Log$
Revision 1.7 2000-01-26 22:34:36 hajny Revision 1.8 2000-01-29 16:24:01 hajny
* logging enhanced, verbose support, error for non-4dos fixed
Revision 1.7 2000/01/26 22:34:36 hajny
* support for error logging added * support for error logging added
Revision 1.6 2000/01/16 18:44:21 hajny Revision 1.6 2000/01/16 18:44:21 hajny

260
base/os2snap.cmd
View File

@ -11,10 +11,14 @@ rem *** variable, which must end with \ if present). However, be sure which
rem *** version of AS.EXE, etc. gets called if several such files exist. rem *** version of AS.EXE, etc. gets called if several such files exist.
rem *** One of the following parameters may be specified: rtl, compiler, rem *** One of the following parameters may be specified: rtl, compiler,
rem *** both, cycle and snapshot ("snapshot" being the default), optionally rem *** both, cycle and snapshot ("snapshot" being the default), optionally
rem *** followed by a second parameter "debug" (causing debugging symbols rem *** followed by parameters "debug" (causing debugging symbols not to be
rem *** not to be stripped from the created compiler), or "release" (code rem *** stripped from the created compiler), "release" (code optimization,
rem *** optimization, debug info stripped out). Parameters _must_ be in rem *** debug info stripped out), and "verbose" (compiler messages are
rem *** lowercase to be recognized correctly, unless running under 4os2). rem *** shown; the same can be accomplished with setting environment
rem *** variable DOVERBOSE to 1). Parameters "debug" and "release" are
rem *** mutually exclusive (the later is used if both are present).
rem *** Parameters _must_ be in lowercase to be recognized correctly,
rem *** unless running under 4os2 or compatible.
rem *** Meaning of parameters: rem *** Meaning of parameters:
rem *** rtl .......... RTL only, _no_ snapshot created rem *** rtl .......... RTL only, _no_ snapshot created
rem *** compiler ..... compiler only, _no_ snapshot created rem *** compiler ..... compiler only, _no_ snapshot created
@ -34,11 +38,18 @@ rem *** LD.EXE, etc.).
rem *** Environment variable OTHEROPTS may be used to specify additional rem *** Environment variable OTHEROPTS may be used to specify additional
rem *** switches (e.g. setting level of verbosity, etc.). rem *** switches (e.g. setting level of verbosity, etc.).
rem *** Environment variable FPCERRLOG can specify a file for error logging rem *** Environment variable FPCERRLOG can specify a file for error logging
rem *** (full path needed). rem *** (full path needed). Please, note, that the previous contents of
rem *** file will be overwritten each time the batch file is run.
rem *** Environment variable VERBOSEOPT may be used to specify level of
rem *** verbosity used with "verbose" parameter (-va by default, i.e. show
rem *** everything). Another way would be specifying this in OTHEROPTS
rem *** variable (see above) and not using "verbose" at all.
echo *"Makefile" for OS/2: if .%FPCERRLOG% == . set FPCERRLOG=CON
echo *Setting up environment ... echo *"Makefile" for OS/2: > %FPCERRLOG%
echo *Setting up environment ... >> %FPCERRLOG%
rem Check whether FPCDIR exists rem Check whether FPCDIR exists
if %FPCDIR%. == . goto ErrorDir if %FPCDIR%. == . goto ErrorDir
@ -90,6 +101,9 @@ set RELEASEOPT2=-Xs
rem "Debug" options (add debug symbols, do all code generation checks) rem "Debug" options (add debug symbols, do all code generation checks)
set DEBUGOPT1=-g set DEBUGOPT1=-g
set DEBUGOPT2=-Crtoi set DEBUGOPT2=-Crtoi
rem "Verbose" options
if .%VERBOSEOPT% == . set VERBOSEOPT=-va
set DOVERBOSE=
rem Place for debug or release options, empty by default rem Place for debug or release options, empty by default
set CURRENTOPT1= set CURRENTOPT1=
set CURRENTOPT2= set CURRENTOPT2=
@ -121,7 +135,7 @@ set COMPILER=PPOS2.EXE
:PrgFound :PrgFound
echo *Searching for tools ... echo *Searching for tools ... >> %FPCERRLOG%
set REALTOOLS=%FPCTOOLS% set REALTOOLS=%FPCTOOLS%
if %FPCTOOLS%. == . goto SetupTools if %FPCTOOLS%. == . goto SetupTools
@ -133,7 +147,7 @@ if exist %FPCDIR%\BIN\OS2\%COMPILER%.EXE goto Tools1
goto NoTools1 goto NoTools1
:Tools1 :Tools1
if exist %FPCDIR%\BIN\OS2\AS.EXE goto Tools1OK if exist %FPCDIR%\BIN\OS2\AS.EXE goto Tools1OK
echo *Warning: %COMPILER% found, but AS.EXE isn't in the same directory! echo *Warning: %COMPILER% found, but AS.EXE isn't in the same directory! >> %FPCERRLOG%
goto NoTools1 goto NoTools1
:Tools1OK :Tools1OK
set REALTOOLS=%FPCDIR%\BIN\OS2\ set REALTOOLS=%FPCDIR%\BIN\OS2\
@ -144,96 +158,102 @@ if exist %FPCDIR%\BIN\%COMPILER%.EXE goto Tools2
goto NoTools2 goto NoTools2
:Tools2 :Tools2
if exist %FPCDIR%\BIN\AS.EXE goto Tools2OK if exist %FPCDIR%\BIN\AS.EXE goto Tools2OK
echo *Warning: %COMPILER% found, but AS.EXE isn't in the same directory! echo *Warning: %COMPILER% found, but AS.EXE isn't in the same directory! >> %FPCERRLOG%
goto NoTools2 goto NoTools2
:Tools2OK :Tools2OK
set REALTOOLS=%FPCDIR%\BIN\ set REALTOOLS=%FPCDIR%\BIN\
goto ToolsOK goto ToolsOK
:NoTools2 :NoTools2
echo *Warning: Cannot locate your %COMPILER% and AS.EXE, make sure they're on PATH! echo *Warning: Cannot locate your %COMPILER% and AS.EXE, make sure they're on PATH! >> %FPCERRLOG%
:ToolsOK :ToolsOK
echo *Checking parameters echo *Checking parameters >> %FPCERRLOG%
set PARAMS=%1 set PARAMS=%1
if .%PARAMS% == . set PARAMS=snapshot if .%PARAMS% == . set PARAMS=snapshot
if %2. == debug set CURRENTOPT1=%DEBUGOPT1% :ParLoop
if %2. == debug set CURRENTOPT2=%DEBUGOPT2% shift
if %2. == release set CURRENTOPT1=%RELEASEOPT1% if %1. == . goto NoPars
if %2. == release set CURRENTOPT2=%RELEASEOPT2%
if %@EVAL[0] == 0 goto Shl1 if %@EVAL[0] == 0 goto Shl1
goto Cmd1 if %1 == debug set CURRENTOPT1=%DEBUGOPT1%
if %1 == debug set CURRENTOPT2=%DEBUGOPT2%
if %1 == release set CURRENTOPT1=%RELEASEOPT1%
if %1 == release set CURRENTOPT2=%RELEASEOPT2%
if %1 == verbose set DOVERBOSE=1
goto ParLoop
:Shl1 :Shl1
set PARAMS=%@LOWER[%PARAMS%] set PARAMS=%@LOWER[%PARAMS%]
if .%@LOWER[%2] == .debug set CURRENTOPT1=%DEBUGOPT1% if %@LOWER[%1] == debug set CURRENTOPT1=%DEBUGOPT1%
if .%@LOWER[%2] == .debug set CURRENTOPT2=%DEBUGOPT2% if %@LOWER[%1] == debug set CURRENTOPT2=%DEBUGOPT2%
if .%@LOWER[%2] == .release set CURRENTOPT1=%RELEASEOPT1% if %@LOWER[%1] == release set CURRENTOPT1=%RELEASEOPT1%
if .%@LOWER[%2] == .release set CURRENTOPT2=%RELEASEOPT2% if %@LOWER[%1] == release set CURRENTOPT2=%RELEASEOPT2%
:Cmd1 if %@LOWER[%1] == verbose set DOVERBOSE=1
goto ParLoop
:NoPars
if %PARAMS% == clean goto CleanRTL if %PARAMS% == clean goto CleanRTL
if %PARAMS% == both goto CleanRTL if %PARAMS% == both goto CleanRTL
if %PARAMS% == snapshot goto CleanRTL if %PARAMS% == snapshot goto CleanRTL
if %PARAMS% == rtl goto CleanRTL if %PARAMS% == rtl goto CleanRTL
if %PARAMS% == cycle goto CleanRTL if %PARAMS% == cycle goto CleanRTL
if %PARAMS% == compiler goto CleanCompiler if %PARAMS% == compiler goto CleanCompiler
echo *Error: Unknown parameter - %PARAMS% echo *Error: Unknown parameter - %PARAMS% >> %FPCERRLOG%
goto End goto End
:CleanRTL :CleanRTL
if %@eval[0] == 0 goto JPCleanRTL if %@eval[0] == 0 goto JPCleanRTL
echo *Cleaning up the RTL (error messages are OK here) ... echo *Cleaning up the RTL (error messages are OK here) ... >> %FPCERRLOG%
del %OS2OPTF% del %OS2OPTF% >> %FPCERRLOG%
del %OS2RTL%\*.ppo del %OS2RTL%\*.ppo >> %FPCERRLOG%
del %OS2RTL%\*.oo2 del %OS2RTL%\*.oo2 >> %FPCERRLOG%
del %OS2RTL%\ppas.bat del %OS2RTL%\ppas.bat >> %FPCERRLOG%
del %OS2RTL%\ppas.cmd del %OS2RTL%\ppas.cmd >> %FPCERRLOG%
del %OS2RTL%\link.res del %OS2RTL%\link.res >> %FPCERRLOG%
goto ContCleanRTL goto ContCleanRTL
:JPCleanRTL :JPCleanRTL
echo *Cleaning up the RTL ... echo *Cleaning up the RTL ... >> %FPCERRLOG%
del %OS2OPTF% >& nul del %OS2OPTF% >& nul >> %FPCERRLOG%
del %OS2RTL%\*.ppo >& nul del %OS2RTL%\*.ppo >& nul >> %FPCERRLOG%
del %OS2RTL%\*.oo2 >& nul del %OS2RTL%\*.oo2 >& nul >> %FPCERRLOG%
del %OS2RTL%\ppas.bat >& nul del %OS2RTL%\ppas.bat >& nul >> %FPCERRLOG%
del %OS2RTL%\ppas.cmd >& nul del %OS2RTL%\ppas.cmd >& nul >> %FPCERRLOG%
del %OS2RTL%\link.res >& nul del %OS2RTL%\link.res >& nul >> %FPCERRLOG%
:ContCleanRTL :ContCleanRTL
if %PARAMS% == rtl goto Branches if %PARAMS% == rtl goto Branches
:CleanCompiler :CleanCompiler
if %@eval[0] == 0 goto JPCleanComp if %@eval[0] == 0 goto JPCleanComp
echo *Cleaning up the compiler (error messages are OK here) ... echo *Cleaning up the compiler (error messages are OK here) ... >> %FPCERRLOG%
del %OS2OPTF% del %OS2OPTF% >> %FPCERRLOG%
del %COMPSPATH%\*.ppo del %COMPSPATH%\*.ppo >> %FPCERRLOG%
del %COMPSPATH%\*.oo2 del %COMPSPATH%\*.oo2 >> %FPCERRLOG%
del %COMPSPATH%\pp del %COMPSPATH%\pp >> %FPCERRLOG%
del %COMPSPATH%\pp.exe del %COMPSPATH%\pp.exe >> %FPCERRLOG%
del %COMPSPATH%\ppos2.exe del %COMPSPATH%\ppos2.exe >> %FPCERRLOG%
del %COMPSPATH%\ppas.bat del %COMPSPATH%\ppas.bat >> %FPCERRLOG%
del %COMPSPATH%\ppas.cmd del %COMPSPATH%\ppas.cmd >> %FPCERRLOG%
del %COMPSPATH%\link.res del %COMPSPATH%\link.res >> %FPCERRLOG%
goto ContCleanComp goto ContCleanComp
:JPCleanComp :JPCleanComp
echo *Cleaning up the compiler ... echo *Cleaning up the compiler ... >> %FPCERRLOG%
del %OS2OPTF% >& nul del %OS2OPTF% >& nul >> %FPCERRLOG%
del %COMPSPATH%\*.ppo >& nul del %COMPSPATH%\*.ppo >& nul >> %FPCERRLOG%
del %COMPSPATH%\*.oo2 >& nul del %COMPSPATH%\*.oo2 >& nul >> %FPCERRLOG%
del %COMPSPATH%\pp >& nul del %COMPSPATH%\pp >& nul >> %FPCERRLOG%
del %COMPSPATH%\pp.exe >& nul del %COMPSPATH%\pp.exe >& nul >> %FPCERRLOG%
del %COMPSPATH%\ppos2.exe >& nul del %COMPSPATH%\ppos2.exe >& nul >> %FPCERRLOG%
del %COMPSPATH%\ppas.bat >& nul del %COMPSPATH%\ppas.bat >& nul >> %FPCERRLOG%
del %COMPSPATH%\ppas.cmd >& nul del %COMPSPATH%\ppas.cmd >& nul >> %FPCERRLOG%
del %COMPSPATH%\link.res >& nul del %COMPSPATH%\link.res >& nul >> %FPCERRLOG%
:ContCleanComp :ContCleanComp
if %PARAMS% == compiler goto Branches if %PARAMS% == compiler goto Branches
if %PARAMS% == both goto Branches if %PARAMS% == both goto Branches
:CleanSnapshot :CleanSnapshot
if %@eval[0] == 0 goto JPCleanSnap if %@eval[0] == 0 goto JPCleanSnap
echo *Deleting the old snapshot (error messages are OK here) ... echo *Deleting the old snapshot (error messages are OK here) ... >> %FPCERRLOG%
del %FPCSRC%\snap-os2.zip del %FPCSRC%\snap-os2.zip >> %FPCERRLOG%
goto ContCleanSnap goto ContCleanSnap
:JPCleanSnap :JPCleanSnap
echo *Deleting the old snapshot ... echo *Deleting the old snapshot ... >> %FPCERRLOG%
del %FPCSRC%\snap-os2.zip >& nul del %FPCSRC%\snap-os2.zip >& nul >> %FPCERRLOG%
:ContCleanSnap :ContCleanSnap
if %PARAMS% == clean goto End if %PARAMS% == clean goto End
@ -243,11 +263,11 @@ if %PARAMS% == snapshot goto RTL1
if %PARAMS% == compiler goto Compiler if %PARAMS% == compiler goto Compiler
if %PARAMS% == rtl goto RTL1 if %PARAMS% == rtl goto RTL1
if %PARAMS% == cycle goto RTL1 if %PARAMS% == cycle goto RTL1
echo *Error: Unknown parameter - %PARAMS% echo *Error: Unknown parameter - %PARAMS% >> %FPCERRLOG%
goto End goto End
:RTL1 :RTL1
echo *Creating file with all the needed options and paths for RTL ... echo *Creating file with all the needed options and paths for RTL ... >> %FPCERRLOG%
echo %SKIPCFG% > %OS2OPTF% echo %SKIPCFG% > %OS2OPTF%
echo %OS2OPT1% >> %OS2OPTF% echo %OS2OPT1% >> %OS2OPTF%
echo %OS2OPT2% >> %OS2OPTF% echo %OS2OPT2% >> %OS2OPTF%
@ -261,62 +281,68 @@ echo -FD%REALTOOLS% >> %OS2OPTF%
if not .%CURRENTOPT1% == . echo %CURRENTOPT1% >> %OS2OPTF% if not .%CURRENTOPT1% == . echo %CURRENTOPT1% >> %OS2OPTF%
if not .%CURRENTOPT2% == . echo %CURRENTOPT2% >> %OS2OPTF% if not .%CURRENTOPT2% == . echo %CURRENTOPT2% >> %OS2OPTF%
if not .%FPCERRLOG% == . echo -Fe%FPCERRLOG% >> %OS2OPTF% if not .%FPCERRLOG% == . echo -Fe%FPCERRLOG% >> %OS2OPTF%
echo *Assembling the helpers ... if .%DOVERBOSE% == .1 echo %VERBOSEOPT% >> %OS2OPTF%
if not .%DOVERBOSE% == .1 goto CompStart1
echo *Start of options used for compilation >> %FPCERRLOG%
type %OS2OPTF% >> %FPCERRLOG%
echo *End of options used for compilation >> %FPCERRLOG%
:CompStart1
echo *Assembling the helpers ... >> %FPCERRLOG%
%REALTOOLS%\as -o %OS2RTL%\prt0.oo2 %OS2RTL%\prt0.as %REALTOOLS%\as -o %OS2RTL%\prt0.oo2 %OS2RTL%\prt0.as
%REALTOOLS%\as -o %OS2RTL%\prt1.oo2 %OS2RTL%\prt1.as %REALTOOLS%\as -o %OS2RTL%\prt1.oo2 %OS2RTL%\prt1.as
%REALTOOLS%\as -o %OS2RTL%\code2.oo2 %OS2RTL%\code2.as %REALTOOLS%\as -o %OS2RTL%\code2.oo2 %OS2RTL%\code2.as
%REALTOOLS%\as -o %OS2RTL%\code3.oo2 %OS2RTL%\code3.as %REALTOOLS%\as -o %OS2RTL%\code3.oo2 %OS2RTL%\code3.as
echo *Compiling the system unit ... echo *Compiling the system unit ... >> %FPCERRLOG%
%REALTOOLS%%COMPILER% @%OS2OPTF% -Us %OTHEROPTS% %OS2RTL%\SYSOS2.PAS %REALTOOLS%%COMPILER% @%OS2OPTF% -Us %OTHEROPTS% %OS2RTL%\SYSOS2.PAS
echo *Compiling unit Objects ... echo *Compiling unit Objects ... >> %FPCERRLOG%
%REALTOOLS%%COMPILER% @%OS2OPTF% %OTHEROPTS% %OS2RTLC%\OBJECTS.PP %REALTOOLS%%COMPILER% @%OS2OPTF% %OTHEROPTS% %OS2RTLC%\OBJECTS.PP
echo *Compiling unit Strings ... echo *Compiling unit Strings ... >> %FPCERRLOG%
%REALTOOLS%%COMPILER% @%OS2OPTF% %OTHEROPTS% %OS2RTLC%\STRINGS.PP %REALTOOLS%%COMPILER% @%OS2OPTF% %OTHEROPTS% %OS2RTLC%\STRINGS.PP
echo *Compiling unit HeapTrace ... echo *Compiling unit HeapTrace ... >> %FPCERRLOG%
%REALTOOLS%%COMPILER% @%OS2OPTF% %OTHEROPTS% %OS2RTLC%\HEAPTRC.PP %REALTOOLS%%COMPILER% @%OS2OPTF% %OTHEROPTS% %OS2RTLC%\HEAPTRC.PP
echo *Compiling unit CPU ... echo *Compiling unit CPU ... >> %FPCERRLOG%
%REALTOOLS%%COMPILER% @%OS2OPTF% %OTHEROPTS% %OS2RTLP%\CPU.PP %REALTOOLS%%COMPILER% @%OS2OPTF% %OTHEROPTS% %OS2RTLP%\CPU.PP
echo *Compiling unit MMX ... echo *Compiling unit MMX ... >> %FPCERRLOG%
%REALTOOLS%%COMPILER% @%OS2OPTF% %OTHEROPTS% %OS2RTLP%\MMX.PP %REALTOOLS%%COMPILER% @%OS2OPTF% %OTHEROPTS% %OS2RTLP%\MMX.PP
echo *Compiling unit TypInfo ... echo *Compiling unit TypInfo ... >> %FPCERRLOG%
%REALTOOLS%%COMPILER% @%OS2OPTF% %OTHEROPTS% %OS2RTLO%\TYPINFO.PP %REALTOOLS%%COMPILER% @%OS2OPTF% %OTHEROPTS% %OS2RTLO%\TYPINFO.PP
echo *Compiling unit DosCalls ... echo *Compiling unit DosCalls ... >> %FPCERRLOG%
%REALTOOLS%%COMPILER% @%OS2OPTF% %OTHEROPTS% %OS2RTL%\DOSCALLS.PAS %REALTOOLS%%COMPILER% @%OS2OPTF% %OTHEROPTS% %OS2RTL%\DOSCALLS.PAS
echo *Compiling unit DOS ... echo *Compiling unit DOS ... >> %FPCERRLOG%
%REALTOOLS%%COMPILER% @%OS2OPTF% %OTHEROPTS% %OS2RTL%\DOS.PAS %REALTOOLS%%COMPILER% @%OS2OPTF% %OTHEROPTS% %OS2RTL%\DOS.PAS
echo *Compiling unit CRT ... echo *Compiling unit CRT ... >> %FPCERRLOG%
%REALTOOLS%%COMPILER% @%OS2OPTF% %OTHEROPTS% %OS2RTL%\CRT.PAS %REALTOOLS%%COMPILER% @%OS2OPTF% %OTHEROPTS% %OS2RTL%\CRT.PAS
echo *Compiling unit Printer ... echo *Compiling unit Printer ... >> %FPCERRLOG%
%REALTOOLS%%COMPILER% @%OS2OPTF% %OTHEROPTS% %OS2RTL%\PRINTER.PAS %REALTOOLS%%COMPILER% @%OS2OPTF% %OTHEROPTS% %OS2RTL%\PRINTER.PAS
echo *Compiling unit SysUtils ... echo *Compiling unit SysUtils ... >> %FPCERRLOG%
%REALTOOLS%%COMPILER% @%OS2OPTF% %OTHEROPTS% %OS2RTLO%\SYSUTILS.PP %REALTOOLS%%COMPILER% @%OS2OPTF% %OTHEROPTS% %OS2RTLO%\SYSUTILS.PP
echo *Compiling unit Math ... echo *Compiling unit Math ... >> %FPCERRLOG%
%REALTOOLS%%COMPILER% @%OS2OPTF% %OTHEROPTS% %OS2RTLO%\MATH.PP %REALTOOLS%%COMPILER% @%OS2OPTF% %OTHEROPTS% %OS2RTLO%\MATH.PP
echo *Compiling unit UComplex ... echo *Compiling unit UComplex ... >> %FPCERRLOG%
%REALTOOLS%%COMPILER% @%OS2OPTF% %OTHEROPTS% %OS2RTLC%\UCOMPLEX.PP %REALTOOLS%%COMPILER% @%OS2OPTF% %OTHEROPTS% %OS2RTLC%\UCOMPLEX.PP
echo *Compiling unit GetOpts ... echo *Compiling unit GetOpts ... >> %FPCERRLOG%
%REALTOOLS%%COMPILER% @%OS2OPTF% %OTHEROPTS% %OS2RTLC%\GETOPTS.PP %REALTOOLS%%COMPILER% @%OS2OPTF% %OTHEROPTS% %OS2RTLC%\GETOPTS.PP
echo *Compiling unit KbdCalls ... echo *Compiling unit KbdCalls ... >> %FPCERRLOG%
%REALTOOLS%%COMPILER% @%OS2OPTF% %OTHEROPTS% %OS2RTL%\KBDCALLS.PAS %REALTOOLS%%COMPILER% @%OS2OPTF% %OTHEROPTS% %OS2RTL%\KBDCALLS.PAS
echo *Compiling unit MouCalls ... echo *Compiling unit MouCalls ... >> %FPCERRLOG%
%REALTOOLS%%COMPILER% @%OS2OPTF% %OTHEROPTS% %OS2RTL%\MOUCALLS.PAS %REALTOOLS%%COMPILER% @%OS2OPTF% %OTHEROPTS% %OS2RTL%\MOUCALLS.PAS
echo *Compiling unit VioCalls ... echo *Compiling unit VioCalls ... >> %FPCERRLOG%
%REALTOOLS%%COMPILER% @%OS2OPTF% %OTHEROPTS% %OS2RTL%\VIOCALLS.PAS %REALTOOLS%%COMPILER% @%OS2OPTF% %OTHEROPTS% %OS2RTL%\VIOCALLS.PAS
echo *Compiling unit MonCalls ... echo *Compiling unit MonCalls ... >> %FPCERRLOG%
%REALTOOLS%%COMPILER% @%OS2OPTF% %OTHEROPTS% %OS2RTL%\MONCALLS.PAS %REALTOOLS%%COMPILER% @%OS2OPTF% %OTHEROPTS% %OS2RTL%\MONCALLS.PAS
echo *Compiling unit Ports ... echo *Compiling unit Ports ... >> %FPCERRLOG%
%REALTOOLS%%COMPILER% @%OS2OPTF% %OTHEROPTS% %OS2RTL%\PORTS.PAS %REALTOOLS%%COMPILER% @%OS2OPTF% %OTHEROPTS% %OS2RTL%\PORTS.PAS
echo *Compiling PM units ... echo *Compiling PM units ... >> %FPCERRLOG%
%REALTOOLS%%COMPILER% @%OS2OPTF% %OTHEROPTS% %OS2RTL%\PMWIN.PAS %REALTOOLS%%COMPILER% @%OS2OPTF% %OTHEROPTS% %OS2RTL%\PMWIN.PAS
%REALTOOLS%%COMPILER% @%OS2OPTF% %OTHEROPTS% %OS2RTL%\PMBITMAP.PAS %REALTOOLS%%COMPILER% @%OS2OPTF% %OTHEROPTS% %OS2RTL%\PMBITMAP.PAS
%REALTOOLS%%COMPILER% @%OS2OPTF% %OTHEROPTS% %OS2RTL%\PMGPI.PAS %REALTOOLS%%COMPILER% @%OS2OPTF% %OTHEROPTS% %OS2RTL%\PMGPI.PAS
echo *Compiling MMOS2 units ... echo *Compiling MMOS2 units ... >> %FPCERRLOG%
%REALTOOLS%%COMPILER% @%OS2OPTF% %OTHEROPTS% %OS2RTL%\DIVE.PAS %REALTOOLS%%COMPILER% @%OS2OPTF% %OTHEROPTS% %OS2RTL%\DIVE.PAS
if %PARAMS% == rtl goto End if %PARAMS% == rtl goto End
:Compiler :Compiler
echo *Creating file with all the needed options and paths for the compiler ... echo *Creating file with all the needed options and paths for the compiler ... >> %FPCERRLOG%
echo %SKIPCFG% > %OS2OPTF% echo %SKIPCFG% > %OS2OPTF%
echo %OS2OPT1% >> %OS2OPTF% echo %OS2OPT1% >> %OS2OPTF%
echo %OS2OPT2% >> %OS2OPTF% echo %OS2OPT2% >> %OS2OPTF%
@ -333,27 +359,34 @@ echo %OS2EXET% >> %OS2OPTF%
if not .%CURRENTOPT1% == . echo %CURRENTOPT1% >> %OS2OPTF% if not .%CURRENTOPT1% == . echo %CURRENTOPT1% >> %OS2OPTF%
if not .%CURRENTOPT2% == . echo %CURRENTOPT2% >> %OS2OPTF% if not .%CURRENTOPT2% == . echo %CURRENTOPT2% >> %OS2OPTF%
if not .%FPCERRLOG% == . echo -Fe%FPCERRLOG% >> %OS2OPTF% if not .%FPCERRLOG% == . echo -Fe%FPCERRLOG% >> %OS2OPTF%
echo *Compiling the compiler ... if .%DOVERBOSE% == .1 echo %VERBOSEOPT% >> %OS2OPTF%
if not .%DOVERBOSE% == .1 goto CompStart2
echo *Start of options used for compilation >> %FPCERRLOG%
type %OS2OPTF% >> %FPCERRLOG%
echo *End of options used for compilation >> %FPCERRLOG%
:CompStart2
echo *Compiling the compiler ... >> %FPCERRLOG%
%REALTOOLS%%COMPILER% @%OS2OPTF% %OTHEROPTS% %COMPSPATH%\PP.PAS %REALTOOLS%%COMPILER% @%OS2OPTF% %OTHEROPTS% %COMPSPATH%\PP.PAS
:Comp2 :Comp2
ren %COMPSPATH%\pp.exe ppos2.exe ren %COMPSPATH%\pp.exe ppos2.exe >> %FPCERRLOG%
if exist %COMPSPATH%\ppos2.exe goto OKCompiler if exist %COMPSPATH%\ppos2.exe goto OKCompiler
if not exist %COMPSPATH%\pp goto C2Cont
if exist %COMPSPATH%\ppas.bat goto PPasBat if exist %COMPSPATH%\ppas.bat goto PPasBat
if exist %COMPSPATH%\ppas.cmd goto PPasCmd if exist %COMPSPATH%\ppas.cmd goto PPasCmd
echo *Error: The compiler wasn't compiled!! :C2Cont
echo *Error: The compiler wasn't compiled!! >> %FPCERRLOG%
goto End goto End
:PPasBat :PPasBat
echo *Automatic binding failed, trying again ... echo *Automatic binding failed, trying again ... >> %FPCERRLOG%
call %COMPSPATH%\ppas.bat call %COMPSPATH%\ppas.bat
del %COMPSPATH%\ppas.bat del %COMPSPATH%\ppas.bat >> %FPCERRLOG%
goto Comp2 goto Comp2
goto PPas
:PPasCmd :PPasCmd
echo *Automatic binding failed, trying again ... echo *Automatic binding failed, trying again ... >> %FPCERRLOG%
call %COMPSPATH%\ppas.cmd call %COMPSPATH%\ppas.cmd
del %COMPSPATH%\ppas.cmd del %COMPSPATH%\ppas.cmd >> %FPCERRLOG%
goto Comp2 goto Comp2
:OKCompiler :OKCompiler
@ -367,30 +400,33 @@ goto CheckEnv
rem Another loop? rem Another loop?
if %CYCLE% == 2 goto CheckEnv if %CYCLE% == 2 goto CheckEnv
echo *Backing up previous compiler version ... echo *Backing up previous compiler version ... >> %FPCERRLOG%
copy %REALTOOLS%ppos2.exe %REALTOOLS%ppos2.%CYCLE% copy %REALTOOLS%ppos2.exe %REALTOOLS%ppos2.%CYCLE% >> %FPCERRLOG%
echo *Copying the newly created compiler to %REALTOOLS% ... echo *Copying the newly created compiler to %REALTOOLS% ... >> %FPCERRLOG%
copy %COMPSPATH%\ppos2.exe %REALTOOLS%. copy %COMPSPATH%\ppos2.exe %REALTOOLS%. >> %FPCERRLOG%
if %CYCLE% == 1 goto Cycle2 if %CYCLE% == 1 goto Cycle2
set COMPILER=PPOS2.EXE set COMPILER=PPOS2.EXE
set CYCLE=1 set CYCLE=1
goto Cmd1 goto NoPars
:Cycle2 :Cycle2
set CYCLE=2 set CYCLE=2
goto Cmd1 goto NoPars
:CheckEnv :CheckEnv
if %@EVAL[0] == 0 goto Pack if %@EVAL[0] == 0 goto Pack
echo *Warning: Packing in this environment might fail. echo *Warning: Packing in this environment might fail. >> %FPCERRLOG%
echo *You should press Ctrl-Break now if the current drive is different from that echo *You should press Ctrl-Break now if the current drive is different from that >> %FPCERRLOG%
echo *of %FPCDIR%; otherwise press any key to continue. echo *of %FPCDIR%; otherwise press any key to continue. >> %FPCERRLOG%
if not %FPCERRLOG% == CON echo *Warning: Packing in this environment might fail.
if not %FPCERRLOG% == CON echo *You should press Ctrl-Break now if the current drive is different from that
if not %FPCERRLOG% == CON echo *of %FPCDIR%; otherwise press any key to continue.
pause>nul pause>nul
cd %FPCSRC% cd %FPCSRC%
:Pack :Pack
echo *Packing the snapshot ... echo *Packing the snapshot ... >> %FPCERRLOG%
if %@EVAL[0] == 0 goto SHL2 if %@EVAL[0] == 0 goto SHL2
goto Cmd2 goto Cmd2
:Shl2 :Shl2
@ -399,22 +435,26 @@ cdd %FPCSRC%
:Cmd2 :Cmd2
rem ZIP.EXE must be on the PATH rem ZIP.EXE must be on the PATH
zip -9 -r snap-os2.zip compiler\ppos2.exe rtl\os2\*.ppo rtl\os2\*.oo2 rtl\os2\*.ao2 zip -9 -r snap-os2.zip compiler\ppos2.exe rtl\os2\*.ppo rtl\os2\*.oo2 rtl\os2\*.ao2 >> %FPCERRLOG%
if exist snap-os2.zip goto ZipOK if exist snap-os2.zip goto ZipOK
echo *Error: The ZIP file hasn't been created!! echo *Error: The ZIP file hasn't been created!! >> %FPCERRLOG%
:ZipOK :ZipOK
if %@EVAL[0] == 0 popd if %@EVAL[0] == 0 popd
echo *Done. echo *Done. >> %FPCERRLOG%
goto End goto End
:ErrorDir :ErrorDir
echo *Error: Environment variable FPCDIR must point to your base FPC directory!!! echo *Error: Environment variable FPCDIR must point to your base FPC directory!!! >> %FPCERRLOG%
goto End goto End
$Log$ $Log$
Revision 1.7 2000-01-26 22:34:36 hajny Revision 1.8 2000-01-29 16:24:01 hajny
* logging enhanced, verbose support, error for non-4dos fixed
Revision 1.7 2000/01/26 22:34:36 hajny
* support for error logging added * support for error logging added
Revision 1.6 2000/01/16 18:44:21 hajny Revision 1.6 2000/01/16 18:44:21 hajny