[ros-diffs] [ros-arm-bringup] 41864: Too many things in -i386 were still "generic" and had to be duplicated accross plat-specific rbuild files, so moved a whole bunch of them into the generic rbuild. Ironically, the one thing that isn't generic -- which files get built -- was in the generic file, blocking the arm rbuild from ever being able to use it, so I split this out now. Cleaned up the i386 and arm rbuild files to use the new generic rbuild. Brought the arm rbuild file up to spec to use the new compile

Author: ros-arm-bringup
Date: Sat Jul 11 15:47:21 2009
New Revision: 41864

URL: http://svn.reactos.org/svn/reactos?rev=41864&view=rev
Log:
Too many things in -i386 were still "generic" and had to be duplicated accross
plat-specific rbuild files, so moved a whole bunch of them into the generic rbuild.
Ironically, the one thing that isn't generic -- which files get built -- was in the
generic file, blocking the arm rbuild from ever being able to use it, so I split this out
now.
Cleaned up the i386 and arm rbuild files to use the new generic rbuild.
Brought the arm rbuild file up to spec to use the new compilerset/linkerset and
msvc-compliant options.

Modified:
    trunk/reactos/ReactOS-arm.rbuild
    trunk/reactos/ReactOS-generic.rbuild
    trunk/reactos/ReactOS-i386.rbuild

Modified: trunk/reactos/ReactOS-arm.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS-arm.rbuild?rev=418…
==============================================================================
--- trunk/reactos/ReactOS-arm.rbuild [iso-8859-1] (original)
+++ trunk/reactos/ReactOS-arm.rbuild [iso-8859-1] Sat Jul 11 15:47:21 2009
@@ -8,76 +8,37 @@
 	</xi:include>
 
 	<xi:include href="baseaddress.rbuild" />
-
-	<define name="__REACTOS__" />
+                
+    <define name="_M_ARM" />
 	<define name="_ARM_" />
 	<define name="__arm__" />
 	<define name="TARGET_arm" host="true" />
-
-	<compilerflag compiler="cc,cxx">-gstabs+</compilerflag>
-	<compilerflag compiler="as">-gstabs+</compilerflag>
-
-	<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="DBG" value="0">
-		<define name="DBG">0</define>
-	</if>
-
-	<if property="KDBG" value="1">
-		<define name="KDBG">1</define>
-		<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 root="intermediate">include/dxsdk</include>
-	<include>include/crt</include>
-	<include>include/crt/mingw32</include>
-	<include>include/ddk</include>
-	<include>include/GL</include>
-	<include>include/ndk</include>
-	<include>include/reactos</include>
-	<include root="intermediate">include/reactos</include>
-	<include root="intermediate">include/reactos/mc</include>
-	<include>include/reactos/libs</include>
-	<include>include/reactos/arm</include>
-
-	<property name="WINEBUILD_FLAGS" value="--kill-at"/>
-	<property name="NTOSKRNL_SHARED" value="-file-alignment=0x1000
-section-alignment=0x1000 -shared"/>
+    
+    <define name="USE_COMPILER_EXCEPTIONS" />
+    
+    <property name="NTOSKRNL_SHARED" value="-file-alignment=0x1000
-section-alignment=0x1000 -shared"/>
+    <property name="WINEBUILD_FLAGS" value="--kill-at"/>
+        
+    <include>include/reactos/arm</include>
 
 	<if property="SARCH" value="versatile">
 		<define name="BOARD_CONFIG_VERSATILE"/>
 	</if>
 
-	<if property="OPTIMIZE" value="1">
-		<compilerflag>-Os</compilerflag>
-		<compilerflag>-ftracer</compilerflag>
-	</if>
-	<if property="OPTIMIZE" value="2">
-		<compilerflag>-Os</compilerflag>
-	</if>
-	<if property="OPTIMIZE" value="3">
-		<compilerflag>-O1</compilerflag>
-	</if>
-	<if property="OPTIMIZE" value="4">
-		<compilerflag>-O2</compilerflag>
-	</if>
-	<if property="OPTIMIZE" value="5">
-		<compilerflag>-O3</compilerflag>
-	</if>
+	<group compilerset="gcc">
+		<if property="OPTIMIZE" value="1">
+			<compilerflag>-ftracer</compilerflag>
+		</if>
+        <compilerflag>-Wno-attributes</compilerflag>
+	</group>
 
