Просмотр исходного кода

Linux32G build works and is fully operational

git-svn-id: https://svn.inf.ethz.ch/svn/lecturers/a2/trunk@6966 8c9fc860-2736-0410-a75d-ab315db34111
felixf 8 лет назад
Родитель
Сommit
3b221a11bc
2 измененных файлов с 21 добавлено и 2 удалено
  1. 17 0
      source/Heaps.Mod
  2. 4 2
      source/Release.Tool

+ 17 - 0
source/Heaps.Mod

@@ -1407,6 +1407,23 @@ BEGIN
 	Machine.Release(Machine.Heaps)
 END GetHeapInfo;
 
+(* redundant, for compatibility *)
+PROCEDURE HeapSize*(): SIZE;
+VAR total, free, largest: SIZE;
+BEGIN
+	GetHeapInfo(total, free, largest);
+	RETURN total;
+END HeapSize;
+
+(* redundant, for compatibility *)
+PROCEDURE Used*(): SIZE;
+VAR total, free, largest: SIZE;
+BEGIN
+	GetHeapInfo(total, free, largest);
+	RETURN total-free;
+END Used;
+
+
 (* NilGC - Default garbage collector. *)
 PROCEDURE NilGC;
 BEGIN

+ 4 - 2
source/Release.Tool

@@ -269,7 +269,7 @@ BUILDS
 		TARGET "AMD"
 		EXTENSION "GofU"
 		SYMBOLEXTENSION "SymU"
-		PATH "."
+		PATH "./"
 		EXCLUDEPACKAGES "OberonVoyager OberonAnts"
 		DISABLED "FALSE"
 	}		
@@ -977,7 +977,9 @@ PACKAGE GuiApplicationsMini ARCHIVE "GuiApplicationsMini.zip" SOURCE "GuiApplica
 	cjkfont.bfnt # since used as fallback
 
 	WindowManager.Mod
-	UNIX, UNIXG { Unix.X11.Mod Unix.X11Api.Mod Unix.XDisplay.Mod Unix.Beep.Mod Unix.KbdMouse.Mod Unix.Clipboard.Mod }
+	UNIX { Unix.X11.Mod }
+	UNIXG { Generic.Unix.X11.Mod }
+	UNIX, UNIXG { Unix.X11Api.Mod Unix.XDisplay.Mod Unix.Beep.Mod Unix.KbdMouse.Mod Unix.Clipboard.Mod Unix.Display.Mod }
 
 
 	# Icons representing applications (don't put icons used by applications inside!)