Ver Fonte

* support linux unit for ver1_0 compilers

peter há 24 anos atrás
pai
commit
eda26e9190
5 ficheiros alterados com 41 adições e 22 exclusões
  1. 9 2
      compiler/assemble.pas
  2. 9 2
      compiler/catch.pas
  3. 4 13
      compiler/comphook.pas
  4. 10 3
      compiler/globals.pas
  5. 9 2
      compiler/script.pas

+ 9 - 2
compiler/assemble.pas

@@ -91,7 +91,11 @@ Implementation
 uses
 uses
   cutils,script,fmodule,systems,verbose
   cutils,script,fmodule,systems,verbose
 {$ifdef unix}
 {$ifdef unix}
-  ,unix
+  {$ifdef ver1_0}
+    ,linux
+  {$else}
+    ,unix
+  {$endif}
 {$endif}
 {$endif}
 {$ifdef i386}
 {$ifdef i386}
   {$ifndef NoAg386Bin}
   {$ifndef NoAg386Bin}
@@ -597,7 +601,10 @@ end;
 end.
 end.
 {
 {
   $Log$
   $Log$
-  Revision 1.10  2001-01-21 20:32:45  marco
+  Revision 1.11  2001-02-05 20:46:59  peter
+    * support linux unit for ver1_0 compilers
+
+  Revision 1.10  2001/01/21 20:32:45  marco
    * Renamefest. Compiler part. Not that hard.
    * Renamefest. Compiler part. Not that hard.
 
 
   Revision 1.9  2001/01/12 19:19:44  peter
   Revision 1.9  2001/01/12 19:19:44  peter

+ 9 - 2
compiler/catch.pas

@@ -38,7 +38,11 @@ interface
 uses
 uses
 {$ifdef unix}
 {$ifdef unix}
   {$define has_signal}
   {$define has_signal}
-  Unix,
+  {$ifdef ver1_0}
+    Linux,
+  {$else}
+    Unix,
+  {$endif}
 {$endif}
 {$endif}
 {$ifdef go32v2}
 {$ifdef go32v2}
   {$define has_signal}
   {$define has_signal}
@@ -101,7 +105,10 @@ end.
 
 
 {
 {
   $Log$
   $Log$
-  Revision 1.6  2001-01-21 20:32:45  marco
+  Revision 1.7  2001-02-05 20:47:00  peter
+    * support linux unit for ver1_0 compilers
+
+  Revision 1.6  2001/01/21 20:32:45  marco
    * Renamefest. Compiler part. Not that hard.
    * Renamefest. Compiler part. Not that hard.
 
 
   Revision 1.5  2000/11/13 15:26:12  marco
   Revision 1.5  2000/11/13 15:26:12  marco

+ 4 - 13
compiler/comphook.pas

@@ -138,9 +138,6 @@ const
 implementation
 implementation
 
 
   uses
   uses
-{$ifdef Unix}
-   Unix,
-{$endif}
 {$ifdef delphi}
 {$ifdef delphi}
    dmisc
    dmisc
 {$else}
 {$else}
@@ -337,17 +334,9 @@ end;
 Function def_GetNamedFileTime (Const F : String) : Longint;
 Function def_GetNamedFileTime (Const F : String) : Longint;
 var
 var
   L : Longint;
   L : Longint;
-{$ifndef Unix}
   info : SearchRec;
   info : SearchRec;
-{$else}
-  info : stat;
-{$endif}
 begin
 begin
   l:=-1;
   l:=-1;
-{$ifdef Unix}
-  if FStat (F,Info) then
-   L:=info.mtime;
-{$else}
   {$ifdef delphi}
   {$ifdef delphi}
     dmisc.FindFirst (F,archive+readonly+hidden,info);
     dmisc.FindFirst (F,archive+readonly+hidden,info);
   {$else delphi}
   {$else delphi}
@@ -356,14 +345,16 @@ begin
   if DosError=0 then
   if DosError=0 then
    l:=info.time;
    l:=info.time;
   FindClose(info);
   FindClose(info);
-{$endif Unix}
   def_GetNamedFileTime:=l;
   def_GetNamedFileTime:=l;
 end;
 end;
 
 
 end.
 end.
 {
 {
   $Log$
   $Log$
-  Revision 1.12  2001-01-21 20:32:45  marco
+  Revision 1.13  2001-02-05 20:47:00  peter
+    * support linux unit for ver1_0 compilers
+
+  Revision 1.12  2001/01/21 20:32:45  marco
    * Renamefest. Compiler part. Not that hard.
    * Renamefest. Compiler part. Not that hard.
 
 
   Revision 1.11  2000/12/26 15:58:29  peter
   Revision 1.11  2000/12/26 15:58:29  peter

+ 10 - 3
compiler/globals.pas

@@ -31,7 +31,11 @@ interface
       windows,
       windows,
 {$endif}
 {$endif}
 {$ifdef unix}
 {$ifdef unix}
+  {$ifdef ver1_0}
+      linux,
+  {$else}
       unix,
       unix,
+  {$endif}
 {$endif}
 {$endif}
 {$ifdef os2}
 {$ifdef os2}
       doscalls,
       doscalls,
@@ -957,7 +961,7 @@ implementation
       {$endif}
       {$endif}
       begin
       begin
       {$ifdef unix}
       {$ifdef unix}
-        GetEnvPchar:=Unix.Getenv(envname);
+        GetEnvPchar:={$ifdef ver1_0}Linux{$else}Unix{$endif}.Getenv(envname);
         {$define GETENVOK}
         {$define GETENVOK}
       {$endif}
       {$endif}
       {$ifdef win32}
       {$ifdef win32}
@@ -1017,7 +1021,7 @@ implementation
         expansion under linux }
         expansion under linux }
       {$ifdef unix}
       {$ifdef unix}
       begin
       begin
-        Unix.Shell(command);
+        {$ifdef ver1_0}Linux{$else}Unix{$endif}.Shell(command);
       end;
       end;
       {$else}
       {$else}
       var
       var
@@ -1299,7 +1303,10 @@ begin
 end.
 end.
 {
 {
   $Log$
   $Log$
-  Revision 1.25  2001-01-21 20:32:45  marco
+  Revision 1.26  2001-02-05 20:47:00  peter
+    * support linux unit for ver1_0 compilers
+
+  Revision 1.25  2001/01/21 20:32:45  marco
    * Renamefest. Compiler part. Not that hard.
    * Renamefest. Compiler part. Not that hard.
 
 
   Revision 1.24  2001/01/20 18:32:52  hajny
   Revision 1.24  2001/01/20 18:32:52  hajny

+ 9 - 2
compiler/script.pas

@@ -68,7 +68,11 @@ implementation
 
 
 uses
 uses
 {$ifdef Unix}
 {$ifdef Unix}
-  Unix,
+  {$ifdef ver1_0}
+    Linux,
+  {$else}
+    Unix,
+  {$endif}
 {$endif}
 {$endif}
   globals,systems;
   globals,systems;
 
 
@@ -237,7 +241,10 @@ end;
 end.
 end.
 {
 {
   $Log$
   $Log$
-  Revision 1.6  2001-01-21 20:32:45  marco
+  Revision 1.7  2001-02-05 20:47:00  peter
+    * support linux unit for ver1_0 compilers
+
+  Revision 1.6  2001/01/21 20:32:45  marco
    * Renamefest. Compiler part. Not that hard.
    * Renamefest. Compiler part. Not that hard.
 
 
   Revision 1.5  2000/12/25 00:07:29  peter
   Revision 1.5  2000/12/25 00:07:29  peter