[sir_richard] 46649: [HAL]: Smarter .rbuild separation so that ACPI and PC/AT hal don't rebuild the generic library twice. Now generic stays generic, and generic_pcat/acpi are add-on libaries just like generic_up and generic_mp.
Author: sir_richard Date: Thu Apr 1 22:41:04 2010 New Revision: 46649
URL: http://svn.reactos.org/svn/reactos?rev=46649&view=rev Log: [HAL]: Smarter .rbuild separation so that ACPI and PC/AT hal don't rebuild the generic library twice. Now generic stays generic, and generic_pcat/acpi are add-on libaries just like generic_up and generic_mp.
Added: trunk/reactos/hal/halx86/hal_generic_acpi.rbuild (with props) trunk/reactos/hal/halx86/hal_generic_pcat.rbuild (with props) Modified: trunk/reactos/hal/halx86/directory.rbuild trunk/reactos/hal/halx86/hal.rbuild trunk/reactos/hal/halx86/halacpi.rbuild trunk/reactos/hal/halx86/halamd64.rbuild trunk/reactos/hal/halx86/halmps.rbuild trunk/reactos/hal/halx86/halxbox.rbuild
Modified: 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 [iso-8859-1] Thu Apr 1 22:41:04 2010 @@ -5,7 +5,9 @@ <xi:include href="hal_generic.rbuild" /> <xi:include href="hal_generic_up.rbuild" /> <xi:include href="hal_generic_mp.rbuild" /> - + <xi:include href="hal_generic_pcat.rbuild" /> + <xi:include href="hal_generic_acpi.rbuild" /> + <if property="ARCH" value="i386"> <xi:include href="hal.rbuild" /> <xi:include href="halacpi.rbuild" />
Modified: trunk/reactos/hal/halx86/hal.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/hal.rbuild?rev=4... ============================================================================== --- trunk/reactos/hal/halx86/hal.rbuild [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/hal.rbuild [iso-8859-1] Thu Apr 1 22:41:04 2010 @@ -8,7 +8,8 @@ <include base="ntoskrnl">include</include> <define name="_NTHALDLL_" /> <define name="_NTHAL_" /> - <library>hal_generic_legacy</library> + <library>hal_generic</library> + <library>hal_generic_pcat</library> <library>hal_generic_up</library> <library>ntoskrnl</library> <library>libcntpr</library>
Added: trunk/reactos/hal/halx86/hal_generic_acpi.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/hal_generic_acpi... ============================================================================== --- trunk/reactos/hal/halx86/hal_generic_acpi.rbuild (added) +++ trunk/reactos/hal/halx86/hal_generic_acpi.rbuild [iso-8859-1] Thu Apr 1 22:41:04 2010 @@ -1,0 +1,16 @@ +<?xml version="1.0"?> +<!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd"> +<group> + <module name="hal_generic_acpi" type="objectlibrary"> + <include>include</include> + <include base="ntoskrnl">include</include> + <define name="_NTHALDLL_" /> + <define name="_NTHAL_" /> + <directory name="generic"> + <directory name="acpi"> + <file>halacpi.c</file> + <file>halpnpdd.c</file> + </directory> + </directory> + </module> +</group>
Propchange: trunk/reactos/hal/halx86/hal_generic_acpi.rbuild ------------------------------------------------------------------------------ svn:eol-style = native
Added: trunk/reactos/hal/halx86/hal_generic_pcat.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/hal_generic_pcat... ============================================================================== --- trunk/reactos/hal/halx86/hal_generic_pcat.rbuild (added) +++ trunk/reactos/hal/halx86/hal_generic_pcat.rbuild [iso-8859-1] Thu Apr 1 22:41:04 2010 @@ -1,0 +1,15 @@ +<?xml version="1.0"?> +<!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd"> +<group> + <module name="hal_generic_pcat" type="objectlibrary"> + <include>include</include> + <include base="ntoskrnl">include</include> + <define name="_NTHALDLL_" /> + <define name="_NTHAL_" /> + <directory name="generic"> + <directory name="legacy"> + <file>halpcat.c</file> + </directory> + </directory> + </module> +</group>
Propchange: trunk/reactos/hal/halx86/hal_generic_pcat.rbuild ------------------------------------------------------------------------------ svn:eol-style = native
Modified: trunk/reactos/hal/halx86/halacpi.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/halacpi.rbuild?r... ============================================================================== --- trunk/reactos/hal/halx86/halacpi.rbuild [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/halacpi.rbuild [iso-8859-1] Thu Apr 1 22:41:04 2010 @@ -8,6 +8,7 @@ <include base="ntoskrnl">include</include> <define name="_NTHALDLL_" /> <define name="_NTHAL_" /> + <library>hal_generic</library> <library>hal_generic_acpi</library> <library>hal_generic_up</library> <library>ntoskrnl</library>
Modified: trunk/reactos/hal/halx86/halamd64.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/halamd64.rbuild?... ============================================================================== --- trunk/reactos/hal/halx86/halamd64.rbuild [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/halamd64.rbuild [iso-8859-1] Thu Apr 1 22:41:04 2010 @@ -10,6 +10,7 @@ <define name="_DISABLE_TIDENTS" /> <define name="_NTHAL_" /> <define name="_X86BIOS_" /> + <library>hal_generic</library> <library>hal_generic_acpi</library> <library>hal_generic_up</library> <library>ntoskrnl</library>
Modified: trunk/reactos/hal/halx86/halmps.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/halmps.rbuild?re... ============================================================================== --- trunk/reactos/hal/halx86/halmps.rbuild [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/halmps.rbuild [iso-8859-1] Thu Apr 1 22:41:04 2010 @@ -9,7 +9,8 @@ <define name="CONFIG_SMP" /> <define name="_NTHALDLL_" /> <define name="_NTHAL_" /> - <library>hal_generic_legacy</library> + <library>hal_generic</library> + <library>hal_generic_pcat</library> <library>hal_generic_mp</library> <library>ntoskrnl</library> <library>libcntpr</library>
Modified: 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 [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/halxbox.rbuild [iso-8859-1] Thu Apr 1 22:41:04 2010 @@ -8,7 +8,8 @@ <define name="_NTHALDLL_" /> <define name="_NTHAL_" /> <define name="SARCH_XBOX" /> - <library>hal_generic_legacy</library> + <library>hal_generic</library> + <library>hal_generic_pcat</library> <library>hal_generic_up</library> <library>ntoskrnl</library> <library>libcntpr</library>
-
sir_richard＠svn.reactos.org