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

+ Status checks in scripts

Browse Source 
+ Scripts support apptype tool
  + Added some ScriptFixFileName
This commit is contained in:
olle 2004-04-06 22:44:16 +00:00
parent 89e66690a3
commit d8bb302b0f
2 changed files with 35 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
compiler/script.pas
View File

@ -412,6 +412,7 @@ begin
if FileName<>'' then if FileName<>'' then
Add('Echo Assembling '+ScriptFixFileName(FileName)); Add('Echo Assembling '+ScriptFixFileName(FileName));
Add(maybequoted(command)+' '+Options); Add(maybequoted(command)+' '+Options);
Add('Exit If "{Status}" != 0');
end; end;
@ -420,10 +421,14 @@ begin
if FileName<>'' then if FileName<>'' then
Add('Echo Linking '+ScriptFixFileName(FileName)); Add('Echo Linking '+ScriptFixFileName(FileName));
Add(maybequoted(command)+' '+Options); Add(maybequoted(command)+' '+Options);
Add('Exit If "{Status}" != 0');
{Add resources} {Add resources}
if true then {If SIOW} if apptype <> app_tool then {If SIOW}
Add('Rez -append "{RIncludes}"SIOW.r -o '+ ScriptFixFileName(FileName)); begin
Add('Rez -append "{RIncludes}"SIOW.r -o '+ ScriptFixFileName(FileName));
Add('Exit If "{Status}" != 0');
end;
end; end;
@ -498,7 +503,12 @@ end;
end. end.
{ {
$Log$ $Log$
Revision 1.27 2004-02-24 00:53:48 olle Revision 1.28 2004-04-06 22:44:16 olle
+ Status checks in scripts
+ Scripts support apptype tool
+ Added some ScriptFixFileName
Revision 1.27 2004/02/24 00:53:48 olle
* increased maxsize of link.res file name * increased maxsize of link.res file name
* fixed a 255-limit in TScript.WriteToDisk * fixed a 255-limit in TScript.WriteToDisk

32
compiler/systems/t_macos.pas
View File

@ -152,9 +152,9 @@ begin
{ Call linker } { Call linker }
SplitBinCmd(Info.ExeCmd[1],binstr,cmdstr); SplitBinCmd(Info.ExeCmd[1],binstr,cmdstr);
Replace(cmdstr,'$EXE',current_module.exefilename^); Replace(cmdstr,'$EXE',ScriptFixFileName(current_module.exefilename^));
Replace(cmdstr,'$OPT',Info.ExtraOptions); Replace(cmdstr,'$OPT',Info.ExtraOptions);
Replace(cmdstr,'$RES',outputexedir+Info.ResName); Replace(cmdstr,'$RES',ScriptFixFileName(outputexedir+Info.ResName));
Replace(cmdstr,'$STATIC',StaticStr); Replace(cmdstr,'$STATIC',StaticStr);
Replace(cmdstr,'$STRIP',StripStr); Replace(cmdstr,'$STRIP',StripStr);
Replace(cmdstr,'$DYNLINK',DynLinkStr); Replace(cmdstr,'$DYNLINK',DynLinkStr);
@ -166,7 +166,7 @@ begin
Add('PPCLink '#182); Add('PPCLink '#182);
{ Add MPW standard libraries} { Add MPW standard libraries}
if true then // if not MPWTool if apptype <> app_tool then
begin begin
Add('"{PPCLibraries}PPCSIOW.o" '#182); Add('"{PPCLibraries}PPCSIOW.o" '#182);
Add('"{PPCLibraries}PPCToolLibs.o" '#182); Add('"{PPCLibraries}PPCToolLibs.o" '#182);
@ -185,17 +185,24 @@ begin
if s<>'' then if s<>'' then
Add(s+' '#182); Add(s+' '#182);
end; end;
{Add last lines of the link command} {Add last lines of the link command}
if true then //If SIOW, to avoid some warnings. if apptype = app_tool then
Add('-t "MPST" -c "MPS " '#182);
if apptype <> app_tool then //If SIOW, to avoid some warnings.
Add('-ignoredups __start -ignoredups .__start -ignoredups main -ignoredups .main '#182); Add('-ignoredups __start -ignoredups .__start -ignoredups main -ignoredups .main '#182);
Add('-tocdataref off -sym on -dead on -o '+ current_module.exefilename^); Add('-tocdataref off -sym on -dead on -o '+ ScriptFixFileName(current_module.exefilename^));
Add('Exit If "{Status}" != 0');
{Add mac resources} {Add mac resources}
if true then //If SIOW if apptype <> app_tool then //If SIOW
Add('Rez -append "{RIncludes}"SIOW.r -o ' + current_module.exefilename^); begin
Add('Rez -append "{RIncludes}"SIOW.r -o ' + ScriptFixFileName(current_module.exefilename^));
Add('Exit If "{Status}" != 0');
end;
success:= true; success:= true;
end; end;
@ -221,7 +228,12 @@ initialization
end. end.
{ {
$Log$ $Log$
Revision 1.7 2004-02-19 20:40:20 olle Revision 1.8 2004-04-06 22:44:22 olle
+ Status checks in scripts
+ Scripts support apptype tool
+ Added some ScriptFixFileName
Revision 1.7 2004/02/19 20:40:20 olle
+ Support for Link on target especially for MacOS + Support for Link on target especially for MacOS
+ TLinkerMPW + TLinkerMPW
+ TAsmScriptMPW + TAsmScriptMPW