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

Added basic support for Linux64G build, work in progress

git-svn-id: https://svn.inf.ethz.ch/svn/lecturers/a2/trunk@7681 8c9fc860-2736-0410-a75d-ab315db34111
negelef 7 лет назад
Родитель
Сommit
0340db0b18
1 измененных файлов с 22 добавлено и 12 удалено
  1. 22 12
      source/Release.Tool

+ 22 - 12
source/Release.Tool

@@ -289,13 +289,21 @@ BUILDS
 		DISABLED "FALSE"
 	}
 	Linux32G {
-		INCLUDE "UNIXG UNIXG32 LINUXG UNCOOP UNCOOP32"
+		INCLUDE "UNIXG UNIXG32 LINUXG32 UNCOOP UNCOOP32"
 		COMPILER "Compiler.Compile"
 		COMPILEOPTIONS "-p=Linux32G"
 		PATH "./NewAos/"
 		EXCLUDEPACKAGES "OberonVoyager OberonAnts"
 		DISABLED "FALSE"
 	}
+	Linux64G {
+		INCLUDE "UNIXG UNIXG64 LINUXG64 UNCOOP UNCOOP64"
+		COMPILER "Compiler.Compile"
+		COMPILEOPTIONS "-p=Linux64G"
+		PATH "./NewAos/"
+		EXCLUDEPACKAGES "OberonVoyager OberonAnts"
+		DISABLED "FALSE"
+	}
 	DarwinAos {
 		INCLUDE "UNIX UNIX32 DARWIN UNCOOP UNCOOP32"
 		COMPILER "Compiler.Compile"
@@ -369,7 +377,8 @@ PACKAGE Kernel ARCHIVE "Kernel.zip" SOURCE "KernelSrc.zip" DESCRIPTION "A2 Kerne
 	ZYNQCOOP { HeapManager.Mod Zynq.Environment.Mod }
 	WINCOOP { Win32.Environment.Mod }
 
-	LINUXG { Generic.Linux.I386.Glue.Mod Generic.Linux.I386.Unix.Mod }
+	LINUXG32 { Generic.Linux.I386.Glue.Mod Generic.Linux.I386.Unix.Mod }
+	LINUXG64 { Generic.Linux.AMD64.Glue.Mod Generic.Linux.AMD64.Unix.Mod }
 	DARWING { Generic.Unix.I386.Glue.Mod Generic.Darwin.I386.Unix.Mod }
 	SOLARISG { Generic.Unix.I386.Glue.Mod Generic.Solaris.I386.Unix.Mod }
 
@@ -393,6 +402,7 @@ PACKAGE Kernel ARCHIVE "Kernel.zip" SOURCE "KernelSrc.zip" DESCRIPTION "A2 Kerne
 
 	UNIX32 { Unix.I386.Machine.Mod }
 	UNIXG32 { Generic.Unix.I386.Machine.Mod }
+	UNIXG64 { Generic.Unix.AMD64.Machine.Mod }
 
 	NATIVEORIG, NATIVEGEN, WINORIG, WINGEN, UNIXG { Heaps.Mod }
 	UNIX { Unix.Heaps.Mod }
@@ -423,7 +433,7 @@ PACKAGE System ARCHIVE "System.zip" SOURCE "SystemSrc.zip" DESCRIPTION "System"
 	In.Mod Out.Mod
 
 	I386, WINORIG, WINGEN32, UNIX32, UNIXG32 { I386.Reals.Mod }
-	AMD64, WINGEN64 { AMD64.Reals.Mod }
+	AMD64, WINGEN64, UNIX64, UNIXG64 { AMD64.Reals.Mod }
 	ARM { ARM.Reals.Mod }
 
 	# default trap handling
@@ -510,7 +520,7 @@ PACKAGE System ARCHIVE "System.zip" SOURCE "SystemSrc.zip" DESCRIPTION "System"
 	BootShell.Mod
 
 	I386, UNIX32, UNIXG32 { I386.Network.Mod }
-	AMD64 { AMD64.Network.Mod }
+	AMD64, UNIX64, UNIXG64 { AMD64.Network.Mod }
 	ARM { ARM.Network.Mod }
 	NATIVE { NetworkMii.Mod }
 
@@ -697,7 +707,7 @@ PACKAGE Compiler ARCHIVE "Compiler.zip" SOURCE "CompilerSrc.zip" DESCRIPTION "Ac
 	# Runtime support for math oberon (Move to runtime package? *)
 	I386, WINORIG, WINGEN32, UNIX32, UNIXG32 { XMM.I386.Math.Mod XMM.I386.MathL.Mod }
 	#FPU32 { I386.Math.Mod I386.MathL.Mod }
-	AMD64, WINGEN64 { XMM.AMD64.Math.Mod XMM.AMD64.MathL.Mod }
+	AMD64, WINGEN64, UNIX64, UNIXG64 { XMM.AMD64.Math.Mod XMM.AMD64.MathL.Mod }
 	#FPU64 { AMD64.Math.Mod AMD64.MathL.Mod }
 	ComplexNumbers.Mod
 	FoxArrayBase.Mod
@@ -740,8 +750,8 @@ PACKAGE ApplicationsMini ARCHIVE "ApplicationsMini.zip" SOURCE "ApplicationsMini
 	CLUTs.Mod AosDefault.Pal
 
 	# raster images (eos)
-	I386, WINORIG, WINGEN32, UNIX32,UNIXG32 { I386.Raster.Mod }
-	AMD64, WINGEN64 { AMD64.Raster.Mod }
+	I386, WINORIG, WINGEN32, UNIX32, UNIXG32 { I386.Raster.Mod }
+	AMD64, WINGEN64, UNIX64, UNIXG64 { AMD64.Raster.Mod }
 
 	Localization.Mod
 	Archives.Mod
@@ -773,8 +783,8 @@ PACKAGE ApplicationsMini ARCHIVE "ApplicationsMini.zip" SOURCE "ApplicationsMini
 	UnicodeBidirectionality.Mod
 
 	# Move to graphical package!!
-	I386, WINORIG, WINGEN32, UNIX32,UNIXG32 { I386.WMRasterScale.Mod }
-	AMD64, WINGEN64 { AMD64.WMRasterScale.Mod }
+	I386, WINORIG, WINGEN32, UNIX32, UNIXG32 { I386.WMRasterScale.Mod }
+	AMD64, WINGEN64, UNIX64, UNIXG64 { AMD64.WMRasterScale.Mod }
 
 	WMGraphics.Mod
 	WMGraphicsSmooth.Mod
@@ -1253,7 +1263,7 @@ PACKAGE GuiApplications ARCHIVE "GuiApplications.zip" SOURCE "GuiApplicationsSrc
 	}
 
 	I386, WINORIG, WINGEN32, UNIX32, UNIXG32 { I386.WMTransitions.Mod }
-	AMD64, WINGEN64 { AMD64.WMTransitions.Mod }
+	AMD64, WINGEN64, UNIX64, UNIXG64 { AMD64.WMTransitions.Mod }
 	MediaPlayer.Mod Presentation.Mod
 	MP3Player.Mod WMPlayer.Mod
 	WAVRecorder.Mod
@@ -1421,8 +1431,8 @@ END
 
 PACKAGE EFI ARCHIVE "EFI.zip" SOURCE "EFISrc.zip" DESCRIPTION "EFI Boot Loader and API"
 	EFI.Tool EFI.Mod
-	I386, WINORIG, WINGEN32, UNIX32,UNIXG32 {I386.EFIMachine.Mod}
-	AMD64, WINGEN64 { AMD64.EFIMachine.Mod }
+	I386, WINORIG, WINGEN32, UNIX32, UNIXG32 {I386.EFIMachine.Mod}
+	AMD64, WINGEN64, UNIX64, UNIXG64 { AMD64.EFIMachine.Mod }
 
 
 	EFIBlockIO.Mod EFIDiskIO.Mod