[mpiulachs] 33677: - Move every x86 HAL to it's own .rbuild file - Take advantage of r33676
Author: mpiulachs Date: Sat May 24 15:32:44 2008 New Revision: 33677
URL: http://svn.reactos.org/svn/reactos?rev=33677&view=rev Log: - Move every x86 HAL to it's own .rbuild file - Take advantage of r33676
Added: trunk/reactos/hal/halx86/hal_generic.rbuild (with props) trunk/reactos/hal/halx86/hal_generic_pc.rbuild (with props) trunk/reactos/hal/halx86/hal_generic_up.rbuild (with props) trunk/reactos/hal/halx86/halmp.rbuild (with props) trunk/reactos/hal/halx86/halup.rbuild (with props) trunk/reactos/hal/halx86/halxbox.rbuild (with props) Removed: trunk/reactos/hal/halx86/directory.rbuild Modified: trunk/reactos/hal/hal.rbuild
Modified: trunk/reactos/hal/hal.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/hal.rbuild?rev=33677&am... ============================================================================== --- trunk/reactos/hal/hal.rbuild [iso-8859-1] (original) +++ trunk/reactos/hal/hal.rbuild [iso-8859-1] Sat May 24 15:32:44 2008 @@ -6,7 +6,12 @@ </directory> <if property="ARCH" value="i386"> <directory name="halx86"> - <xi:include href="halx86/directory.rbuild" /> + <xi:include href="halx86/hal_generic.rbuild" /> + <xi:include href="halx86/hal_generic_up.rbuild" /> + <xi:include href="halx86/hal_generic_pc.rbuild" /> + <xi:include href="halx86/halup.rbuild" /> + <xi:include href="halx86/halmp.rbuild" /> + <xi:include href="halx86/halxbox.rbuild" /> </directory> </if> <if property="ARCH" value="powerpc">
Removed: trunk/reactos/hal/halx86/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/directory.rbuild... ============================================================================== --- trunk/reactos/hal/halx86/directory.rbuild [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/directory.rbuild (removed) @@ -1,69 +1,0 @@ -<?xml version="1.0"?> -<!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd"> -<group xmlns:xi="http://www.w3.org/2001/XInclude"> - <directory name="generic"> - <xi:include href="generic/generic.rbuild" /> - </directory> - - <module name="halup" type="kernelmodedll" entrypoint="0"> - <importlibrary definition="../hal/hal_i386.def" /> - <bootstrap installbase="$(CDOUTPUT)" nameoncd="hal.dll" /> - <include>include</include> - <include base="ntoskrnl">include</include> - <define name="_DISABLE_TIDENTS" /> - <define name="_NTHAL_" /> - <library>hal_generic</library> - <library>hal_generic_up</library> - <library>hal_generic_pc</library> - <library>ntoskrnl</library> - <directory name="up"> - <file>halinit_up.c</file> - <file>halup.rc</file> - </directory> - </module> - <module name="halmp" type="kernelmodedll" entrypoint="0"> - <importlibrary definition="../hal/hal_i386.def" /> - <bootstrap installbase="$(CDOUTPUT)" /> - <include>include</include> - <include base="ntoskrnl">include</include> - <define name="_DISABLE_TIDENTS" /> - <define name="CONFIG_SMP" /> - <define name="_NTHAL_" /> - <library>hal_generic</library> - <library>hal_generic_pc</library> - <library>ntoskrnl</library> - <directory name="mp"> - <file>apic.c</file> - <file>halinit_mp.c</file> - <file>ioapic.c</file> - <file>ipi_mp.c</file> - <file>mpconfig.c</file> - <file>mps.S</file> - <file>mpsboot.asm</file> - <file>mpsirql.c</file> - <file>processor_mp.c</file> - <file>spinlock.c</file> - <file>halmp.rc</file> - </directory> - </module> - <module name="halxbox" type="kernelmodedll" entrypoint="0" allowwarnings="true"> - <importlibrary definition="../hal/hal_i386.def" /> - <include>include</include> - <include base="ntoskrnl">include</include> - <define name="_DISABLE_TIDENTS" /> - <define name="_NTHAL_" /> - <define name="SARCH_XBOX" /> - <library>hal_generic</library> - <library>hal_generic_up</library> - <library>ntoskrnl</library> - <directory name="generic"> - <file>pci.c</file> - </directory> - <directory name="xbox"> - <file>halinit_xbox.c</file> - <file>part_xbox.c</file> - <file>halxbox.rc</file> - <pch>halxbox.h</pch> - </directory> - </module> -</group>
Added: trunk/reactos/hal/halx86/hal_generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/hal_generic.rbui... ============================================================================== --- trunk/reactos/hal/halx86/hal_generic.rbuild (added) +++ trunk/reactos/hal/halx86/hal_generic.rbuild [iso-8859-1] Sat May 24 15:32:44 2008 @@ -1,0 +1,31 @@ +<?xml version="1.0"?> +<!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd"> +<group> + <module name="hal_generic" type="objectlibrary"> + <include>include</include> + <include base="ntoskrnl">include</include> + <define name="_DISABLE_TIDENTS" /> + <define name="_NTHAL_" /> + <directory name="generic"> + <file>beep.c</file> + <file>bios.c</file> + <file>bus.c</file> + <file>cmos.c</file> + <file>dma.c</file> + <file>drive.c</file> + <file>display.c</file> + <file>halinit.c</file> + <file>misc.c</file> + <file>portio.c</file> + <file>profil.c</file> + <file>reboot.c</file> + <file>sysinfo.c</file> + <file>timer.c</file> + <file>systimer.S</file> + <file>v86.s</file> + </directory> + <directory name="include"> + <pch>hal.h</pch> + </directory> + </module> +</group>
Propchange: trunk/reactos/hal/halx86/hal_generic.rbuild ------------------------------------------------------------------------------ svn:eol-style = native
Added: trunk/reactos/hal/halx86/hal_generic_pc.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/hal_generic_pc.r... ============================================================================== --- trunk/reactos/hal/halx86/hal_generic_pc.rbuild (added) +++ trunk/reactos/hal/halx86/hal_generic_pc.rbuild [iso-8859-1] Sat May 24 15:32:44 2008 @@ -1,0 +1,13 @@ +<?xml version="1.0"?> +<!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd"> +<group> + <module name="hal_generic_pc" type="objectlibrary"> + <include>include</include> + <include base="ntoskrnl">include</include> + <define name="_DISABLE_TIDENTS" /> + <define name="_NTHAL_" /> + <directory name="generic"> + <file>pci.c</file> + </directory> + </module> +</group>
Propchange: trunk/reactos/hal/halx86/hal_generic_pc.rbuild ------------------------------------------------------------------------------ svn:eol-style = native
Added: trunk/reactos/hal/halx86/hal_generic_up.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/hal_generic_up.r... ============================================================================== --- trunk/reactos/hal/halx86/hal_generic_up.rbuild (added) +++ trunk/reactos/hal/halx86/hal_generic_up.rbuild [iso-8859-1] Sat May 24 15:32:44 2008 @@ -1,0 +1,15 @@ +<?xml version="1.0"?> +<!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd"> +<group> + <module name="hal_generic_up" type="objectlibrary"> + <include>include</include> + <include base="ntoskrnl">include</include> + <define name="_DISABLE_TIDENTS" /> + <define name="_NTHAL_" /> + <directory name="generic"> + <file>irq.S</file> + <file>processor.c</file> + <file>spinlock.c</file> + </directory> + </module> +</group>
Propchange: trunk/reactos/hal/halx86/hal_generic_up.rbuild ------------------------------------------------------------------------------ svn:eol-style = native
Added: trunk/reactos/hal/halx86/halmp.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/halmp.rbuild?rev... ============================================================================== --- trunk/reactos/hal/halx86/halmp.rbuild (added) +++ trunk/reactos/hal/halx86/halmp.rbuild [iso-8859-1] Sat May 24 15:32:44 2008 @@ -1,0 +1,29 @@ +<?xml version="1.0"?> +<!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd"> +<group xmlns:xi="http://www.w3.org/2001/XInclude"> + <module name="halmp" type="kernelmodedll" entrypoint="0"> + <importlibrary base="hal" definition="hal_i386.def" /> + <bootstrap installbase="$(CDOUTPUT)" /> + <include>include</include> + <include base="ntoskrnl">include</include> + <define name="_DISABLE_TIDENTS" /> + <define name="CONFIG_SMP" /> + <define name="_NTHAL_" /> + <library>hal_generic</library> + <library>hal_generic_pc</library> + <library>ntoskrnl</library> + <directory name="mp"> + <file>apic.c</file> + <file>halinit_mp.c</file> + <file>ioapic.c</file> + <file>ipi_mp.c</file> + <file>mpconfig.c</file> + <file>mps.S</file> + <file>mpsboot.asm</file> + <file>mpsirql.c</file> + <file>processor_mp.c</file> + <file>spinlock.c</file> + <file>halmp.rc</file> + </directory> + </module> +</group>
Propchange: trunk/reactos/hal/halx86/halmp.rbuild ------------------------------------------------------------------------------ svn:eol-style = native
Added: trunk/reactos/hal/halx86/halup.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/halup.rbuild?rev... ============================================================================== --- trunk/reactos/hal/halx86/halup.rbuild (added) +++ trunk/reactos/hal/halx86/halup.rbuild [iso-8859-1] Sat May 24 15:32:44 2008 @@ -1,0 +1,20 @@ +<?xml version="1.0"?> +<!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd"> +<group xmlns:xi="http://www.w3.org/2001/XInclude"> + <module name="halup" type="kernelmodedll" entrypoint="0"> + <importlibrary base="hal" definition="hal_i386.def" /> + <bootstrap installbase="$(CDOUTPUT)" nameoncd="hal.dll" /> + <include>include</include> + <include base="ntoskrnl">include</include> + <define name="_DISABLE_TIDENTS" /> + <define name="_NTHAL_" /> + <library>hal_generic</library> + <library>hal_generic_up</library> + <library>hal_generic_pc</library> + <library>ntoskrnl</library> + <directory name="up"> + <file>halinit_up.c</file> + <file>halup.rc</file> + </directory> + </module> +</group>
Propchange: trunk/reactos/hal/halx86/halup.rbuild ------------------------------------------------------------------------------ svn:eol-style = native
Added: trunk/reactos/hal/halx86/halxbox.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/halxbox.rbuild?r... ============================================================================== --- trunk/reactos/hal/halx86/halxbox.rbuild (added) +++ trunk/reactos/hal/halx86/halxbox.rbuild [iso-8859-1] Sat May 24 15:32:44 2008 @@ -1,0 +1,24 @@ +<?xml version="1.0"?> +<!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd"> +<group xmlns:xi="http://www.w3.org/2001/XInclude"> + <module name="halxbox" type="kernelmodedll" entrypoint="0" allowwarnings="true"> + <importlibrary base="hal" definition="hal_i386.def" /> + <include>include</include> + <include base="ntoskrnl">include</include> + <define name="_DISABLE_TIDENTS" /> + <define name="_NTHAL_" /> + <define name="SARCH_XBOX" /> + <library>hal_generic</library> + <library>hal_generic_up</library> + <library>ntoskrnl</library> + <directory name="generic"> + <file>pci.c</file> + </directory> + <directory name="xbox"> + <file>halinit_xbox.c</file> + <file>part_xbox.c</file> + <file>halxbox.rc</file> + <pch>halxbox.h</pch> + </directory> + </module> +</group>
Propchange: trunk/reactos/hal/halx86/halxbox.rbuild ------------------------------------------------------------------------------ svn:eol-style = native
-
mpiulachs＠svn.reactos.org