[ros-diffs] [sserapion] 46829: Remove mini_hal from build.

Author: sserapion
Date: Sun Apr 11 01:06:33 2010
New Revision: 46829

URL: http://svn.reactos.org/svn/reactos?rev=46829&view=rev
Log:
Remove mini_hal from build.

Added:
    branches/ros-amd64-bringup/reactos/hal/halx86/hal_mini.rbuild   (with props)
Modified:
    branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/setupldr.rbuild
    branches/ros-amd64-bringup/reactos/hal/hal.rbuild
    branches/ros-amd64-bringup/reactos/hal/halx86/hal_generic.rbuild

Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/setupldr.rbuild
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/…
==============================================================================
--- branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/setupldr.rbuild [iso-8859-1]
(original)
+++ branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/setupldr.rbuild [iso-8859-1]
Sun Apr 11 01:06:33 2010
@@ -11,7 +11,9 @@
 	<library>cmlib</library>
 	<library>rtl</library>
 	<library>libcntpr</library>
+<if property="ARCH" value="i386">
 	<library>mini_hal</library>
+</if>
 	<group linkerset="ld">
 		<linkerflag>-nostartfiles</linkerflag>
 		<linkerflag>-nostdlib</linkerflag>

Modified: branches/ros-amd64-bringup/reactos/hal/hal.rbuild
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h…
==============================================================================
--- branches/ros-amd64-bringup/reactos/hal/hal.rbuild [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/hal/hal.rbuild [iso-8859-1] Sun Apr 11 01:06:33
2010
@@ -3,9 +3,10 @@
 <group xmlns:xi="http://www.w3.org/2001/XInclude">
 
 	<if property="ARCH" value="i386">
-	    <directory name="halx86">
-		    <xi:include href="halx86/directory.rbuild" />
-	    </directory>
+		<directory name="halx86">
+			<xi:include href="halx86/hal_mini.rbuild" />
+			<xi:include href="halx86/directory.rbuild" />
+		</directory>
 	</if>
 
 	<if property="ARCH" value="amd64">

Modified: branches/ros-amd64-bringup/reactos/hal/halx86/hal_generic.rbuild
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h…
==============================================================================
--- branches/ros-amd64-bringup/reactos/hal/halx86/hal_generic.rbuild [iso-8859-1]
(original)
+++ branches/ros-amd64-bringup/reactos/hal/halx86/hal_generic.rbuild [iso-8859-1] Sun Apr
11 01:06:33 2010
@@ -16,6 +16,7 @@
 				<file>sysbus.c</file>
 			</directory>
 			<file>beep.c</file>
+			<file>bios.c</file>
 			<file>cmos.c</file>
 			<file>display.c</file>
 			<file>dma.c</file>
@@ -28,7 +29,6 @@
 			<file>timer.c</file>
 			<file>usage.c</file>
 			<if property="ARCH" value="i386">
-				<file>bios.c</file>
 				<directory name="i386">
 					<file>portio.c</file>
 					<file>systimer.S</file>
@@ -36,16 +36,9 @@
 				</directory>
 			</if>
 			<if property="ARCH" value="amd64">
-				<define name="_X86BIOS_" />
-				<include base="x86emu">.</include>
 				<directory name="amd64">
 					<file>x86bios.c</file>
-					<file>halinit.c</file>
-					<file>irq.S</file>
-					<file>misc.c</file>
-					<file>apic.c</file>
 					<file>systimer.S</file>
-					<file>usage.c</file>
 				</directory>
 			</if>
 		</directory>
@@ -53,57 +46,4 @@
 			<pch>hal.h</pch>
 		</directory>
 	</module>
-
-	<module name="mini_hal" type="objectlibrary"
crt="static">
-		<include>include</include>
-		<include base="ntoskrnl">include</include>
-		<define name="_NTHALDLL_" />
-		<define name="_NTHAL_" />
-		<define name="_BLDR_" />
-		<define name="_MINIHAL_" />
-		<directory name="generic">
-			<directory name="bus">
-				<file>bushndlr.c</file>
-				<file>isabus.c</file>
-				<file>halbus.c</file>
-				<file>pcibus.c</file>
-				<file>pcidata.c</file>
-				<file>sysbus.c</file>
-			</directory>
-			<file>beep.c</file>
-			<file>cmos.c</file>
-			<file>dma.c</file>
-			<file>display.c</file>
-			<file>drive.c</file>
-			<file>misc.c</file>
-			<file>profil.c</file>
-			<file>reboot.c</file>
-			<file>spinlock.c</file>
-			<file>sysinfo.c</file>
-			<file>timer.c</file>
-			<file>usage.c</file>
-			<if property="ARCH" value="i386">
-				<file>bios.c</file>
-				<directory name="i386">
-					<file>portio.c</file>
-					<file>systimer.S</file>
-				</directory>
-			</if>
-			<if property="ARCH" value="amd64">
-				<directory name="amd64">
-					<file>halinit.c</file>
-					<file>irq.S</file>
-					<file>misc.c</file>
-					<file>apic.c</file>
-					<file>systimer.S</file>
-					<file>usage.c</file>
-				</directory>
-			</if>
-		</directory>
-		<directory name="up">
-			<file>halinit_up.c</file>
-			<file>pic.c</file>
-			<file>processor.c</file>
-		</directory>
-	</module>
 </group>

Added: branches/ros-amd64-bringup/reactos/hal/halx86/hal_mini.rbuild
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h…
==============================================================================
--- branches/ros-amd64-bringup/reactos/hal/halx86/hal_mini.rbuild (added)
+++ branches/ros-amd64-bringup/reactos/hal/halx86/hal_mini.rbuild [iso-8859-1] Sun Apr 11
01:06:33 2010
@@ -1,0 +1,46 @@
+<?xml version="1.0"?>
+<!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd">
+<group>
+	<module name="mini_hal" type="objectlibrary"
crt="static">
+		<include>include</include>
+		<include base="ntoskrnl">include</include>
+		<define name="_NTHALDLL_" />
+		<define name="_NTHAL_" />
+		<define name="_BLDR_" />
+		<define name="_MINIHAL_" />
+		<directory name="generic">
+			<directory name="bus">
+				<file>bushndlr.c</file>
+				<file>isabus.c</file>
+				<file>halbus.c</file>
+				<file>pcibus.c</file>
+				<file>pcidata.c</file>
+				<file>sysbus.c</file>
+			</directory>
+			<file>beep.c</file>
+			<file>bios.c</file>
+			<file>cmos.c</file>
+			<file>dma.c</file>
+			<file>display.c</file>
+			<file>drive.c</file>
+			<file>misc.c</file>
+			<file>profil.c</file>
+			<file>reboot.c</file>
+			<file>spinlock.c</file>
+			<file>sysinfo.c</file>
+			<file>timer.c</file>
+			<file>usage.c</file>
+			<if property="ARCH" value="i386">
+				<directory name="i386">
+					<file>portio.c</file>
+					<file>systimer.S</file>
+				</directory>
+			</if>
+				</directory>
+		<directory name="up">
+			<file>halinit_up.c</file>
+			<file>pic.c</file>
+			<file>processor.c</file>
+		</directory>
+	</module>
+</group>

Propchange: branches/ros-amd64-bringup/reactos/hal/halx86/hal_mini.rbuild
------------------------------------------------------------------------------
    svn:eol-style = native