[ros-diffs] [tkreuzer] 46151: Revert 45697: "* Disable compiling usermode components for now."

Author: tkreuzer
Date: Fri Mar 12 22:28:06 2010
New Revision: 46151

URL: http://svn.reactos.org/svn/reactos?rev=46151&view=rev
Log:
Revert 45697:
"* Disable compiling usermode components for now."

Modified:
    branches/header-work/ReactOS-i386.rbuild
    branches/header-work/config.template.rbuild
    branches/header-work/drivers/wdm/audio/backpln/directory.rbuild
    branches/header-work/lib/3rdparty/3rdparty.rbuild
    branches/header-work/lib/3rdparty/mingw/mingw.rbuild
    branches/header-work/lib/tdilib/tdilib.rbuild
    branches/header-work/subsystems/subsystems.rbuild
    branches/header-work/subsystems/win32/win32.rbuild

Modified: branches/header-work/ReactOS-i386.rbuild
URL:
http://svn.reactos.org/svn/reactos/branches/header-work/ReactOS-i386.rbuild…
==============================================================================
--- branches/header-work/ReactOS-i386.rbuild [iso-8859-1] (original)
+++ branches/header-work/ReactOS-i386.rbuild [iso-8859-1] Fri Mar 12 22:28:06 2010
@@ -37,17 +37,14 @@
 		<linkerflag>-section-alignment=0x1000</linkerflag>
 	</group>
 
-	<if property="USERMODE" value="1">
-		<directory name="base">
-			<xi:include href="base/base.rbuild" />
-		</directory>
-		<directory name="dll">
-			<xi:include href="dll/dll.rbuild" />
-		</directory>
-	</if>
-
+	<directory name="base">
+		<xi:include href="base/base.rbuild" />
+	</directory>
 	<directory name="boot">
 		<xi:include href="boot/boot.rbuild" />
+	</directory>
+	<directory name="dll">
+		<xi:include href="dll/dll.rbuild" />
 	</directory>
 	<directory name="drivers">
 		<xi:include href="drivers/drivers.rbuild" />

Modified: branches/header-work/config.template.rbuild
URL:
http://svn.reactos.org/svn/reactos/branches/header-work/config.template.rbu…
==============================================================================
--- branches/header-work/config.template.rbuild [iso-8859-1] (original)
+++ branches/header-work/config.template.rbuild [iso-8859-1] Fri Mar 12 22:28:06 2010
@@ -99,10 +99,4 @@
 -->
 <property name="BUILD_MP" value="1" />
 
-<!--
-	Whether to compile any usermode parts. This is while kernel mode is under
-	heavy development and usermode part not relevant for bootcd.
--->
-<property name="USERMODE" value="0" />
-
 </group>

Modified: branches/header-work/drivers/wdm/audio/backpln/directory.rbuild
URL:
http://svn.reactos.org/svn/reactos/branches/header-work/drivers/wdm/audio/b…
==============================================================================
--- branches/header-work/drivers/wdm/audio/backpln/directory.rbuild [iso-8859-1]
(original)
+++ branches/header-work/drivers/wdm/audio/backpln/directory.rbuild [iso-8859-1] Fri Mar
12 22:28:06 2010
@@ -1,12 +1,9 @@
 <?xml version="1.0"?>
 <!DOCTYPE group SYSTEM "../../../../tools/rbuild/project.dtd">
 <group xmlns:xi="http://www.w3.org/2001/XInclude">
-
-	<if property="USERMODE" value="1">
-		<directory name="audio_test">
-			<xi:include href="audio_test/audio_test.rbuild" />
-		</directory>
-	</if>
+	<directory name="audio_test">
+		<xi:include href="audio_test/audio_test.rbuild" />
+	</directory>
 	<directory name="portcls">
 		<xi:include href="portcls/portcls.rbuild" />
 	</directory>

Modified: branches/header-work/lib/3rdparty/3rdparty.rbuild
URL:
http://svn.reactos.org/svn/reactos/branches/header-work/lib/3rdparty/3rdpar…
==============================================================================
--- branches/header-work/lib/3rdparty/3rdparty.rbuild [iso-8859-1] (original)
+++ branches/header-work/lib/3rdparty/3rdparty.rbuild [iso-8859-1] Fri Mar 12 22:28:06
2010
@@ -7,13 +7,9 @@
 	<directory name="bzip2">
 		<xi:include href="bzip2/bzip2.rbuild" />
 	</directory>
