renamed script unit to cscript to avoid namespace conflict with univint package on Darwin. this makes it possible to build the textmode IDE on Darwin

git-svn-id: trunk@37598 -
This commit is contained in:
Károly Balogh 2017-11-17 11:27:19 +00:00
parent bfb89bfd0f
commit e6aed467b5
39 changed files with 39 additions and 39 deletions

2
.gitattributes vendored
View File

@ -159,6 +159,7 @@ compiler/constexp.pas svneol=native#text/x-pascal
compiler/cpid.pas svneol=native#text/plain compiler/cpid.pas svneol=native#text/plain
compiler/crefs.pas svneol=native#text/plain compiler/crefs.pas svneol=native#text/plain
compiler/cresstr.pas svneol=native#text/plain compiler/cresstr.pas svneol=native#text/plain
compiler/cscript.pas svneol=native#text/plain
compiler/cstreams.pas svneol=native#text/plain compiler/cstreams.pas svneol=native#text/plain
compiler/cutils.pas svneol=native#text/plain compiler/cutils.pas svneol=native#text/plain
compiler/cwindirs.pp svneol=native#text/plain compiler/cwindirs.pp svneol=native#text/plain
@ -659,7 +660,6 @@ compiler/rgbase.pas svneol=native#text/plain
compiler/rgobj.pas svneol=native#text/plain compiler/rgobj.pas svneol=native#text/plain
compiler/scandir.pas svneol=native#text/plain compiler/scandir.pas svneol=native#text/plain
compiler/scanner.pas svneol=native#text/plain compiler/scanner.pas svneol=native#text/plain
compiler/script.pas svneol=native#text/plain
compiler/sparc/aoptcpud.pas svneol=native#text/plain compiler/sparc/aoptcpud.pas svneol=native#text/plain
compiler/sparc/cgcpu.pas svneol=native#text/pascal compiler/sparc/cgcpu.pas svneol=native#text/pascal
compiler/sparc/cpuelf.pas svneol=native#text/plain compiler/sparc/cpuelf.pas svneol=native#text/plain

View File

@ -256,7 +256,7 @@ Implementation
sfpux80, sfpux80,
{$endif} {$endif}
{$endif} {$endif}
script,fmodule,verbose, cscript,fmodule,verbose,
cpuinfo, cpuinfo,
aasmcpu; aasmcpu;

View File

@ -26,7 +26,7 @@ unit comprsrc;
interface interface
uses uses
Systems, cstreams, Script; Systems, cstreams, cscript;
type type
tresoutput = (roRES, roOBJ); tresoutput = (roRES, roOBJ);

View File

@ -19,7 +19,7 @@
**************************************************************************** ****************************************************************************
} }
unit script; unit cscript;
{$i fpcdefs.inc} {$i fpcdefs.inc}

View File

@ -103,7 +103,7 @@ implementation
uses uses
SysUtils, SysUtils,
cutils,cfileutl,script, cutils,cfileutl,cscript,
fmodule,finput,verbose, fmodule,finput,verbose,
symtype,symcpu,symtable,jvmdef, symtype,symcpu,symtable,jvmdef,
itcpujas,cpubase,cpuinfo,cgutils, itcpujas,cpubase,cpuinfo,cgutils,

View File

@ -160,7 +160,7 @@ Implementation
{$ifdef hasUnix} {$ifdef hasUnix}
baseunix, baseunix,
{$endif hasUnix} {$endif hasUnix}
script,globals,verbose,comphook,ppu,fpccrc, cscript,globals,verbose,comphook,ppu,fpccrc,
aasmbase,aasmcpu, aasmbase,aasmcpu,
ogmap; ogmap;

View File

@ -47,7 +47,7 @@ unit ag68kvasm;
uses uses
cutils,cfileutl,globals,verbose, cutils,cfileutl,globals,verbose,
cgbase, cgbase,
script, cscript,
itcpugas,cpuinfo, itcpugas,cpuinfo,
aasmcpu; aasmcpu;

