Move generic part of ReactOS-$(ARCH).rbuild to ReactOS-generic.rbuild
authorHervé Poussineau <hpoussin@reactos.org>
Wed, 22 Aug 2007 15:06:43 +0000 (15:06 +0000)
committerHervé Poussineau <hpoussin@reactos.org>
Wed, 22 Aug 2007 15:06:43 +0000 (15:06 +0000)
svn path=/trunk/; revision=28453

reactos/ReactOS-generic.rbuild [new file with mode: 0644]
reactos/ReactOS-i386.rbuild
reactos/ReactOS-ppc.rbuild

diff --git a/reactos/ReactOS-generic.rbuild b/reactos/ReactOS-generic.rbuild
new file mode 100644 (file)
index 0000000..e0308b9
--- /dev/null
@@ -0,0 +1,68 @@
+<?xml version="1.0"?>
+<!DOCTYPE project SYSTEM "tools/rbuild/project.dtd">
+<project name="ReactOS" xmlns:xi="http://www.w3.org/2001/XInclude">
+  <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>
+
+  <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>
+
+</project>
index cfc121f..2fbd0df 100644 (file)
@@ -7,24 +7,11 @@
     </xi:fallback>
   </xi:include>
 
-  <xi:include href="baseaddress.rbuild" />
+  <xi:include href="ReactOS-generic.rbuild" />
 
   <define name="_M_IX86" />
   <define name="_X86_" />
   <define name="__i386__" />
-  <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>
 
   <if property="GDB" value="0">
     <if property="OPTIMIZE" value="1">
   <compilerflag>-Wpointer-arith</compilerflag>
   <linkerflag>-enable-stdcall-fixup</linkerflag>
 
-  <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>
-
 </project>
index 418405a..26891ad 100644 (file)
@@ -7,7 +7,7 @@
     </xi:fallback>
   </xi:include>
 
-  <xi:include href="baseaddress.rbuild" />
+  <xi:include href="ReactOS-generic.rbuild" />
 
   <property name="BOOTPROG_PREPARE" value="ppc-le2be" />
   <property name="BOOTPROG_FLATFORMAT" value="-O elf32-powerpc -B powerpc:common" />
@@ -17,7 +17,6 @@
   <define name="_M_PPC" />
   <define name="_PPC_" />
   <define name="__PowerPC__" />
-  <define name="_REACTOS_" />
   <define name="__MINGW_IMPORT" empty="true" />
   <define name="stdcall" empty="true" />       
   <define name="__stdcall__" empty="true" />
   <define name="__cdecl__" empty="true" />
   <define name="dllimport" empty="true" />
   <compilerflag>-v</compilerflag>
-  <if property="MP" value="1">
-    <define name="CONFIG_SMP" value="1" />
-  </if>
-  <if property="DBG" value="1">
-    <define name="DBG" value="1" />
-    <property name="DBG_OR_KDBG" value="true" />
-  </if>
-  <if property="DBG" value="0">
-    <compilerflag>-Os</compilerflag>
-    <compilerflag>-Wno-strict-aliasing</compilerflag>
-  </if>
-  <if property="KDBG" value="1">
-    <define name="KDBG" value="1" />
-    <property name="DBG_OR_KDBG" value="true" />
-  </if>
   <compilerflag>-Wpointer-arith</compilerflag>
 
-  <include>.</include>
-  <include>include</include>
-  <include>include/reactos</include>
-  <include>include/libs</include>
-  <include>include/drivers</include>
-  <include>include/subsys</include>
-  <include>include/ndk</include>
-  <include>include</include>
-  <include>include/crt</include>
-  <include>include/ddk</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="regtests">
-    <xi:include href="regtests/directory.rbuild" />
-  </directory>  
-  <directory name="subsystems">
-    <xi:include href="subsystems/subsystems.rbuild" />
-  </directory>
-
 </project>