2
0
Эх сурвалжийг харах

Added Bios32C build

git-svn-id: https://svn.inf.ethz.ch/svn/lecturers/a2/trunk@8568 8c9fc860-2736-0410-a75d-ab315db34111
negelef 6 жил өмнө
parent
commit
5cf25a4b2e

+ 9 - 10
source/Release.Tool

@@ -380,8 +380,8 @@ PACKAGE System ARCHIVE "System.zip" SOURCE "SystemSrc.zip" DESCRIPTION "System"
 	NATIVE & ~BIOS { Clock.Mod}
 
 	# Memory cache control
-	BIOS { BIOS.MemCache.Mod }
-	COOP { Coop.MemCache.Mod }
+	BIOS & ~COOP { BIOS.MemCache.Mod }
+	BIOS & COOP { Coop.MemCache.Mod }
 
 	# Block device interface
 	Disks.Mod
@@ -679,7 +679,7 @@ PACKAGE Drivers ARCHIVE "Drivers.zip" SOURCE "DriversSrc.zip" DESCRIPTION "Devic
 		BluetoothHCI.Mod BluetoothL2CAP.Mod BluetoothRFCOMM.Mod
 	}
 
-	BIOS {
+	BIOS & ~COOP {
 		# Floppy disk driver
 		BIOS.Diskettes.Mod
 	}
@@ -954,7 +954,7 @@ PACKAGE Applications ARCHIVE "Applications.zip" SOURCE "ApplicationsSrc.zip" DES
 
 	ShellCommands.Mod Telnet.Mod	# Telnet Shell (currently broken)
 
-	BIOS { BIOS.MemInfo.Mod }
+	BIOS & ~COOP { BIOS.MemInfo.Mod }
 	BIOS, WIN { Info.Mod }
 
 	TFClasses.Mod Mail.Mod SMTPClient.Mod
@@ -1163,11 +1163,11 @@ PACKAGE GuiApplicationsMini ARCHIVE "GuiApplicationsMini.zip" SOURCE "GuiApplica
 	WMPerfMonAlerts.Mod WMPerfMonAlertsUtils.Mod WMPerfMonAlerts.XML
 
 	# perfmon kernel plugins
-	NATIVE {
+	NATIVE & ~COOP {
 		WMPerfMonPluginCpu.Mod WMPerfMonPluginMemory.Mod
 	}
 
-	BIOS {
+	BIOS & ~COOP {
 		BIOS.WMPerfMonPluginInterrupts.Mod
 	}
 
@@ -1175,7 +1175,7 @@ PACKAGE GuiApplicationsMini ARCHIVE "GuiApplicationsMini.zip" SOURCE "GuiApplica
 		WMPerfMonPluginUsb.Mod WMPerfMonPluginNetStats.Mod
 	}
 	WIN { Windows.WMPerfMonPluginCpu.Mod Windows.WMPerfMonPluginMemory.Mod }
-	UNIX { Unix.WMPerfMonPluginCpu.Mod Unix.WMPerfMonPluginMemory.Mod }
+	UNIX, COOP { Unix.WMPerfMonPluginCpu.Mod Unix.WMPerfMonPluginMemory.Mod }
 
 	NATIVE, WIN {
 		WMPerfMonPluginModVars.Mod WMPerfMonPluginHeap.Mod
@@ -1391,16 +1391,15 @@ PACKAGE Testing ARCHIVE "Testing.zip" SOURCE "TestingSrc.zip" DESCRIPTION "Tests
 
 	CSV.Test
 
-	BIOS {
+	BIOS & ~COOP {
 		TestLocks.Mod
 		BenchSpeedup.Mod BenchObjCount.Mod
 		BenchClockDrift.Mod BenchNew.Mod BenchLocks.Mod
 		BenchPingPong.Mod
 		BluetoothTest.Mod
+		BIOS.BenchInterrupts.Mod
 	}
 
-	BIOS { BIOS.BenchInterrupts.Mod }
-
 	BenchTCP.Mod
 
 	TestDates.Mod # Dates.Mod

+ 1 - 1
tools/builds/a2/makefile

@@ -7,7 +7,7 @@ MAKEFLAGS += --no-builtin-rules --no-builtin-variables
 
 tool := $(if $(wildcard oberon), ./oberon, ./original)
 platforms := Bios32 Bios64 Zynq Win32 Win64 Linux32 Linux64 Darwin32 Darwin64 Solaris32 Solaris64 \
-	RPiC ZynqC Linux32C Linux64C
+	Bios32C RPiC ZynqC Linux32C Linux64C
 
 target := Linux64
 pltfrm := Unix64

+ 1 - 0
tools/builds/cron.hourly/a2-cooperative

@@ -22,6 +22,7 @@ process ()
 	notify
 }
 
+process Bios32C &
 process Linux32C &
 process Linux64C &
 process RPiC &