View File

@ -45,7 +45,7 @@ implementation
symbase,symtable,symdef, symbase,symtable,symdef,
finput,fmodule,fppu, finput,fmodule,fppu,
aasmdata, aasmdata,
script,gendef, cscript,gendef,
comphook, comphook,
scanner,scandir, scanner,scandir,
pbase,psystem,pmodules,psub,ncgrtti, pbase,psystem,pmodules,psub,ncgrtti,

View File

@ -57,7 +57,7 @@ interface
uses uses
cutils,globtype,systems,cclasses, cutils,globtype,systems,cclasses,
verbose,finput,fmodule,script,cpuinfo, verbose,finput,fmodule,cscript,cpuinfo,
cgbase,cgutils, cgbase,cgutils,
itcpugas itcpugas
; ;

View File

@ -48,7 +48,7 @@ unit agppcvasm;
uses uses
cutils,cfileutl,globals,verbose, cutils,cfileutl,globals,verbose,
cgbase, cgbase,
script, cscript,
itcpugas,cpuinfo, itcpugas,cpuinfo,
aasmcpu; aasmcpu;

View File

@ -58,7 +58,7 @@ implementation
SysUtils, SysUtils,
cutils,cfileutl,cclasses, cutils,cfileutl,cclasses,
verbose,systems,globtype,globals, verbose,systems,globtype,globals,
symconst,script, symconst,cscript,
fmodule, fmodule,
aasmbase,aasmtai,aasmcpu,cpubase, aasmbase,aasmtai,aasmcpu,cpubase,
cgbase,cgobj,cgutils,ogbase,ncgutil, cgbase,cgobj,cgutils,ogbase,ncgutil,

View File

@ -53,7 +53,7 @@ implementation
uses uses
SysUtils, SysUtils,
cutils,cfileutl,cclasses,aasmbase, cutils,cfileutl,cclasses,aasmbase,
globtype,globals,systems,verbose,script,fmodule,i_amiga; globtype,globals,systems,verbose,cscript,fmodule,i_amiga;

View File

@ -71,7 +71,7 @@ implementation
SysUtils, SysUtils,
cutils,cfileutl,cclasses, cutils,cfileutl,cclasses,
verbose,systems,globals, verbose,systems,globals,
symconst,script, symconst,cscript,
fmodule, fmodule,
aasmbase,aasmtai,aasmcpu,cpubase,hlcgcpu,hlcgobj, aasmbase,aasmtai,aasmcpu,cpubase,hlcgcpu,hlcgobj,
cgbase,cgobj,cgutils,ogbase,ncgutil, cgbase,cgobj,cgutils,ogbase,ncgutil,

View File

@ -55,7 +55,7 @@ implementation
uses uses
SysUtils, SysUtils,
cutils,cfileutl,cclasses,aasmbase, cutils,cfileutl,cclasses,aasmbase,
globtype,globals,systems,verbose,script,fmodule,i_aros; globtype,globals,systems,verbose,cscript,fmodule,i_aros;
procedure timportlibaros.generatelib; procedure timportlibaros.generatelib;

View File

@ -49,7 +49,7 @@ implementation
uses uses
sysutils,cutils,cfileutl,cclasses,aasmbase, sysutils,cutils,cfileutl,cclasses,aasmbase,
globtype,globals,systems,verbose,script,fmodule,i_atari; globtype,globals,systems,verbose,cscript,fmodule,i_atari;
constructor TLinkerAtari.Create; constructor TLinkerAtari.Create;

View File

