+ Moved AllOSs and AllCPUs to fpmkunit

git-svn-id: trunk@1017 -

rtl/common/fpmkunit.pp

@@ -618,6 +618,9 @@ Const
   PowerPC = PPC;
   dos = go32v2;
 
+  AllOSs  = [Low(TOS)..High(TOS)];
+  AllCPUs = [Low(TCPU)..High(TCPU)];
+  
   // Useful
   UnitExt = '.ppu';
   PPUExt  = UnitExt;
@@ -670,6 +673,9 @@ Var
   OnDownloadFile : TDownloadEvent = Nil;
   DownloadFileProc : TDownloadProc = Nil;
 
+Function CurrentOS : String;
+Function CurrentCPU : String;
+
 Function Installer : TInstaller;
 Function Defaults : TDefaults; // Set by installer.
 Function Dictionary : TDictionary;
@@ -774,6 +780,18 @@ begin
 end;
 
 
+Function CurrentOS : String;
+
+begin
+  Result:=OSToString(Defaults.OS);
+end;
+
+Function CurrentCPU : String;
+
+begin
+  Result:=CPUToString(Defaults.CPU);
+end;
+
 Function OSToString(OS: TOS) : String;
 
 begin

rtl/fpmake.inc

@@ -5,34 +5,6 @@ Const
   Unixes = [darwin,freebsd,linux,netbsd,openbsd];
   
  
-Var
-  FAllOS : TOses;
-  FAllCPUs : TCPUs;
-  
-Function AllOS : TOSes;
-
-Var
-  O : TOS;
-
-begin
-  If (FAllOS=[]) then
-    For O:=Low(TOS) to High(TOS) do
-      Include(FallOS,O);
-  Result:=FAllOS;    
-end;
-
-Function AllCPUs : TCPUs;
-
-Var
-  C : TCPU;
-
-begin
-  If (FAllCPUs=[]) then
-    For C:=Low(TCPU) to High(TCPU) do
-      Include(FallCPUs,C);
-  Result:=FAllCPUs;    
-end;
-  
 Function CurrentOS : String;
 
 begin
@@ -125,7 +97,7 @@ begin
     begin
     O:=T.OS;
     If (O=[]) then
-      O:=AllOS;
+      O:=AllOSs;
     Exclude(O,Defaults.OS);
     T.OS:=O;  
     end
@@ -143,7 +115,7 @@ Var
 begin
   With Installer.Targets do
     begin
-    DefaultOS:=AllOS;
+    DefaultOS:=AllOSs;
     DefaultCPU:=AllCPUs;
     { System unit. For all platforms. }
     T:=AddUnit(OSDIR(False)+'system.pp');