From e6aed467b52f7f88ed8f3cf111c86a779cdfa08d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A1roly=20Balogh?= Date: Fri, 17 Nov 2017 11:27:19 +0000 Subject: [PATCH] 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 - --- .gitattributes | 2 +- compiler/assemble.pas | 2 +- compiler/comprsrc.pas | 2 +- compiler/{script.pas => cscript.pas} | 2 +- compiler/jvm/agjasmin.pas | 2 +- compiler/link.pas | 2 +- compiler/m68k/ag68kvasm.pas | 2 +- compiler/parser.pas | 2 +- compiler/powerpc/agppcmpw.pas | 2 +- compiler/powerpc/agppcvasm.pas | 2 +- compiler/systems/t_aix.pas | 2 +- compiler/systems/t_amiga.pas | 2 +- compiler/systems/t_android.pas | 2 +- compiler/systems/t_aros.pas | 2 +- compiler/systems/t_atari.pas | 2 +- compiler/systems/t_beos.pas | 2 +- compiler/systems/t_bsd.pas | 2 +- compiler/systems/t_embed.pas | 2 +- compiler/systems/t_emx.pas | 2 +- compiler/systems/t_gba.pas | 2 +- compiler/systems/t_go32v2.pas | 2 +- compiler/systems/t_haiku.pas | 2 +- compiler/systems/t_jvm.pas | 2 +- compiler/systems/t_linux.pas | 2 +- compiler/systems/t_macos.pas | 2 +- compiler/systems/t_morph.pas | 2 +- compiler/systems/t_msdos.pas | 2 +- compiler/systems/t_nds.pas | 2 +- compiler/systems/t_nwl.pas | 2 +- compiler/systems/t_nwm.pas | 2 +- compiler/systems/t_os2.pas | 2 +- compiler/systems/t_palmos.pas | 2 +- compiler/systems/t_sunos.pas | 2 +- compiler/systems/t_symbian.pas | 2 +- compiler/systems/t_watcom.pas | 2 +- compiler/systems/t_wii.pas | 2 +- compiler/systems/t_win.pas | 2 +- compiler/systems/t_win16.pas | 2 +- compiler/x86/agx86int.pas | 2 +- 39 files changed, 39 insertions(+), 39 deletions(-) rename compiler/{script.pas => cscript.pas} (99%) diff --git a/.gitattributes b/.gitattributes index 914dedd799..588c34955c 100644 --- a/.gitattributes +++ b/.gitattributes @@ -159,6 +159,7 @@ compiler/constexp.pas svneol=native#text/x-pascal compiler/cpid.pas svneol=native#text/plain compiler/crefs.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/cutils.pas 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/scandir.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/cgcpu.pas svneol=native#text/pascal compiler/sparc/cpuelf.pas svneol=native#text/plain diff --git a/compiler/assemble.pas b/compiler/assemble.pas index 7d3cc40d00..cd0b164059 100644 --- a/compiler/assemble.pas +++ b/compiler/assemble.pas @@ -256,7 +256,7 @@ Implementation sfpux80, {$endif} {$endif} - script,fmodule,verbose, + cscript,fmodule,verbose, cpuinfo, aasmcpu; diff --git a/compiler/comprsrc.pas b/compiler/comprsrc.pas index 5a2b2945d0..b5638b088f 100644 --- a/compiler/comprsrc.pas +++ b/compiler/comprsrc.pas @@ -26,7 +26,7 @@ unit comprsrc; interface uses - Systems, cstreams, Script; + Systems, cstreams, cscript; type tresoutput = (roRES, roOBJ); diff --git a/compiler/script.pas b/compiler/cscript.pas similarity index 99% rename from compiler/script.pas rename to compiler/cscript.pas index 9285326639..f0001f04b7 100644 --- a/compiler/script.pas +++ b/compiler/cscript.pas @@ -19,7 +19,7 @@ **************************************************************************** } -unit script; +unit cscript; {$i fpcdefs.inc} diff --git a/compiler/jvm/agjasmin.pas b/compiler/jvm/agjasmin.pas index db404669d9..a3755cb328 100644 --- a/compiler/jvm/agjasmin.pas +++ b/compiler/jvm/agjasmin.pas @@ -103,7 +103,7 @@ implementation uses SysUtils, - cutils,cfileutl,script, + cutils,cfileutl,cscript, fmodule,finput,verbose, symtype,symcpu,symtable,jvmdef, itcpujas,cpubase,cpuinfo,cgutils, diff --git a/compiler/link.pas b/compiler/link.pas index 57c26932eb..88ea6997db 100644 --- a/compiler/link.pas +++ b/compiler/link.pas @@ -160,7 +160,7 @@ Implementation {$ifdef hasUnix} baseunix, {$endif hasUnix} - script,globals,verbose,comphook,ppu,fpccrc, + cscript,globals,verbose,comphook,ppu,fpccrc, aasmbase,aasmcpu, ogmap; diff --git a/compiler/m68k/ag68kvasm.pas b/compiler/m68k/ag68kvasm.pas index 3e98cec535..be14780c11 100644 --- a/compiler/m68k/ag68kvasm.pas +++ b/compiler/m68k/ag68kvasm.pas @@ -47,7 +47,7 @@ unit ag68kvasm; uses cutils,cfileutl,globals,verbose, cgbase, - script, + cscript, itcpugas,cpuinfo, aasmcpu; diff --git a/compiler/parser.pas b/compiler/parser.pas index 48e37f1f31..b1c4b0ab8b 100644 --- a/compiler/parser.pas +++ b/compiler/parser.pas @@ -45,7 +45,7 @@ implementation symbase,symtable,symdef, finput,fmodule,fppu, aasmdata, - script,gendef, + cscript,gendef, comphook, scanner,scandir, pbase,psystem,pmodules,psub,ncgrtti, diff --git a/compiler/powerpc/agppcmpw.pas b/compiler/powerpc/agppcmpw.pas index 857e1bdcdd..f9c489e327 100644 --- a/compiler/powerpc/agppcmpw.pas +++ b/compiler/powerpc/agppcmpw.pas @@ -57,7 +57,7 @@ interface uses cutils,globtype,systems,cclasses, - verbose,finput,fmodule,script,cpuinfo, + verbose,finput,fmodule,cscript,cpuinfo, cgbase,cgutils, itcpugas ; diff --git a/compiler/powerpc/agppcvasm.pas b/compiler/powerpc/agppcvasm.pas index 19eb4e6073..e51c3cc451 100644 --- a/compiler/powerpc/agppcvasm.pas +++ b/compiler/powerpc/agppcvasm.pas @@ -48,7 +48,7 @@ unit agppcvasm; uses cutils,cfileutl,globals,verbose, cgbase, - script, + cscript, itcpugas,cpuinfo, aasmcpu; diff --git a/compiler/systems/t_aix.pas b/compiler/systems/t_aix.pas index 0d26dbca1d..eb57095ad1 100644 --- a/compiler/systems/t_aix.pas +++ b/compiler/systems/t_aix.pas @@ -58,7 +58,7 @@ implementation SysUtils, cutils,cfileutl,cclasses, verbose,systems,globtype,globals, - symconst,script, + symconst,cscript, fmodule, aasmbase,aasmtai,aasmcpu,cpubase, cgbase,cgobj,cgutils,ogbase,ncgutil, diff --git a/compiler/systems/t_amiga.pas b/compiler/systems/t_amiga.pas index 163b1b27b1..5977ecd344 100644 --- a/compiler/systems/t_amiga.pas +++ b/compiler/systems/t_amiga.pas @@ -53,7 +53,7 @@ implementation uses SysUtils, cutils,cfileutl,cclasses,aasmbase, - globtype,globals,systems,verbose,script,fmodule,i_amiga; + globtype,globals,systems,verbose,cscript,fmodule,i_amiga; diff --git a/compiler/systems/t_android.pas b/compiler/systems/t_android.pas index 8a749814e0..d376ec51fb 100644 --- a/compiler/systems/t_android.pas +++ b/compiler/systems/t_android.pas @@ -71,7 +71,7 @@ implementation SysUtils, cutils,cfileutl,cclasses, verbose,systems,globals, - symconst,script, + symconst,cscript, fmodule, aasmbase,aasmtai,aasmcpu,cpubase,hlcgcpu,hlcgobj, cgbase,cgobj,cgutils,ogbase,ncgutil, diff --git a/compiler/systems/t_aros.pas b/compiler/systems/t_aros.pas index 9f76c78c19..61fd939bf1 100644 --- a/compiler/systems/t_aros.pas +++ b/compiler/systems/t_aros.pas @@ -55,7 +55,7 @@ implementation uses SysUtils, cutils,cfileutl,cclasses,aasmbase, - globtype,globals,systems,verbose,script,fmodule,i_aros; + globtype,globals,systems,verbose,cscript,fmodule,i_aros; procedure timportlibaros.generatelib; diff --git a/compiler/systems/t_atari.pas b/compiler/systems/t_atari.pas index 8dfc008899..8865decdf5 100644 --- a/compiler/systems/t_atari.pas +++ b/compiler/systems/t_atari.pas @@ -49,7 +49,7 @@ implementation uses sysutils,cutils,cfileutl,cclasses,aasmbase, - globtype,globals,systems,verbose,script,fmodule,i_atari; + globtype,globals,systems,verbose,cscript,fmodule,i_atari; constructor TLinkerAtari.Create; diff --git a/compiler/systems/t_beos.pas b/compiler/systems/t_beos.pas index dbba9c921d..df06787792 100644 --- a/compiler/systems/t_beos.pas +++ b/compiler/systems/t_beos.pas @@ -59,7 +59,7 @@ implementation SysUtils, cutils,cfileutl,cclasses, verbose,systems,globtype,globals, - symconst,script, + symconst,cscript, fmodule,aasmbase,aasmtai,aasmdata,aasmcpu,cpubase,i_beos,ogbase; {***************************************************************************** diff --git a/compiler/systems/t_bsd.pas b/compiler/systems/t_bsd.pas index ff5885e1e2..cefc399e62 100644 --- a/compiler/systems/t_bsd.pas +++ b/compiler/systems/t_bsd.pas @@ -34,7 +34,7 @@ implementation sysutils, cutils,cfileutl,cclasses, verbose,systems,globtype,globals, - symconst,script, + symconst,cscript, fmodule,aasmbase,aasmtai,aasmdata,aasmcpu,cpubase,symsym,symdef, import,export,link,comprsrc,rescmn,i_bsd,expunix, cgutils,cgbase,cgobj,cpuinfo,ogbase; diff --git a/compiler/systems/t_embed.pas b/compiler/systems/t_embed.pas index 1854f702ed..c2d51c404f 100644 --- a/compiler/systems/t_embed.pas +++ b/compiler/systems/t_embed.pas @@ -32,7 +32,7 @@ implementation uses SysUtils, cutils,cfileutl,cclasses, - globtype,globals,systems,verbose,comphook,script,fmodule,i_embed,link, + globtype,globals,systems,verbose,comphook,cscript,fmodule,i_embed,link, cpuinfo; type diff --git a/compiler/systems/t_emx.pas b/compiler/systems/t_emx.pas index 4f1ed65c90..49c42fef47 100644 --- a/compiler/systems/t_emx.pas +++ b/compiler/systems/t_emx.pas @@ -40,7 +40,7 @@ implementation SysUtils, cutils,cfileutl,cclasses, globtype,comphook,systems,symconst,symsym,symdef, - globals,verbose,fmodule,script,ogbase, + globals,verbose,fmodule,cscript,ogbase, comprsrc,import,link,i_emx,ppu; type diff --git a/compiler/systems/t_gba.pas b/compiler/systems/t_gba.pas index 06d23d2a9b..5e218e201e 100644 --- a/compiler/systems/t_gba.pas +++ b/compiler/systems/t_gba.pas @@ -33,7 +33,7 @@ implementation aasmbase, SysUtils, cutils,cfileutl,cclasses, - globtype,globals,systems,verbose,script,fmodule,i_gba,link; + globtype,globals,systems,verbose,cscript,fmodule,i_gba,link; type TlinkerGBA=class(texternallinker) diff --git a/compiler/systems/t_go32v2.pas b/compiler/systems/t_go32v2.pas index b3fe481fee..69ff2c6165 100644 --- a/compiler/systems/t_go32v2.pas +++ b/compiler/systems/t_go32v2.pas @@ -32,7 +32,7 @@ implementation uses SysUtils, cutils,cfileutl,cclasses, - globtype,globals,systems,verbose,script, + globtype,globals,systems,verbose,cscript, fmodule,i_go32v2, link,ogcoff,owar,aasmbase; diff --git a/compiler/systems/t_haiku.pas b/compiler/systems/t_haiku.pas index 513eee10c5..7d6990e144 100644 --- a/compiler/systems/t_haiku.pas +++ b/compiler/systems/t_haiku.pas @@ -60,7 +60,7 @@ implementation SysUtils, cutils,cfileutl,cclasses, verbose,systems,globtype,globals, - symconst,script, + symconst,cscript, fmodule,aasmbase,aasmtai,aasmdata,aasmcpu,cpubase,i_haiku,ogbase; {***************************************************************************** diff --git a/compiler/systems/t_jvm.pas b/compiler/systems/t_jvm.pas index 09c17e6079..eecc6a7032 100644 --- a/compiler/systems/t_jvm.pas +++ b/compiler/systems/t_jvm.pas @@ -33,7 +33,7 @@ implementation sysutils, cutils,cfileutl,cclasses, verbose,systems,globtype,globals, - symconst,script, + symconst,cscript, fmodule,aasmbase,aasmtai,aasmdata,aasmcpu,cpubase,symsym,symdef, import,export,link,comprsrc,rescmn,i_jvm, cgutils,cgbase,cgobj,cpuinfo,ogbase; diff --git a/compiler/systems/t_linux.pas b/compiler/systems/t_linux.pas index 669ee5e84a..47d39eff07 100644 --- a/compiler/systems/t_linux.pas +++ b/compiler/systems/t_linux.pas @@ -77,7 +77,7 @@ implementation SysUtils, cutils,cfileutl,cclasses, verbose,systems,globtype,globals, - script, + cscript, fmodule, aasmbase,aasmtai,aasmcpu,cpubase, cgbase,ogbase, diff --git a/compiler/systems/t_macos.pas b/compiler/systems/t_macos.pas index 0601ba19ed..64e94b3f63 100644 --- a/compiler/systems/t_macos.pas +++ b/compiler/systems/t_macos.pas @@ -47,7 +47,7 @@ implementation uses SysUtils, cutils,cfileutl,cclasses, - globtype,globals,systems,verbose,script,fmodule,i_macos, + globtype,globals,systems,verbose,cscript,fmodule,i_macos, ogbase, symconst; diff --git a/compiler/systems/t_morph.pas b/compiler/systems/t_morph.pas index 8e83a88a9e..c673dddb08 100644 --- a/compiler/systems/t_morph.pas +++ b/compiler/systems/t_morph.pas @@ -32,7 +32,7 @@ implementation uses SysUtils, 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 PlinkerMorphOS=^TlinkerMorphOS; diff --git a/compiler/systems/t_msdos.pas b/compiler/systems/t_msdos.pas index 4755fc39ff..4c44e9de7e 100644 --- a/compiler/systems/t_msdos.pas +++ b/compiler/systems/t_msdos.pas @@ -34,7 +34,7 @@ implementation uses SysUtils, cutils,cfileutl,cclasses, - globtype,globals,systems,verbose,script, + globtype,globals,systems,verbose,cscript, fmodule,i_msdos, link,aasmbase,cpuinfo, omfbase,ogbase,ogomf,owomflib; diff --git a/compiler/systems/t_nds.pas b/compiler/systems/t_nds.pas index 93828c28aa..173b6c124e 100644 --- a/compiler/systems/t_nds.pas +++ b/compiler/systems/t_nds.pas @@ -33,7 +33,7 @@ implementation aasmbase, SysUtils, cutils,cfileutl,cclasses, - globtype,globals,systems,verbose,script,fmodule,i_nds,link; + globtype,globals,systems,verbose,cscript,fmodule,i_nds,link; type TlinkerNDS=class(texternallinker) diff --git a/compiler/systems/t_nwl.pas b/compiler/systems/t_nwl.pas index e730c6d16c..18741b946c 100644 --- a/compiler/systems/t_nwl.pas +++ b/compiler/systems/t_nwl.pas @@ -101,7 +101,7 @@ implementation SysUtils, cutils,cfileutl, verbose,systems,globtype,globals, - symconst,script, + symconst,cscript, fmodule,aasmbase,aasmtai,aasmdata,aasmcpu,cpubase,symsym,symdef, import,export,link,i_nwl,ogbase {$ifdef netware} ,dos {$endif} diff --git a/compiler/systems/t_nwm.pas b/compiler/systems/t_nwm.pas index d33ef833be..851dcba6da 100644 --- a/compiler/systems/t_nwm.pas +++ b/compiler/systems/t_nwm.pas @@ -95,7 +95,7 @@ implementation SysUtils, cutils,cfileutl, verbose,systems,globtype,globals, - symconst,script, + symconst,cscript, fmodule,aasmbase,aasmtai,aasmdata,aasmcpu,cpubase,symsym,symdef, import,export,link,i_nwm,ogbase, ogcoff, ognlm, owar, cclasses {$ifdef netware} ,dos {$endif} diff --git a/compiler/systems/t_os2.pas b/compiler/systems/t_os2.pas index f665fb3098..e3061252bd 100644 --- a/compiler/systems/t_os2.pas +++ b/compiler/systems/t_os2.pas @@ -40,7 +40,7 @@ implementation SysUtils, cutils,cfileutl,cclasses, globtype,systems,symconst,symdef, - globals,verbose,fmodule,script, + globals,verbose,fmodule,cscript, import,link,i_os2,ogbase; type diff --git a/compiler/systems/t_palmos.pas b/compiler/systems/t_palmos.pas index 41c03a46a1..0034dd4358 100644 --- a/compiler/systems/t_palmos.pas +++ b/compiler/systems/t_palmos.pas @@ -46,7 +46,7 @@ implementation uses SysUtils, cutils,cfileutl,cclasses, - globtype,globals,systems,verbose,script,fmodule,i_palmos, + globtype,globals,systems,verbose,cscript,fmodule,i_palmos, comprsrc; {**************************************************************************** diff --git a/compiler/systems/t_sunos.pas b/compiler/systems/t_sunos.pas index 4605c48e67..71224d86fb 100644 --- a/compiler/systems/t_sunos.pas +++ b/compiler/systems/t_sunos.pas @@ -37,7 +37,7 @@ implementation sysutils, cutils,cfileutl,cclasses, verbose,systems,globtype,globals, - script, + cscript, fmodule, import,export,expunix,link,comprsrc,rescmn,i_sunos,ogbase; diff --git a/compiler/systems/t_symbian.pas b/compiler/systems/t_symbian.pas index 87384b52a8..8992382702 100644 --- a/compiler/systems/t_symbian.pas +++ b/compiler/systems/t_symbian.pas @@ -30,7 +30,7 @@ interface cutils,cclasses, aasmbase,aasmtai,aasmdata,aasmcpu,fmodule,globtype,globals,systems,verbose, symconst,symdef,symsym, - script,gendef, + cscript,gendef, cpubase, import,export,link,cgobj, i_symbian; diff --git a/compiler/systems/t_watcom.pas b/compiler/systems/t_watcom.pas index 2c12eeb87a..bdf1447f40 100644 --- a/compiler/systems/t_watcom.pas +++ b/compiler/systems/t_watcom.pas @@ -33,7 +33,7 @@ implementation link, SysUtils, cclasses,cutils,cfileutl,globtype,globals, - systems,verbose,script,fmodule,i_watcom; + systems,verbose,cscript,fmodule,i_watcom; type diff --git a/compiler/systems/t_wii.pas b/compiler/systems/t_wii.pas index d4417bdfde..53624cce8b 100644 --- a/compiler/systems/t_wii.pas +++ b/compiler/systems/t_wii.pas @@ -33,7 +33,7 @@ implementation aasmbase, SysUtils, cutils,cfileutl,cclasses, - globtype,globals,systems,verbose,script,fmodule,i_wii,link; + globtype,globals,systems,verbose,cscript,fmodule,i_wii,link; type TlinkerWii=class(texternallinker) diff --git a/compiler/systems/t_win.pas b/compiler/systems/t_win.pas index c1fe019d4c..772e29fa6f 100644 --- a/compiler/systems/t_win.pas +++ b/compiler/systems/t_win.pas @@ -29,7 +29,7 @@ interface cutils,cclasses, aasmbase,aasmtai,aasmdata,aasmcpu,fmodule,globtype,globals,systems,verbose, symconst,symdef,symsym, - script,gendef, + cscript,gendef, cpubase, import,export,link,comprsrc,i_win; diff --git a/compiler/systems/t_win16.pas b/compiler/systems/t_win16.pas index 3650d8f0ec..7a054eeee0 100644 --- a/compiler/systems/t_win16.pas +++ b/compiler/systems/t_win16.pas @@ -32,7 +32,7 @@ implementation uses SysUtils, cutils,cfileutl,cclasses, - globtype,globals,systems,verbose,script, + globtype,globals,systems,verbose,cscript, import,export,fmodule,i_win16, link,aasmbase,cpuinfo, omfbase,ogbase,ogomf,owbase,owomflib, diff --git a/compiler/x86/agx86int.pas b/compiler/x86/agx86int.pas index 36fd3a9232..2857449084 100644 --- a/compiler/x86/agx86int.pas +++ b/compiler/x86/agx86int.pas @@ -55,7 +55,7 @@ implementation uses SysUtils, cutils,globtype,globals,systems,cclasses, - verbose,script,cpuinfo, + verbose,cscript,cpuinfo, itx86int, cgbase {$ifdef EXTDEBUG}