[ros-diffs] [pschweitzer] 42574: Fixed various badly sync files. Reduce warnings, etc...

Author: pschweitzer
Date: Sun Aug  9 23:41:20 2009
New Revision: 42574

URL: http://svn.reactos.org/svn/reactos?rev=42574&view=rev
Log:
Fixed various badly sync files.
Reduce warnings, etc...

Modified:
    branches/pierre-fsd/Makefile
    branches/pierre-fsd/ReactOS-arm.rbuild
    branches/pierre-fsd/ReactOS-ppc.rbuild
    branches/pierre-fsd/config-arm.template.rbuild
    branches/pierre-fsd/config-ppc.template.rbuild
    branches/pierre-fsd/config.template.rbuild
    branches/pierre-fsd/tools/buildno/buildno.cpp

Modified: branches/pierre-fsd/Makefile
URL:
http://svn.reactos.org/svn/reactos/branches/pierre-fsd/Makefile?rev=42574&a…
==============================================================================
--- branches/pierre-fsd/Makefile [iso-8859-1] (original)
+++ branches/pierre-fsd/Makefile [iso-8859-1] Sun Aug  9 23:41:20 2009
@@ -38,7 +38,7 @@
 #        This can require several minutes to complete. If you only need to check
 #        dependencies for a single or few modules then you can use the
 #        module_depends targets instead. This target can also repair a damaged or
-#        missing makefile-{ROS_ARCH}.auto if needed.
+#        missing makefile-${ROS_ARCH}.auto if needed.
 #
 #    module_depends
 #        These targets do a dependency check of individual modules. Replace module
@@ -127,7 +127,7 @@
 #            -r           Input XML
 #
 #    ROS_AUTOMAKE
-#        Alternate name of makefile.auto
+#        Alternate name of makefile-${ROS_ARCH}.auto
 #
 #    ROS_BUILDENGINE
 #        The Build engine to be used. The variable defaults to rbuild (RBUILD_TARGET)
@@ -160,7 +160,11 @@
 endif
 
 ifeq ($(ROS_AUTOMAKE),)
-ROS_AUTOMAKE=makefile.auto
+  ifeq ($(ARCH),i386)
+    ROS_AUTOMAKE=makefile.auto
+  else
+    ROS_AUTOMAKE=makefile-$(ARCH).auto
+  endif
 endif
 
 all: $(ROS_AUTOMAKE)

Modified: branches/pierre-fsd/ReactOS-arm.rbuild
URL:
http://svn.reactos.org/svn/reactos/branches/pierre-fsd/ReactOS-arm.rbuild?r…
==============================================================================
--- branches/pierre-fsd/ReactOS-arm.rbuild [iso-8859-1] (original)
+++ branches/pierre-fsd/ReactOS-arm.rbuild [iso-8859-1] Sun Aug  9 23:41:20 2009
@@ -1,6 +1,6 @@
 <?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">
+<project name="ReactOS" makefile="makefile-arm.auto"
xmlns:xi="http://www.w3.org/2001/XInclude">
 	<xi:include href="config-arm.rbuild">
 		<xi:fallback>
 			<xi:include href="config-arm.template.rbuild" />
@@ -66,6 +66,7 @@
 		<compilerflag>-O3</compilerflag>
 	</if>
 
+	<define name="__MSVCRT__"/>
 	<compilerflag>-Wno-attributes</compilerflag>
 	<compilerflag>-fno-strict-aliasing</compilerflag>
 	<linkerflag>--strip-debug</linkerflag>
@@ -115,9 +116,18 @@
 				<xi:include href="lib/sdk/crt/crt.rbuild" />
 				<xi:include href="lib/sdk/crt/libcntpr.rbuild" />
 			</directory>
+			<directory name="nt">
+				<xi:include href="lib/sdk/nt/nt.rbuild" />
+			</directory>
 			<directory name="wdmguid">
 				<xi:include href="lib/sdk/wdmguid/wdmguid.rbuild" />
 			</directory>
+		</directory>
+		<directory name="ntdllsys">
+			<xi:include href="lib/ntdllsys/ntdllsys.rbuild" />
+		</directory>
+		<directory name="smlib">
+			<xi:include href="lib/smlib/smlib.rbuild" />
 		</directory>
 	</directory>
 	<directory name="include">
@@ -154,8 +164,8 @@
 			</directory>
 		</directory>
 		<directory name="filesystems">
