[ros-diffs] [tkreuzer] 44827: [HAL] - Raname each architecture's default hal (halup) to "hal" (Windows does that, too) and get rid of the duplicated stub hal.

Author: tkreuzer
Date: Thu Dec 31 16:19:17 2009
New Revision: 44827

URL: http://svn.reactos.org/svn/reactos?rev=44827&view=rev
Log:
[HAL]
- Raname each architecture's default hal (halup) to "hal" (Windows does
that, too) and get rid of the duplicated stub hal.

Added:
    branches/ros-amd64-bringup/reactos/hal/hal.pspec
      - copied unchanged from r44816,
branches/ros-amd64-bringup/reactos/hal/hal/hal.pspec
    branches/ros-amd64-bringup/reactos/hal/halamd64/hal_amd64.def
      - copied unchanged from r44816,
branches/ros-amd64-bringup/reactos/hal/hal/hal_amd64.def
Removed:
    branches/ros-amd64-bringup/reactos/hal/hal/
Modified:
    branches/ros-amd64-bringup/reactos/hal/hal.rbuild
    branches/ros-amd64-bringup/reactos/hal/halamd64/up/halup.rbuild
    branches/ros-amd64-bringup/reactos/hal/halarm/up/halup.rbuild
    branches/ros-amd64-bringup/reactos/hal/halppc/up/halup.rbuild
    branches/ros-amd64-bringup/reactos/hal/halx86/halmp.rbuild
    branches/ros-amd64-bringup/reactos/hal/halx86/halup.rbuild
    branches/ros-amd64-bringup/reactos/hal/halx86/halxbox.rbuild

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] Thu Dec 31 16:19:17
2009
@@ -1,9 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE group SYSTEM "../tools/rbuild/project.dtd">
 <group xmlns:xi="http://www.w3.org/2001/XInclude">
-	<directory name="hal">
-		<xi:include href="hal/hal.rbuild" />
-	</directory>
 	<if property="ARCH" value="i386">
 		<directory name="halx86">
 			<xi:include href="halx86/hal_generic.rbuild" />

Modified: branches/ros-amd64-bringup/reactos/hal/halamd64/up/halup.rbuild
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h…
==============================================================================
--- branches/ros-amd64-bringup/reactos/hal/halamd64/up/halup.rbuild [iso-8859-1]
(original)
+++ branches/ros-amd64-bringup/reactos/hal/halamd64/up/halup.rbuild [iso-8859-1] Thu Dec
31 16:19:17 2009
@@ -1,9 +1,9 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
-<module name="halup" type="kernelmodedll"
installbase="system32" installname="hal.dll">
-	<importlibrary base="hal" definition="hal_amd64.def" />
+<module name="hal" type="kernelmodedll"
installbase="system32" installname="hal.dll">
+	<importlibrary base="hal" definition="../hal_amd64.def" />
 	<bootstrap installbase="$(CDOUTPUT)" nameoncd="hal.dll" />
-	<include base="halup">../include</include>
+	<include base="hal">../include</include>
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
 	<define name="_NTHAL_" />

Modified: branches/ros-amd64-bringup/reactos/hal/halarm/up/halup.rbuild
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h…
==============================================================================
--- branches/ros-amd64-bringup/reactos/hal/halarm/up/halup.rbuild [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/hal/halarm/up/halup.rbuild [iso-8859-1] Thu Dec 31
16:19:17 2009
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
-<module name="halarm_up" type="kernelmodedll"
installbase="system32" installname="hal.dll">
-	<importlibrary base="hal" definition="hal.pspec" />
+<module name="hal" type="kernelmodedll"
installbase="system32" installname="hal.dll">
+	<importlibrary base="hal" definition="../../hal.pspec" />
 	<bootstrap installbase="$(CDOUTPUT)" nameoncd="hal.dll" />
 	<include base="halarm_generic">../include</include>
 	<include base="ntoskrnl">include</include>

Modified: branches/ros-amd64-bringup/reactos/hal/halppc/up/halup.rbuild
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h…
==============================================================================
--- branches/ros-amd64-bringup/reactos/hal/halppc/up/halup.rbuild [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/hal/halppc/up/halup.rbuild [iso-8859-1] Thu Dec 31
16:19:17 2009
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
-<module name="halppc_up" type="kernelmodedll">
-	<importlibrary definition="../../hal/hal.def" />
+<module name="hal" type="kernelmodedll">
+	<importlibrary definition="../../hal/hal.pspec" />
 	<bootstrap installbase="$(CDOUTPUT)" nameoncd="hal.dll" />
 	<include base="halppc_generic">../include</include>
 	<include base="ntoskrnl">include</include>

Modified: branches/ros-amd64-bringup/reactos/hal/halx86/halmp.rbuild
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h…
==============================================================================
--- branches/ros-amd64-bringup/reactos/hal/halx86/halmp.rbuild [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/hal/halx86/halmp.rbuild [iso-8859-1] Thu Dec 31
16:19:17 2009
@@ -2,7 +2,7 @@
 <!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.pspec" />
+		<importlibrary base="hal" definition="../hal.pspec" />
 		<bootstrap installbase="$(CDOUTPUT)" />
 		<include>include</include>
 		<include base="ntoskrnl">include</include>

Modified: branches/ros-amd64-bringup/reactos/hal/halx86/halup.rbuild
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h…
==============================================================================
--- branches/ros-amd64-bringup/reactos/hal/halx86/halup.rbuild [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/hal/halx86/halup.rbuild [iso-8859-1] Thu Dec 31
16:19:17 2009
@@ -1,8 +1,8 @@
 <?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" installbase="system32"
installname="hal.dll">
-		<importlibrary base="hal" definition="hal.pspec" />
+	<module name="hal" type="kernelmodedll" entrypoint="0"
installbase="system32" installname="hal.dll">
+		<importlibrary base="hal" definition="../hal.pspec" />
 		<bootstrap installbase="$(CDOUTPUT)" />
 		<include>include</include>
 		<include base="ntoskrnl">include</include>

Modified: branches/ros-amd64-bringup/reactos/hal/halx86/halxbox.rbuild
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h…
==============================================================================
--- branches/ros-amd64-bringup/reactos/hal/halx86/halxbox.rbuild [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/hal/halx86/halxbox.rbuild [iso-8859-1] Thu Dec 31
16:19:17 2009
@@ -2,7 +2,7 @@
 <!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd">
 <group xmlns:xi="http://www.w3.org/2001/XInclude">
 	<module name="halxbox" type="kernelmodedll"
entrypoint="0">
-		<importlibrary base="hal" definition="hal.pspec" />
+		<importlibrary base="hal" definition="../hal.pspec" />
 		<include>include</include>
 		<include base="ntoskrnl">include</include>
 		<define name="_NTHAL_" />