Author: cfinck Date: Tue Dec 2 05:38:23 2008 New Revision: 37808
URL: http://svn.reactos.org/svn/reactos?rev=37808&view=rev Log: KDBG needs DBG to be set, I can't imagine any useful situation for KDBG without DBG. Change the <if> logic in ReactOS-general.rbuild (and ReactOS-arm.rbuild for the ARM guys) accordingly. This also supersedes DBG_OR_KDBG, which never worked properly for Release builds anyway.
Should fix the Release build without touching rbuild itself :-)
Modified: trunk/reactos/ReactOS-arm.rbuild trunk/reactos/ReactOS-generic.rbuild trunk/reactos/config.template.rbuild trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild
Modified: trunk/reactos/ReactOS-arm.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS-arm.rbuild?rev=3780... ============================================================================== --- trunk/reactos/ReactOS-arm.rbuild [iso-8859-1] (original) +++ trunk/reactos/ReactOS-arm.rbuild [iso-8859-1] Tue Dec 2 05:38:23 2008 @@ -17,11 +17,10 @@ <if property="DBG" value="1"> <define name="DBG">1</define> <define name="_SEH_ENABLE_TRACE" /> - <property name="DBG_OR_KDBG" value="true" /> - </if> - <if property="KDBG" value="1"> - <define name="KDBG">1</define> - <property name="DBG_OR_KDBG" value="true" /> + + <if property="KDBG" value="1"> + <define name="KDBG">1</define> + </if> </if> <include>.</include>
Modified: trunk/reactos/ReactOS-generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS-generic.rbuild?rev=... ============================================================================== --- trunk/reactos/ReactOS-generic.rbuild [iso-8859-1] (original) +++ trunk/reactos/ReactOS-generic.rbuild [iso-8859-1] Tue Dec 2 05:38:23 2008 @@ -9,11 +9,10 @@ <if property="DBG" value="1"> <define name="DBG">1</define> <define name="_SEH_ENABLE_TRACE" /> - <property name="DBG_OR_KDBG" value="true" /> - </if> - <if property="KDBG" value="1"> - <define name="KDBG">1</define> - <property name="DBG_OR_KDBG" value="true" /> + + <if property="KDBG" value="1"> + <define name="KDBG">1</define> + </if> </if>
<!-- The version target valid values are: Nt4 , NT5 , NT51 -->
Modified: trunk/reactos/config.template.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/config.template.rbuild?rev=... ============================================================================== --- trunk/reactos/config.template.rbuild [iso-8859-1] (original) +++ trunk/reactos/config.template.rbuild [iso-8859-1] Tue Dec 2 05:38:23 2008 @@ -43,7 +43,7 @@
<!-- - Whether to compile in the integrated kernel debugger. + Whether to compile in the integrated kernel debugger. Requires DBG to be set. --> <property name="KDBG" value="1" />
Modified: trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl-generic.r... ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] Tue Dec 2 05:38:23 2008 @@ -302,7 +302,7 @@ <file>kdb_keyboard.c</file> <file>kdb_serial.c</file> </if> - <if property="DBG_OR_KDBG" value="true"> + <if property="DBG" value="1"> <file>kdb_symbols.c</file> </if> </directory>