-	<define name="__MSVCRT__"/>
-	<compilerflag>-Wno-attributes</compilerflag>
-	<compilerflag>-fno-strict-aliasing</compilerflag>
-	<linkerflag>--strip-debug</linkerflag>
-	<linkerflag>-static</linkerflag>
+    
+	<define name="__MSVCRT__"/> <!-- DUBIOUS -->
+    
+	<group linkerset="ld">
+        <linkerflag>--strip-debug</linkerflag> <!-- INVESTIGATE -->
+        <linkerflag>-static</linkerflag> <!-- INVESTIGATE -->
+	</group>
 
 	<directory name="media">
 		<directory name="nls">
@@ -196,6 +157,4 @@
             </directory>
 		</directory>
 	</directory>
-
-	<define name="_USE_32BIT_TIME_T" />
 </project>

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] Sat Jul 11 15:47:21 2009
@@ -85,50 +85,12 @@
 	<include host="true"
root="intermediate">include</include>
 	<include host="true">include/reactos</include>
 	<include host="true">include/reactos/wine</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" />
-		<if property="BUILD_MP" value="1">
-			<xi:include href="ntoskrnl/ntkrnlmp.rbuild" />
-		</if>
-	</directory>
-	<directory name="subsystems">
-		<xi:include href="subsystems/subsystems.rbuild" />
-	</directory>
-	<directory name="tools">
-		<xi:include href="tools/tools.rbuild" />
-	</directory>
-
+    
 	<group compilerset="gcc">
 		<compilerflag>-Wall</compilerflag>
 		<compilerflag
compiler="cxx">-Wno-non-virtual-dtor</compilerflag>
+        <compilerflag compiler="cc,cxx">-gstabs+</compilerflag>
+        <compilerflag compiler="as">-gstabs+</compilerflag>
 	</group>
 
 	<group compilerset="msc">
@@ -137,4 +99,56 @@
 		<compilerflag>/Zi</compilerflag>
 		<compilerflag>/W1</compilerflag>
 	</group>
+    
+	<group compilerset="gcc">
+		<if property="OPTIMIZE" value="1">
+			<compilerflag>-Os</compilerflag>
+		</if>
+		<if property="OPTIMIZE" value="2">
+			<compilerflag>-Os</compilerflag>
+		</if>
+		<if property="OPTIMIZE" value="3">
+			<compilerflag>-O1</compilerflag>
+		</if>
+		<if property="OPTIMIZE" value="4">
+			<compilerflag>-O2</compilerflag>
+		</if>
+		<if property="OPTIMIZE" value="5">
+			<compilerflag>-O3</compilerflag>
+		</if>
+
+		<compilerflag>-fno-strict-aliasing</compilerflag>
+		<compilerflag>-Wno-strict-aliasing</compilerflag>
+		<compilerflag>-Wpointer-arith</compilerflag>
+		<compilerflag>-Wno-multichar</compilerflag>
+		<!-- compilerflag>-H</compilerflag>    enable this for header traces
-->
+	</group>
+
+	<group compilerset="msc">
+		<if property="OPTIMIZE" value="1">
+			<compilerflag>/O1</compilerflag>
+		</if>
+		<if property="OPTIMIZE" value="2">
+			<compilerflag>/O2</compilerflag>
+		</if>
+		<if property="OPTIMIZE" value="3">
+			<compilerflag>/Ox /GS-</compilerflag>
+			<compilerflag>/Ot</compilerflag>
+		</if>
+		<if property="OPTIMIZE" value="4">
+			<compilerflag>/Ox /GS-</compilerflag>
+			<compilerflag>/Os</compilerflag>
+		</if>
+		<if property="OPTIMIZE" value="5">
+			<compilerflag>/Ox /GS-</compilerflag>
+			<compilerflag>/Os</compilerflag>
+			<compilerflag>/Ob2</compilerflag>
+			<compilerflag>/GF</compilerflag>
+			<compilerflag>/Gy</compilerflag>
+		</if>
+
+		<compilerflag>/GS-</compilerflag>
+	</group>
+    
+	<define name="_USE_32BIT_TIME_T" />
 </group>