-
-	<if property="USERMODE" value="1">
-		<directory name="cardlib">
-			<xi:include href="cardlib/cardlib.rbuild" />
-		</directory>
-	</if>
-
+	<directory name="cardlib">
+		<xi:include href="cardlib/cardlib.rbuild" />
+	</directory>
 	<directory name="expat">
 		<xi:include href="expat/expat.rbuild" />
 	</directory>

Modified: branches/header-work/lib/3rdparty/mingw/mingw.rbuild
URL:
http://svn.reactos.org/svn/reactos/branches/header-work/lib/3rdparty/mingw/…
==============================================================================
--- branches/header-work/lib/3rdparty/mingw/mingw.rbuild [iso-8859-1] (original)
+++ branches/header-work/lib/3rdparty/mingw/mingw.rbuild [iso-8859-1] Fri Mar 12 22:28:06
2010
@@ -4,9 +4,7 @@
 <module name="mingw_common" type="staticlibrary"
isstartuplib="true" crt="dll">
 	<define name="_CRTBLD" />
 	<include base="ReactOS">include/reactos/mingw-w64</include>
-	<if property="USERMODE" value="1">
-		<library>kernel32</library>
-	</if>
+	<library>kernel32</library>
 	<file>_newmode.c</file>
 	<file>atonexit.c</file>
 	<file>charmax.c</file>

Modified: branches/header-work/lib/tdilib/tdilib.rbuild
URL:
http://svn.reactos.org/svn/reactos/branches/header-work/lib/tdilib/tdilib.r…
==============================================================================
--- branches/header-work/lib/tdilib/tdilib.rbuild [iso-8859-1] (original)
+++ branches/header-work/lib/tdilib/tdilib.rbuild [iso-8859-1] Fri Mar 12 22:28:06 2010
@@ -1,11 +1,9 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../tools/rbuild/project.dtd">
-<if property="USERMODE" value="1">
-	<module name="tdilib" type="staticlibrary">
-		<include base="iphlpapi">.</include>
-		<include base="tdilib">.</include>
-		<library>ntdll</library>
-		<file>enum.c</file>
-		<file>handle.c</file>
-	</module>
-</if>
+<module name="tdilib" type="staticlibrary">
+	<include base="iphlpapi">.</include>
+	<include base="tdilib">.</include>
+	<library>ntdll</library>
+	<file>enum.c</file>
+	<file>handle.c</file>
+</module>

Modified: branches/header-work/subsystems/subsystems.rbuild
URL:
http://svn.reactos.org/svn/reactos/branches/header-work/subsystems/subsyste…
==============================================================================
--- branches/header-work/subsystems/subsystems.rbuild [iso-8859-1] (original)
+++ branches/header-work/subsystems/subsystems.rbuild [iso-8859-1] Fri Mar 12 22:28:06
2010
@@ -1,11 +1,9 @@
 <?xml version="1.0"?>
 <!DOCTYPE group SYSTEM "../tools/rbuild/project.dtd">
 <group xmlns:xi="http://www.w3.org/2001/XInclude">
-<if property="USERMODE" value="1">
-	<directory name="ntvdm">
-		<xi:include href="ntvdm/ntvdm.rbuild" />
-	</directory>
-</if>
+<directory name="ntvdm">
+	<xi:include href="ntvdm/ntvdm.rbuild" />
+</directory>
 <directory name="win32">
 	<xi:include href="win32/win32.rbuild" />
 </directory>

Modified: branches/header-work/subsystems/win32/win32.rbuild
URL:
http://svn.reactos.org/svn/reactos/branches/header-work/subsystems/win32/wi…
==============================================================================
--- branches/header-work/subsystems/win32/win32.rbuild [iso-8859-1] (original)
+++ branches/header-work/subsystems/win32/win32.rbuild [iso-8859-1] Fri Mar 12 22:28:06
2010
@@ -1,11 +1,9 @@
 <?xml version="1.0"?>
 <!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd">
 <group xmlns:xi="http://www.w3.org/2001/XInclude">
-<if property="USERMODE" value="1">
-	<directory name="csrss">
-		<xi:include href="csrss/csrss.rbuild" />
-	</directory>
-</if>
+<directory name="csrss">
+	<xi:include href="csrss/csrss.rbuild" />
+</directory>
 <directory name="win32k">
 	<xi:include href="win32k/win32k.rbuild" />
 </directory>