@ -59,7 +59,7 @@ implementation
SysUtils, SysUtils,
cutils,cfileutl,cclasses, cutils,cfileutl,cclasses,
verbose,systems,globtype,globals, verbose,systems,globtype,globals,
symconst,script, symconst,cscript,
fmodule,aasmbase,aasmtai,aasmdata,aasmcpu,cpubase,i_beos,ogbase; fmodule,aasmbase,aasmtai,aasmdata,aasmcpu,cpubase,i_beos,ogbase;
{***************************************************************************** {*****************************************************************************

View File

@ -34,7 +34,7 @@ implementation
sysutils, sysutils,
cutils,cfileutl,cclasses, cutils,cfileutl,cclasses,
verbose,systems,globtype,globals, verbose,systems,globtype,globals,
symconst,script, symconst,cscript,
fmodule,aasmbase,aasmtai,aasmdata,aasmcpu,cpubase,symsym,symdef, fmodule,aasmbase,aasmtai,aasmdata,aasmcpu,cpubase,symsym,symdef,
import,export,link,comprsrc,rescmn,i_bsd,expunix, import,export,link,comprsrc,rescmn,i_bsd,expunix,
cgutils,cgbase,cgobj,cpuinfo,ogbase; cgutils,cgbase,cgobj,cpuinfo,ogbase;

View File

@ -32,7 +32,7 @@ implementation
uses uses
SysUtils, SysUtils,
cutils,cfileutl,cclasses, cutils,cfileutl,cclasses,
globtype,globals,systems,verbose,comphook,script,fmodule,i_embed,link, globtype,globals,systems,verbose,comphook,cscript,fmodule,i_embed,link,
cpuinfo; cpuinfo;
type type

View File

@ -40,7 +40,7 @@ implementation
SysUtils, SysUtils,
cutils,cfileutl,cclasses, cutils,cfileutl,cclasses,
globtype,comphook,systems,symconst,symsym,symdef, globtype,comphook,systems,symconst,symsym,symdef,
globals,verbose,fmodule,script,ogbase, globals,verbose,fmodule,cscript,ogbase,
comprsrc,import,link,i_emx,ppu; comprsrc,import,link,i_emx,ppu;
type type

View File

@ -33,7 +33,7 @@ implementation
aasmbase, aasmbase,
SysUtils, SysUtils,
cutils,cfileutl,cclasses, cutils,cfileutl,cclasses,
globtype,globals,systems,verbose,script,fmodule,i_gba,link; globtype,globals,systems,verbose,cscript,fmodule,i_gba,link;
type type
TlinkerGBA=class(texternallinker) TlinkerGBA=class(texternallinker)

View File

@ -32,7 +32,7 @@ implementation
uses uses
SysUtils, SysUtils,
cutils,cfileutl,cclasses, cutils,cfileutl,cclasses,
globtype,globals,systems,verbose,script, globtype,globals,systems,verbose,cscript,
fmodule,i_go32v2, fmodule,i_go32v2,
link,ogcoff,owar,aasmbase; link,ogcoff,owar,aasmbase;

View File

@ -60,7 +60,7 @@ implementation
SysUtils, SysUtils,
cutils,cfileutl,cclasses, cutils,cfileutl,cclasses,
verbose,systems,globtype,globals, verbose,systems,globtype,globals,
symconst,script, symconst,cscript,
fmodule,aasmbase,aasmtai,aasmdata,aasmcpu,cpubase,i_haiku,ogbase; fmodule,aasmbase,aasmtai,aasmdata,aasmcpu,cpubase,i_haiku,ogbase;
{***************************************************************************** {*****************************************************************************

View File

@ -33,7 +33,7 @@ implementation
sysutils, sysutils,
cutils,cfileutl,cclasses, cutils,cfileutl,cclasses,
verbose,systems,globtype,globals, verbose,systems,globtype,globals,
symconst,script, symconst,cscript,
fmodule,aasmbase,aasmtai,aasmdata,aasmcpu,cpubase,symsym,symdef, fmodule,aasmbase,aasmtai,aasmdata,aasmcpu,cpubase,symsym,symdef,
import,export,link,comprsrc,rescmn,i_jvm, import,export,link,comprsrc,rescmn,i_jvm,
cgutils,cgbase,cgobj,cpuinfo,ogbase; cgutils,cgbase,cgobj,cpuinfo,ogbase;

View File

@ -77,7 +77,7 @@ implementation
SysUtils, SysUtils,
cutils,cfileutl,cclasses, cutils,cfileutl,cclasses,
verbose,systems,globtype,globals, verbose,systems,globtype,globals,
script, cscript,
fmodule, fmodule,
aasmbase,aasmtai,aasmcpu,cpubase, aasmbase,aasmtai,aasmcpu,cpubase,
cgbase,ogbase, cgbase,ogbase,

View File

@ -47,7 +47,7 @@ implementation
uses uses
SysUtils, SysUtils,
cutils,cfileutl,cclasses, cutils,cfileutl,cclasses,
globtype,globals,systems,verbose,script,fmodule,i_macos, globtype,globals,systems,verbose,cscript,fmodule,i_macos,
ogbase, ogbase,
symconst; symconst;

View File

@ -32,7 +32,7 @@ implementation
uses uses
SysUtils, SysUtils,
cutils,cfileutl,cclasses,rescmn,comprsrc,aasmbase, cutils,cfileutl,cclasses,rescmn,comprsrc,aasmbase,
globtype,globals,systems,verbose,script,fmodule,i_morph,link; globtype,globals,systems,verbose,cscript,fmodule,i_morph,link;
type type
PlinkerMorphOS=^TlinkerMorphOS; PlinkerMorphOS=^TlinkerMorphOS;

View File

@ -34,7 +34,7 @@ implementation
uses uses
SysUtils, SysUtils,
cutils,cfileutl,cclasses, cutils,cfileutl,cclasses,
globtype,globals,systems,verbose,script, globtype,globals,systems,verbose,cscript,
fmodule,i_msdos, fmodule,i_msdos,
link,aasmbase,cpuinfo, link,aasmbase,cpuinfo,
omfbase,ogbase,ogomf,owomflib; omfbase,ogbase,ogomf,owomflib;

View File

@ -33,7 +33,7 @@ implementation
aasmbase, aasmbase,
SysUtils, SysUtils,
cutils,cfileutl,cclasses, cutils,cfileutl,cclasses,
globtype,globals,systems,verbose,script,fmodule,i_nds,link; globtype,globals,systems,verbose,cscript,fmodule,i_nds,link;
type type
TlinkerNDS=class(texternallinker) TlinkerNDS=class(texternallinker)

View File

@ -101,7 +101,7 @@ implementation
SysUtils, SysUtils,
cutils,cfileutl, cutils,cfileutl,
verbose,systems,globtype,globals, verbose,systems,globtype,globals,
symconst,script, symconst,cscript,
fmodule,aasmbase,aasmtai,aasmdata,aasmcpu,cpubase,symsym,symdef, fmodule,aasmbase,aasmtai,aasmdata,aasmcpu,cpubase,symsym,symdef,
import,export,link,i_nwl,ogbase import,export,link,i_nwl,ogbase
{$ifdef netware} ,dos {$endif} {$ifdef netware} ,dos {$endif}

View File

@ -95,7 +95,7 @@ implementation
SysUtils, SysUtils,
cutils,cfileutl, cutils,cfileutl,
verbose,systems,globtype,globals, verbose,systems,globtype,globals,
symconst,script, symconst,cscript,
fmodule,aasmbase,aasmtai,aasmdata,aasmcpu,cpubase,symsym,symdef, fmodule,aasmbase,aasmtai,aasmdata,aasmcpu,cpubase,symsym,symdef,
import,export,link,i_nwm,ogbase, ogcoff, ognlm, owar, cclasses import,export,link,i_nwm,ogbase, ogcoff, ognlm, owar, cclasses
{$ifdef netware} ,dos {$endif} {$ifdef netware} ,dos {$endif}

View File

@ -40,7 +40,7 @@ implementation
SysUtils, SysUtils,
cutils,cfileutl,cclasses, cutils,cfileutl,cclasses,
globtype,systems,symconst,symdef, globtype,systems,symconst,symdef,
globals,verbose,fmodule,script, globals,verbose,fmodule,cscript,
import,link,i_os2,ogbase; import,link,i_os2,ogbase;
type type

View File

@ -46,7 +46,7 @@ implementation
uses uses
SysUtils, SysUtils,
cutils,cfileutl,cclasses, cutils,cfileutl,cclasses,
globtype,globals,systems,verbose,script,fmodule,i_palmos, globtype,globals,systems,verbose,cscript,fmodule,i_palmos,
comprsrc; comprsrc;
{**************************************************************************** {****************************************************************************

View File

@ -37,7 +37,7 @@ implementation
sysutils, sysutils,
cutils,cfileutl,cclasses, cutils,cfileutl,cclasses,
verbose,systems,globtype,globals, verbose,systems,globtype,globals,
script, cscript,
fmodule, fmodule,
import,export,expunix,link,comprsrc,rescmn,i_sunos,ogbase; import,export,expunix,link,comprsrc,rescmn,i_sunos,ogbase;

View File

@ -30,7 +30,7 @@ interface
cutils,cclasses, cutils,cclasses,
aasmbase,aasmtai,aasmdata,aasmcpu,fmodule,globtype,globals,systems,verbose, aasmbase,aasmtai,aasmdata,aasmcpu,fmodule,globtype,globals,systems,verbose,
symconst,symdef,symsym, symconst,symdef,symsym,
script,gendef, cscript,gendef,
cpubase, cpubase,
import,export,link,cgobj, i_symbian; import,export,link,cgobj, i_symbian;

View File

@ -33,7 +33,7 @@ implementation
link, link,
SysUtils, SysUtils,
cclasses,cutils,cfileutl,globtype,globals, cclasses,cutils,cfileutl,globtype,globals,
systems,verbose,script,fmodule,i_watcom; systems,verbose,cscript,fmodule,i_watcom;
type type

View File

@ -33,7 +33,7 @@ implementation
aasmbase, aasmbase,
SysUtils, SysUtils,
cutils,cfileutl,cclasses, cutils,cfileutl,cclasses,
globtype,globals,systems,verbose,script,fmodule,i_wii,link; globtype,globals,systems,verbose,cscript,fmodule,i_wii,link;
type type
TlinkerWii=class(texternallinker) TlinkerWii=class(texternallinker)

View File

@ -29,7 +29,7 @@ interface
cutils,cclasses, cutils,cclasses,
aasmbase,aasmtai,aasmdata,aasmcpu,fmodule,globtype,globals,systems,verbose, aasmbase,aasmtai,aasmdata,aasmcpu,fmodule,globtype,globals,systems,verbose,
symconst,symdef,symsym, symconst,symdef,symsym,
script,gendef, cscript,gendef,
cpubase, cpubase,
import,export,link,comprsrc,i_win; import,export,link,comprsrc,i_win;

View File

@ -32,7 +32,7 @@ implementation
uses uses
SysUtils, SysUtils,
cutils,cfileutl,cclasses, cutils,cfileutl,cclasses,
globtype,globals,systems,verbose,script, globtype,globals,systems,verbose,cscript,
import,export,fmodule,i_win16, import,export,fmodule,i_win16,
link,aasmbase,cpuinfo, link,aasmbase,cpuinfo,
omfbase,ogbase,ogomf,owbase,owomflib, omfbase,ogbase,ogomf,owbase,owomflib,

View File

@ -55,7 +55,7 @@ implementation
uses uses
SysUtils, SysUtils,
cutils,globtype,globals,systems,cclasses, cutils,globtype,globals,systems,cclasses,
verbose,script,cpuinfo, verbose,cscript,cpuinfo,
itx86int, itx86int,
cgbase cgbase
{$ifdef EXTDEBUG} {$ifdef EXTDEBUG}