-			<directory name="cdfs">
-				<xi:include href="drivers/filesystems/cdfs/cdfs.rbuild" />
+			<directory name="fastfat">
+				<xi:include href="drivers/filesystems/fastfat/vfatfs.rbuild" />
 			</directory>
 		</directory>
 		<directory name="base">
@@ -166,5 +176,17 @@
 				<xi:include href="drivers/base/bootvid/bootvid.rbuild" />
 			</directory>
 		</directory>
-	</directory>	
+	</directory>
+	<directory name="dll">
+		<directory name="ntdll">
+			<xi:include href="dll/ntdll/ntdll.rbuild" />
+		</directory>	
+	</directory>
+	<directory name="base">
+		<directory name="system">
+            <directory name="smss">
+                <xi:include href="base/system/smss/smss.rbuild" />
+            </directory>	
+		</directory>	
+	</directory>
 </project>

Modified: branches/pierre-fsd/ReactOS-ppc.rbuild
URL:
http://svn.reactos.org/svn/reactos/branches/pierre-fsd/ReactOS-ppc.rbuild?r…
==============================================================================
--- branches/pierre-fsd/ReactOS-ppc.rbuild [iso-8859-1] (original)
+++ branches/pierre-fsd/ReactOS-ppc.rbuild [iso-8859-1] Sun Aug  9 23:41:20 2009
@@ -1,6 +1,6 @@
 <?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">
+<project name="ReactOS" makefile="makefile-ppc.auto"
xmlns:xi="http://www.w3.org/2001/XInclude">
 	<xi:include href="config-ppc.rbuild">
 		<xi:fallback>
 			<xi:include href="config-ppc.template.rbuild" />

Modified: branches/pierre-fsd/config-arm.template.rbuild
URL:
http://svn.reactos.org/svn/reactos/branches/pierre-fsd/config-arm.template.…
==============================================================================
--- branches/pierre-fsd/config-arm.template.rbuild [iso-8859-1] (original)
+++ branches/pierre-fsd/config-arm.template.rbuild [iso-8859-1] Sun Aug  9 23:41:20 2009
@@ -85,4 +85,10 @@
 -->
 <property name="_WINKD_" value="0" />
 
+<!--
+	Whether to compile support for ELF files. Do not enable unless you know what
+	you're doing.
+-->
+<property name="_ELF_" value="0" />
+
 </group>

Modified: branches/pierre-fsd/config-ppc.template.rbuild
URL:
http://svn.reactos.org/svn/reactos/branches/pierre-fsd/config-ppc.template.…
==============================================================================
--- branches/pierre-fsd/config-ppc.template.rbuild [iso-8859-1] (original)
+++ branches/pierre-fsd/config-ppc.template.rbuild [iso-8859-1] Sun Aug  9 23:41:20 2009
@@ -65,4 +65,10 @@
 -->
 <property name="NSWPAT" value="0" />
 
+<!--
+	Whether to compile support for ELF files. Do not enable unless you know what
+	you're doing.
+-->
+<property name="_ELF_" value="0" />
+
 </group>

Modified: branches/pierre-fsd/config.template.rbuild
URL:
http://svn.reactos.org/svn/reactos/branches/pierre-fsd/config.template.rbui…
==============================================================================
--- branches/pierre-fsd/config.template.rbuild [iso-8859-1] (original)
+++ branches/pierre-fsd/config.template.rbuild [iso-8859-1] Sun Aug  9 23:41:20 2009
@@ -90,6 +90,12 @@
 <property name="_WINKD_" value="0" />
 
 <!--
+	Whether to compile support for ELF files. Do not enable unless you know what
+	you're doing.
+-->
+<property name="_ELF_" value="0" />
+
+<!--
 	Whether to compile the multi processor versions for ntoskrnl and hal.
 -->
 <property name="BUILD_MP" value="1" />

Modified: branches/pierre-fsd/tools/buildno/buildno.cpp
URL:
http://svn.reactos.org/svn/reactos/branches/pierre-fsd/tools/buildno/buildn…
==============================================================================
--- branches/pierre-fsd/tools/buildno/buildno.cpp [iso-8859-1] (original)
+++ branches/pierre-fsd/tools/buildno/buildno.cpp [iso-8859-1] Sun Aug  9 23:41:20 2009
@@ -33,11 +33,11 @@
 #define FALSE 0
 #define TRUE  1
 
-static char * argv0 = "";
+static const char * argv0 = "";
 static char * filename = NULL;
 static char * build_tag = NULL;
 
-int count_wide_string( wchar_t *str )
+int count_wide_string( const wchar_t *str )
 {
 	int i;
 	for( i = 0; str[i]; i++ )