Revert 45697:

"* Disable compiling usermode components for now."

svn path=/branches/header-work/; revision=46151

diff --git a/ReactOS-i386.rbuild b/ReactOS-i386.rbuild
index c2a720a..44e3511 100644 (file)
--- a/ReactOS-i386.rbuild
+++ b/ReactOS-i386.rbuild
@@ -37,18 +37,15 @@
                <linkerflag>-section-alignment=0x1000</linkerflag>
        </group>
 
                <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="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" />
        </directory>
        <directory name="drivers">
                <xi:include href="drivers/drivers.rbuild" />
        </directory>

diff --git a/config.template.rbuild b/config.template.rbuild
index c0d17e3..d8a1304 100644 (file)
--- a/config.template.rbuild
+++ b/config.template.rbuild
@@ -99,10 +99,4 @@
 -->
 <property name="BUILD_MP" value="1" />
 
 -->
 <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>
 </group>

diff --git a/drivers/wdm/audio/backpln/directory.rbuild b/drivers/wdm/audio/backpln/directory.rbuild
index 2db6e35..e65bc58 100644 (file)
--- a/drivers/wdm/audio/backpln/directory.rbuild
+++ b/drivers/wdm/audio/backpln/directory.rbuild
@@ -1,12 +1,9 @@
 <?xml version="1.0"?>
 <!DOCTYPE group SYSTEM "../../../../tools/rbuild/project.dtd">
 <group xmlns:xi="http://www.w3.org/2001/XInclude">
 <?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>
        <directory name="portcls">
                <xi:include href="portcls/portcls.rbuild" />
        </directory>

diff --git a/lib/3rdparty/3rdparty.rbuild b/lib/3rdparty/3rdparty.rbuild
index 28bbf8d..7f0c200 100644 (file)
--- a/lib/3rdparty/3rdparty.rbuild
+++ b/lib/3rdparty/3rdparty.rbuild
@@ -7,13 +7,9 @@
        <directory name="bzip2">
                <xi:include href="bzip2/bzip2.rbuild" />
        </directory>
        <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>
        <directory name="expat">
                <xi:include href="expat/expat.rbuild" />
        </directory>

diff --git a/lib/3rdparty/mingw/mingw.rbuild b/lib/3rdparty/mingw/mingw.rbuild
index 1807208..0e87ee7 100644 (file)
--- a/lib/3rdparty/mingw/mingw.rbuild
+++ b/lib/3rdparty/mingw/mingw.rbuild
@@ -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>
 <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>
        <file>_newmode.c</file>
        <file>atonexit.c</file>
        <file>charmax.c</file>

diff --git a/lib/tdilib/tdilib.rbuild b/lib/tdilib/tdilib.rbuild
index 355073b..ec06f02 100644 (file)
--- a/lib/tdilib/tdilib.rbuild
+++ b/lib/tdilib/tdilib.rbuild
@@ -1,11 +1,9 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../tools/rbuild/project.dtd">
 <?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>
\ No newline at end of file
+<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>

diff --git a/subsystems/subsystems.rbuild b/subsystems/subsystems.rbuild
index 87042d7..49a9029 100644 (file)
--- a/subsystems/subsystems.rbuild
+++ b/subsystems/subsystems.rbuild
@@ -1,11 +1,9 @@
 <?xml version="1.0"?>
 <!DOCTYPE group SYSTEM "../tools/rbuild/project.dtd">
 <group xmlns:xi="http://www.w3.org/2001/XInclude">
 <?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>
 <directory name="win32">
        <xi:include href="win32/win32.rbuild" />
 </directory>

diff --git a/subsystems/win32/win32.rbuild b/subsystems/win32/win32.rbuild
index 50546eb..7dc498f 100644 (file)
--- a/subsystems/win32/win32.rbuild
+++ b/subsystems/win32/win32.rbuild
@@ -1,11 +1,9 @@
 <?xml version="1.0"?>
 <!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd">
 <group xmlns:xi="http://www.w3.org/2001/XInclude">
 <?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>
 <directory name="win32k">
        <xi:include href="win32k/win32k.rbuild" />
 </directory>