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 -
2025-04-13 04:09:33 +02:00 · 2017-11-17 11:27:19 +00:00 · 2017-11-17 11:27:19 +00:00 · e6aed467b5
commit e6aed467b5
parent bfb89bfd0f
39 changed files with 39 additions and 39 deletions
--- 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
--- a/compiler/assemble.pas
+++ b/compiler/assemble.pas
@ -256,7 +256,7 @@ Implementation
      sfpux80,
 {$endif}
 {$endif}
-      script,fmodule,verbose,
+      cscript,fmodule,verbose,
      cpuinfo,
      aasmcpu;

--- 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);
--- a/compiler/cscript.pas
+++ b/compiler/cscript.pas
@ -19,7 +19,7 @@

 ****************************************************************************
 }
-unit script;
+unit cscript;

 {$i fpcdefs.inc}

--- 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,
--- 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;

--- 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;

--- 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,
--- 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
      ;
--- 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;

--- 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,
--- 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;



--- 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,
--- 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;
--- 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;
--- 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;

 {*****************************************************************************
--- 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;
--- 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
--- 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
--- 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)
--- 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;

--- 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;

 {*****************************************************************************
--- 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;
--- 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,
--- 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;

--- 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;
--- 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;
--- 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)
--- 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}
--- 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}
--- 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
--- 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;

 {****************************************************************************
--- 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;

--- 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;

--- 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
--- 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)
--- 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;

--- 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,
--- 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}