15 Sep
2007
15 Sep
'07
3:20 p.m.
Author: cfinck
Date: Sat Sep 15 19:20:31 2007
New Revision: 29060
URL: http://svn.reactos.org/svn/reactos?rev=29060&view=rev
Log:
[FORMATTING]
- Use TABs instead of spaces in some more .rbuild files
- No code changes
Modified:
trunk/reactos/ReactOS-generic.rbuild
trunk/reactos/ReactOS-i386.rbuild
trunk/reactos/ReactOS-ppc.rbuild
trunk/reactos/base/base.rbuild
trunk/reactos/config-ppc.template.rbuild
trunk/reactos/config.template.rbuild
Modified: trunk/reactos/ReactOS-generic.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS-generic.rbuild?rev…
==============================================================================
--- trunk/reactos/ReactOS-generic.rbuild (original)
+++ trunk/reactos/ReactOS-generic.rbuild Sat Sep 15 19:20:31 2007
@@ -1,68 +1,68 @@
<?xml version="1.0"?>
<!DOCTYPE group SYSTEM "tools/rbuild/project.dtd">
<group xmlns:xi="http://www.w3.org/2001/XInclude">
- <xi:include href="baseaddress.rbuild" />
+ <xi:include href="baseaddress.rbuild" />
- <define name="_REACTOS_" />
- <if property="MP" value="1">
- <define name="CONFIG_SMP" value="1" />
- </if>
- <if property="DBG" value="1">
- <define name="DBG" value="1" />
- <define name="_SEH_ENABLE_TRACE" />
- <property name="DBG_OR_KDBG" value="true" />
- </if>
- <if property="KDBG" value="1">
- <define name="KDBG" value="1" />
- <property name="DBG_OR_KDBG" value="true" />
- </if>
+ <define name="_REACTOS_" />
+ <if property="MP" value="1">
+ <define name="CONFIG_SMP" value="1" />
+ </if>
+ <if property="DBG" value="1">
+ <define name="DBG" value="1" />
+ <define name="_SEH_ENABLE_TRACE" />
+ <property name="DBG_OR_KDBG" value="true" />
+ </if>
+ <if property="KDBG" value="1">
+ <define name="KDBG" value="1" />
+ <property name="DBG_OR_KDBG" value="true" />
+ </if>
- <include>.</include>
- <include>include</include>
- <include root="intermediate">include</include>
- <include>include/psdk</include>
- <include root="intermediate">include/psdk</include>
- <include>include/dxsdk</include>
- <include>include/crt</include>
- <include>include/ddk</include>
- <include>include/GL</include>
- <include>include/ndk</include>
- <include>include/reactos</include>
- <include root="intermediate">include/reactos</include>
- <include>include/reactos/libs</include>
+ <include>.</include>
+ <include>include</include>
+ <include root="intermediate">include</include>
+ <include>include/psdk</include>
+ <include root="intermediate">include/psdk</include>
+ <include>include/dxsdk</include>
+ <include>include/crt</include>
+ <include>include/ddk</include>
+ <include>include/GL</include>
+ <include>include/ndk</include>
+ <include>include/reactos</include>
+ <include root="intermediate">include/reactos</include>
+ <include>include/reactos/libs</include>
- <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" />
- </directory>
- <directory name="hal">
- <xi:include href="hal/hal.rbuild" />
- </directory>
- <directory name="include">
- <xi:include href="include/directory.rbuild" />
- </directory>
- <directory name="lib">
- <xi:include href="lib/lib.rbuild" />
- </directory>
- <directory name="media">
- <xi:include href="media/media.rbuild" />
- </directory>
- <directory name="modules">
- <xi:include href="modules/directory.rbuild" />
- </directory>
- <directory name="ntoskrnl">
- <xi:include href="ntoskrnl/ntoskrnl.rbuild" />
- </directory>
- <directory name="subsystems">
- <xi:include href="subsystems/subsystems.rbuild" />
- </directory>
+ <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" />
+ </directory>
+ <directory name="hal">
+ <xi:include href="hal/hal.rbuild" />
+ </directory>
+ <directory name="include">
+ <xi:include href="include/directory.rbuild" />
+ </directory>
+ <directory name="lib">
+ <xi:include href="lib/lib.rbuild" />
+ </directory>
+ <directory name="media">
+ <xi:include href="media/media.rbuild" />
+ </directory>
+ <directory name="modules">
+ <xi:include href="modules/directory.rbuild" />
+ </directory>
+ <directory name="ntoskrnl">
+ <xi:include href="ntoskrnl/ntoskrnl.rbuild" />
+ </directory>
+ <directory name="subsystems">
+ <xi:include href="subsystems/subsystems.rbuild" />
+ </directory>
</group>
Modified: trunk/reactos/ReactOS-i386.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS-i386.rbuild?rev=29…
==============================================================================
--- trunk/reactos/ReactOS-i386.rbuild (original)
+++ trunk/reactos/ReactOS-i386.rbuild Sat Sep 15 19:20:31 2007
@@ -1,45 +1,45 @@
<?xml version="1.0"?>
<!DOCTYPE project SYSTEM "tools/rbuild/project.dtd">
<project name="ReactOS" makefile="makefile.auto"
xmlns:xi="http://www.w3.org/2001/XInclude">
- <xi:include href="config.rbuild">
- <xi:fallback>
- <xi:include href="config.template.rbuild" />
- </xi:fallback>
- </xi:include>
+ <xi:include href="config.rbuild">
+ <xi:fallback>
+ <xi:include href="config.template.rbuild" />
+ </xi:fallback>
+ </xi:include>
- <xi:include href="ReactOS-generic.rbuild" />
+ <xi:include href="ReactOS-generic.rbuild" />
- <define name="_M_IX86" />
- <define name="_X86_" />
- <define name="__i386__" />
+ <define name="_M_IX86" />
+ <define name="_X86_" />
+ <define name="__i386__" />
- <if property="GDB" value="0">
- <if property="OPTIMIZE" value="1">
- <compilerflag>-Os</compilerflag>
- <compilerflag>-ftracer</compilerflag>
- <compilerflag>-momit-leaf-frame-pointer</compilerflag>
- <compilerflag>-mpreferred-stack-boundary=2</compilerflag>
- </if>
- <if property="OPTIMIZE" value="2">
- <compilerflag>-Os</compilerflag>
- <compilerflag>-mpreferred-stack-boundary=2</compilerflag>
- </if>
- <if property="OPTIMIZE" value="3">
- <compilerflag>-O1</compilerflag>
- <compilerflag>-mpreferred-stack-boundary=2</compilerflag>
- </if>
- <if property="OPTIMIZE" value="4">
- <compilerflag>-O2</compilerflag>
- <compilerflag>-mpreferred-stack-boundary=2</compilerflag>
- </if>
- <if property="OPTIMIZE" value="5">
- <compilerflag>-O3</compilerflag>
- <compilerflag>-mpreferred-stack-boundary=2</compilerflag>
- </if>
- </if>
+ <if property="GDB" value="0">
+ <if property="OPTIMIZE" value="1">
+ <compilerflag>-Os</compilerflag>
+ <compilerflag>-ftracer</compilerflag>
+ <compilerflag>-momit-leaf-frame-pointer</compilerflag>
+ <compilerflag>-mpreferred-stack-boundary=2</compilerflag>
+ </if>
+ <if property="OPTIMIZE" value="2">
+ <compilerflag>-Os</compilerflag>
+ <compilerflag>-mpreferred-stack-boundary=2</compilerflag>
+ </if>
+ <if property="OPTIMIZE" value="3">
+ <compilerflag>-O1</compilerflag>
+ <compilerflag>-mpreferred-stack-boundary=2</compilerflag>
+ </if>
+ <if property="OPTIMIZE" value="4">
+ <compilerflag>-O2</compilerflag>
+ <compilerflag>-mpreferred-stack-boundary=2</compilerflag>
+ </if>
+ <if property="OPTIMIZE" value="5">
+ <compilerflag>-O3</compilerflag>
+ <compilerflag>-mpreferred-stack-boundary=2</compilerflag>
+ </if>
+ </if>
- <compilerflag>-Wno-strict-aliasing</compilerflag>
- <compilerflag>-Wpointer-arith</compilerflag>
- <linkerflag>-enable-stdcall-fixup</linkerflag>
+ <compilerflag>-Wno-strict-aliasing</compilerflag>
+ <compilerflag>-Wpointer-arith</compilerflag>
+ <linkerflag>-enable-stdcall-fixup</linkerflag>
</project>
Modified: trunk/reactos/ReactOS-ppc.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS-ppc.rbuild?rev=290…
==============================================================================
--- trunk/reactos/ReactOS-ppc.rbuild (original)
+++ trunk/reactos/ReactOS-ppc.rbuild Sat Sep 15 19:20:31 2007
@@ -1,35 +1,35 @@
<?xml version="1.0"?>
<!DOCTYPE project SYSTEM "tools/rbuild/project.dtd">
<project name="ReactOS" makefile="makefile.ppc"
xmlns:xi="http://www.w3.org/2001/XInclude">
- <xi:include href="config-ppc.rbuild">
- <xi:fallback>
- <xi:include href="config-ppc.template.rbuild" />
- </xi:fallback>
- </xi:include>
+ <xi:include href="config-ppc.rbuild">
+ <xi:fallback>
+ <xi:include href="config-ppc.template.rbuild" />
+ </xi:fallback>
+ </xi:include>
- <xi:include href="ReactOS-generic.rbuild" />
+ <xi:include href="ReactOS-generic.rbuild" />
- <property name="OFWLDR_LINKFORMAT"
value="-L$(INTERMEDIATE)/lib/ppcmmu -lppcmmu_code -lppcmmu -nostdlib
-nostartfiles"/>
+ <property name="OFWLDR_LINKFORMAT" value="-L$(INTERMEDIATE)/lib/ppcmmu
-lppcmmu_code -lppcmmu -nostdlib -nostartfiles"/>
- <define name="_M_PPC" />
- <define name="_PPC_" />
- <define name="__PowerPC__" />
- <define name="_REACTOS_" />
- <define name="stdcall" empty="true" />
- <define name="__stdcall__" empty="true" />
- <define name="fastcall" empty="true" />
- <define name="cdecl" empty="true" />
- <define name="__cdecl__" empty="true" />
- <define name="dllimport" empty="true" />
- <define name="WORDS_BIGENDIAN" empty="true" />
- <define name="MB_CUR_MAX">1</define>
- <define name="_BSDTYPES_DEFINED"/>
- <compilerflag>-fshort-wchar</compilerflag>
- <compilerflag>-fsigned-char</compilerflag>
- <compilerflag>-mfull-toc</compilerflag>
- <compilerflag>-meabi</compilerflag>
- <compilerflag>-O2</compilerflag>
- <compilerflag>-Wno-strict-aliasing</compilerflag>
- <compilerflag>-Wno-trampolines</compilerflag>
+ <define name="_M_PPC" />
+ <define name="_PPC_" />
+ <define name="__PowerPC__" />
+ <define name="_REACTOS_" />
+ <define name="stdcall" empty="true" />
+ <define name="__stdcall__" empty="true" />
+ <define name="fastcall" empty="true" />
+ <define name="cdecl" empty="true" />
+ <define name="__cdecl__" empty="true" />
+ <define name="dllimport" empty="true" />
+ <define name="WORDS_BIGENDIAN" empty="true" />
+ <define name="MB_CUR_MAX">1</define>
+ <define name="_BSDTYPES_DEFINED"/>
+ <compilerflag>-fshort-wchar</compilerflag>
+ <compilerflag>-fsigned-char</compilerflag>
+ <compilerflag>-mfull-toc</compilerflag>
+ <compilerflag>-meabi</compilerflag>
+ <compilerflag>-O2</compilerflag>
+ <compilerflag>-Wno-strict-aliasing</compilerflag>
+ <compilerflag>-Wno-trampolines</compilerflag>
</project>
Modified: trunk/reactos/base/base.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/base.rbuild?rev=29060…
==============================================================================
--- trunk/reactos/base/base.rbuild (original)
+++ trunk/reactos/base/base.rbuild Sat Sep 15 19:20:31 2007
@@ -1,19 +1,19 @@
<?xml version="1.0"?>
<!DOCTYPE group SYSTEM "../tools/rbuild/project.dtd">
<group xmlns:xi="http://www.w3.org/2001/XInclude">
- <directory name="applications">
- <xi:include href="applications/applications.rbuild" />
- </directory>
- <directory name="services">
- <xi:include href="services/services.rbuild" />
- </directory>
- <directory name="setup">
- <xi:include href="setup/setup.rbuild" />
- </directory>
- <directory name="shell">
- <xi:include href="shell/shell.rbuild" />
- </directory>
- <directory name="system">
- <xi:include href="system/system.rbuild" />
- </directory>
+ <directory name="applications">
+ <xi:include href="applications/applications.rbuild" />
+ </directory>
+ <directory name="services">
+ <xi:include href="services/services.rbuild" />
+ </directory>
+ <directory name="setup">
+ <xi:include href="setup/setup.rbuild" />
+ </directory>
+ <directory name="shell">
+ <xi:include href="shell/shell.rbuild" />
+ </directory>
+ <directory name="system">
+ <xi:include href="system/system.rbuild" />
+ </directory>
</group>
Modified: trunk/reactos/config-ppc.template.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/config-ppc.template.rbuild…
==============================================================================
--- trunk/reactos/config-ppc.template.rbuild (original)
+++ trunk/reactos/config-ppc.template.rbuild Sat Sep 15 19:20:31 2007
@@ -3,57 +3,57 @@
<group>
<!--
- This file is a template used as a starting point for compile-time
- configuration of ReactOS. Make a copy of this file and name it config.rbuild.
- Then change the options in config.rbuild. If you don't have a config.rbuild file,
- then the defaults in this file, config.template.rbuild, will be used instead.
+ This file is a template used as a starting point for compile-time
+ configuration of ReactOS. Make a copy of this file and name it config.rbuild.
+ Then change the options in config.rbuild. If you don't have a config.rbuild file,
+ then the defaults in this file, config.template.rbuild, will be used instead.
- Boolean options can obtain the values 0 (disabled) or 1 (enabled). String
- options can obtain any value specified in the comment before it.
+ Boolean options can obtain the values 0 (disabled) or 1 (enabled). String
+ options can obtain any value specified in the comment before it.
-->
<!--
- Sub-architecture to build for. Specify one of:
- xbox
+ Sub-architecture to build for. Specify one of:
+ xbox
-->
<property name="SARCH" value="" />
<!--
- Which CPU ReactOS should be optimized for. Specify one of:
- i486, i586, pentium, pentium2, pentium3, pentium4, athlon-xp, athlon-mp,
- k6-2
+ Which CPU ReactOS should be optimized for. Specify one of:
+ i486, i586, pentium, pentium2, pentium3, pentium4, athlon-xp, athlon-mp,
+ k6-2
- See GCC manual for more CPU names and which CPUs GCC can optimize for.
+ See GCC manual for more CPU names and which CPUs GCC can optimize for.
-->
<property name="OARCH" value="" />
<!--
- Whether to compile for an uniprocessor or multiprocessor machine.
+ Whether to compile for an uniprocessor or multiprocessor machine.
-->
<property name="MP" value="0" />
<!--
- Whether to compile in the integrated kernel debugger.
+ Whether to compile in the integrated kernel debugger.
-->
<property name="KDBG" value="0" />
<!--
- Whether to compile for debugging. No compiler optimizations will be
- performed.
+ Whether to compile for debugging. No compiler optimizations will be
+ performed.
-->
<property name="DBG" value="1" />
<!--
- Whether to compile apps/libs with features covered software patents or not.
- If you live in a country where software patents are valid/apply, don't
- enable this (except they/you purchased a license from the patent owner).
- This settings is disabled (0) by default.
+ Whether to compile apps/libs with features covered software patents or not.
+ If you live in a country where software patents are valid/apply, don't
+ enable this (except they/you purchased a license from the patent owner).
+ This settings is disabled (0) by default.
-->
<property name="NSWPAT" value="0" />
Modified: trunk/reactos/config.template.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/config.template.rbuild?rev…
==============================================================================
--- trunk/reactos/config.template.rbuild (original)
+++ trunk/reactos/config.template.rbuild Sat Sep 15 19:20:31 2007
@@ -3,89 +3,89 @@
<group>
<!--
- This file is a template used as a starting point for compile-time
- configuration of ReactOS. Make a copy of this file and name it config.rbuild.
- Then change the options in config.rbuild. If you don't have a config.rbuild file,
- then the defaults in this file, config.template.rbuild, will be used instead.
+ This file is a template used as a starting point for compile-time
+ configuration of ReactOS. Make a copy of this file and name it config.rbuild.
+ Then change the options in config.rbuild. If you don't have a config.rbuild file,
+ then the defaults in this file, config.template.rbuild, will be used instead.
- Boolean options can obtain the values 0 (disabled) or 1 (enabled). String
- options can obtain any value specified in the comment before it.
+ Boolean options can obtain the values 0 (disabled) or 1 (enabled). String
+ options can obtain any value specified in the comment before it.
-->
<!--
- Sub-architecture to build for. Specify one of:
- xbox
+ Sub-architecture to build for. Specify one of:
+ xbox
-->
<property name="SARCH" value="" />
<!--
- Which CPU ReactOS should be optimized for. Specify one of:
- i486, i586, pentium, pentium2, pentium3, pentium4, athlon-xp, athlon-mp,
- k6-2
+ Which CPU ReactOS should be optimized for. Specify one of:
+ i486, i586, pentium, pentium2, pentium3, pentium4, athlon-xp, athlon-mp,
+ k6-2
- See GCC manual for more CPU names and which CPUs GCC can optimize for.
+ See GCC manual for more CPU names and which CPUs GCC can optimize for.
-->
<property name="OARCH" value="pentium" />
<!--
- OPTIMIZE what level do you want ReactOS to be optimized at
- this setting does not work if GDB is set
- 0 = off
- 1 = Normal compiling recommended, is default setting in official build and debug
build
-
- warning : 2,3,4,5 is not tested on ReactOS. Change at own risk.
+ OPTIMIZE what level do you want ReactOS to be optimized at
+ this setting does not work if GDB is set
+ 0 = off
+ 1 = Normal compiling recommended, is default setting in official build and debug build
+
+ warning : 2,3,4,5 is not tested on ReactOS. Change at own risk.
- 2 = gcc -Oz with -mpreferred-stack-boundary=2
- 3 = gcc -O1 with -mpreferred-stack-boundary=2
- 4 = gcc -O2 with -mpreferred-stack-boundary=2
- 5 = gcc -O3 with -mpreferred-stack-boundary=2
+ 2 = gcc -Oz with -mpreferred-stack-boundary=2
+ 3 = gcc -O1 with -mpreferred-stack-boundary=2
+ 4 = gcc -O2 with -mpreferred-stack-boundary=2
+ 5 = gcc -O3 with -mpreferred-stack-boundary=2
-->
<property name="OPTIMIZE" value="1" />
<!--
- Whether to compile for an uniprocessor or multiprocessor machine.
+ Whether to compile for an uniprocessor or multiprocessor machine.
-->
<property name="MP" value="0" />
<!--
- Whether to compile in the integrated kernel debugger.
+ Whether to compile in the integrated kernel debugger.
-->
<property name="KDBG" value="0" />
<!--
- Whether to compile for debugging. No compiler optimizations will be
- performed.
+ Whether to compile for debugging. No compiler optimizations will be
+ performed.
-->
<property name="DBG" value="1" />
<!--
- Whether to compile for debugging with GDB. If you don't use GDB, don't
- enable this.
+ Whether to compile for debugging with GDB. If you don't use GDB, don't
+ enable this.
-->
<property name="GDB" value="0" />
<!--
- Whether to compile apps/libs with features covered software patents or not.
- If you live in a country where software patents are valid/apply, don't
- enable this (except they/you purchased a license from the patent owner).
- This settings is disabled (0) by default.
+ Whether to compile apps/libs with features covered software patents or not.
+ If you live in a country where software patents are valid/apply, don't
+ enable this (except they/you purchased a license from the patent owner).
+ This settings is disabled (0) by default.
-->
<property name="NSWPAT" value="0" />
<!--
- Whether to compile with the KD protocol. This will disable support for KDBG
- as well as rossym and symbol lookups, and allow WinDBG to connect to ReactOS.
- This is currently not fully working, and requires kdcom from Windows 2003 or
- TinyKRNL. Booting into debug mode with this flag enabled will result in a
- failure to enter GUI mode. Do not enable unless you know what you're doing.
+ Whether to compile with the KD protocol. This will disable support for KDBG
+ as well as rossym and symbol lookups, and allow WinDBG to connect to ReactOS.
+ This is currently not fully working, and requires kdcom from Windows 2003 or
+ TinyKRNL. Booting into debug mode with this flag enabled will result in a
+ failure to enter GUI mode. Do not enable unless you know what you're doing.
-->
<property name="_WINKD_" value="0" />