Browse Source

Added Linux32C build

git-svn-id: https://svn.inf.ethz.ch/svn/lecturers/a2/trunk@8237 8c9fc860-2736-0410-a75d-ab315db34111
negelef 7 years ago
parent
commit
d7c7502652
3 changed files with 15 additions and 8 deletions
  1. 13 7
      source/Release.Tool
  2. 1 1
      tools/builds/a2/makefile
  3. 1 0
      tools/builds/cron.hourly/a2-cooperative

+ 13 - 7
source/Release.Tool

@@ -190,6 +190,14 @@ BUILDS
 		EXCLUDEPACKAGES "OberonVoyager OberonAnts"
 		DISABLED "FALSE"
 	}
+	Linux32C {
+		INCLUDE "LINUX32C UNIX32 UNIX I386 COOP"
+		COMPILER "Compiler.Compile"
+		COMPILEOPTIONS "-p=Linux32 --cooperative --traceModule=Trace --preciseGC=no --define=LINUX32C,UNIX32,UNIX,I386,COOP"
+		PATH "./NewAos/"
+		EXCLUDEPACKAGES "Oberon OberonGadgets OberonApplications OberonDocumentation OberonVoyager OberonAnts TrueTypeFonts CjkFonts Pr3Fonts ScreenFonts Pr6Fonts"
+		DISABLED "FALSE"
+	}
 	Linux64 {
 		INCLUDE "LINUX64 UNIX64 UNIX AMD64"
 		COMPILER "Compiler.Compile"
@@ -254,8 +262,8 @@ PACKAGE Kernel ARCHIVE "Kernel.zip" SOURCE "KernelSrc.zip" DESCRIPTION "A2 Kerne
 	# Runtime support for HUGEINT and strings
 	I386 { I386.Builtins.Mod }
 	AMD64 { AMD64.Builtins.Mod }
-	BIOS32C, WIN32C { I386.CPU.Mod }
-	LINUX64C { AMD64.CPU.Mod }
+	I386 & COOP { I386.CPU.Mod }
+	AMD64 & COOP { AMD64.CPU.Mod }
 	RPIC { RPI.CPU.Mod }
 	ZYNQC { Zynq.CPU.Mod }
 
@@ -266,7 +274,7 @@ PACKAGE Kernel ARCHIVE "Kernel.zip" SOURCE "KernelSrc.zip" DESCRIPTION "A2 Kerne
 	COOP { Counters.Mod }
 	BIOS32C { I386.APIC.Mod APIC.Processors.Mod BIOS.ACPI.Mod ACPI.Timer.Mod }
 	WIN32C { Coop.Windows.I386.Kernel32.Mod Windows.Processors.Mod Windows.Timer.Mod }
-	LINUX64C { Linux.Glue.Mod Linux.AMD64.Unix.Mod Unix.Processors.Mod Unix.Timer.Mod }
+	LINUX & COOP { Linux.Glue.Mod Linux.AMD64.Unix.Mod Unix.Processors.Mod Unix.Timer.Mod }
 	RPIC { RPI.Processors.Mod RPI.Timer.Mod }
 	ZYNQC { Zynq.Processors.Mod Zynq.Timer.Mod }
 	COOP { Queues.Mod BaseTypes.Mod Activities.Mod ExclusiveBlocks.Mod Interrupts.Mod Runtime.Mod }
@@ -274,7 +282,7 @@ PACKAGE Kernel ARCHIVE "Kernel.zip" SOURCE "KernelSrc.zip" DESCRIPTION "A2 Kerne
 	RPIC { HeapManager.Mod RPI.Environment.Mod }
 	ZYNQC { HeapManager.Mod Zynq.Environment.Mod }
 	WIN32C { Windows.Environment.Mod }
-	LINUX64C { Unix.Environment.Mod }
+	UNIX & COOP { Unix.Environment.Mod }
 
 	LINUX32 { Linux.Glue.Mod Linux.I386.Unix.Mod }
 	LINUX64 { Linux.Glue.Mod Linux.AMD64.Unix.Mod }
@@ -288,9 +296,7 @@ PACKAGE Kernel ARCHIVE "Kernel.zip" SOURCE "KernelSrc.zip" DESCRIPTION "A2 Kerne
 	BIOS64 { BIOS.AMD64.Machine.Mod }
 	WIN32 { Windows.I386.Machine.Mod }
 	WIN64 { Windows.AMD64.Machine.Mod }
-	COOP { Mutexes.Mod }
-	BIOS32C, WIN32C { Coop.Machine.Mod }
-	LINUX64C { Coop.Machine.Mod }
+	COOP { Mutexes.Mod Coop.Machine.Mod }
 	RPIC, ZYNQC { Coop.ARM.Machine.Mod }
 	UNIX & ~COOP { Unix.Machine.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 Win32 Win64 Linux32 Linux64 Darwin32 Darwin64 Solaris32 Solaris64 \
-	Linux64C
+	Linux32C Linux64C
 
 target := Linux64
 object := .GofUu

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

@@ -22,4 +22,5 @@ process ()
 	notify
 }
 
+process Linux32C &
 process Linux64C &