Modified: trunk/reactos/ReactOS-i386.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS-i386.rbuild?rev=41…
==============================================================================
--- trunk/reactos/ReactOS-i386.rbuild [iso-8859-1] (original)
+++ trunk/reactos/ReactOS-i386.rbuild [iso-8859-1] Sat Jul 11 15:47:21 2009
@@ -21,64 +21,53 @@
 
 	<group compilerset="gcc">
 		<if property="OPTIMIZE" value="1">
-			<compilerflag>-Os</compilerflag>
 			<compilerflag>-ftracer</compilerflag>
 			<compilerflag>-momit-leaf-frame-pointer</compilerflag>
 		</if>
-		<if property="OPTIMIZE" value="2">
-			<compilerflag>-Os</compilerflag>
-		</if>
-		<if property="OPTIMIZE" value="3">
-			<compilerflag>-O1</compilerflag>
-		</if>
-		<if property="OPTIMIZE" value="4">
-			<compilerflag>-O2</compilerflag>
-		</if>
-		<if property="OPTIMIZE" value="5">
-			<compilerflag>-O3</compilerflag>
-		</if>
-
-		<compilerflag>-mpreferred-stack-boundary=2</compilerflag>
-		<compilerflag>-fno-strict-aliasing</compilerflag>
-		<compilerflag>-Wno-strict-aliasing</compilerflag>
-		<compilerflag>-Wpointer-arith</compilerflag>
-		<compilerflag>-Wno-multichar</compilerflag>
-
-		<compilerflag>-gstabs+</compilerflag>
-		<!-- compilerflag>-H</compilerflag>    enable this for header traces
-->
-	</group>
-
-	<group compilerset="msc">
-		<if property="OPTIMIZE" value="1">
-			<compilerflag>/O1</compilerflag>
-		</if>
-		<if property="OPTIMIZE" value="2">
-			<compilerflag>/O2</compilerflag>
-		</if>
-		<if property="OPTIMIZE" value="3">
-			<compilerflag>/Ox /GS-</compilerflag>
-			<compilerflag>/Ot</compilerflag>
-		</if>
-		<if property="OPTIMIZE" value="4">
-			<compilerflag>/Ox /GS-</compilerflag>
-			<compilerflag>/Os</compilerflag>
-		</if>
-		<if property="OPTIMIZE" value="5">
-			<compilerflag>/Ox /GS-</compilerflag>
-			<compilerflag>/Os</compilerflag>
-			<compilerflag>/Ob2</compilerflag>
-			<compilerflag>/GF</compilerflag>
-			<compilerflag>/Gy</compilerflag>
-		</if>
-
-		<compilerflag>/GS-</compilerflag>
-	</group>
-
-	<compilerflag compiler="as">-gstabs+</compilerflag>
+        <compilerflag>-mpreferred-stack-boundary=2</compilerflag>
+    </group>
 
 	<group linkerset="ld">
 		<linkerflag>-disable-stdcall-fixup</linkerflag>
 	</group>
-
-	<define name="_USE_32BIT_TIME_T" />
+    
+	<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" />
+		<if property="BUILD_MP" value="1">
+			<xi:include href="ntoskrnl/ntkrnlmp.rbuild" />
+		</if>
+	</directory>
+	<directory name="subsystems">
+		<xi:include href="subsystems/subsystems.rbuild" />
+	</directory>
+	<directory name="tools">
+		<xi:include href="tools/tools.rbuild" />
+	</directory>
 </project>