[tkreuzer] 37889: merge rbuild changes 37811-37861 from trunk

Author: tkreuzer
Date: Sat Dec  6 04:48:26 2008
New Revision: 37889

URL: http://svn.reactos.org/svn/reactos?rev=37889&view=rev
Log:
merge rbuild changes 37811-37861 from trunk

Modified:
    branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/modulehandler.cpp
    branches/ros-amd64-bringup/reactos/tools/rbuild/module.cpp
    branches/ros-amd64-bringup/reactos/tools/rbuild/project.cpp

Modified: branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/modulehandler.cpp
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools…
==============================================================================
--- branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/modulehandler.cpp
[iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/modulehandler.cpp
[iso-8859-1] Sat Dec  6 04:48:26 2008
@@ -1434,6 +1434,9 @@
              "ifneq ($(ROS_GENERATE_RSYM),no)\n" );
 	fprintf ( fMakefile,
 	          "\t$(ECHO_RSYM)\n" );
+	// FIXME! workaround until rsym can extract line numbers from DWARF
+	fprintf ( fMakefile,
+	          "\t$(Q)${objcopy} -R .debug_abbrev -R .debug_aranges -R .debug_frame -R
.debug_info -R .debug_line -R .debug_pubnames -R .debug_macinfo -R .debug_str -R
.debug_loc -R .debug_pubtypes -R .debug_ranges -R .debug_static_func -R .debug_static_vars
-R .debug_types -R .debug_weaknames $@\n\n" );
 	fprintf ( fMakefile,
 	          "\t$(Q)$(RSYM_TARGET) $@ $@\n\n" );
 	fprintf ( fMakefile,
@@ -2015,16 +2018,6 @@
 		          linkerflags );
 	}
 
-	if ( IsStaticLibrary ( module ) && module.isStartupLib )
-	{
-		fprintf ( fMakefile,
-		          "%s += -Wno-main\n\n",
-		          cflagsMacro.c_str () );
-		fprintf ( fMakefile,
-		          "%s += -Wno-main\n\n",
-		          cxxflagsMacro.c_str () );
-	}
-
 	fprintf ( fMakefile, "\n\n" );
 
 	// future references to the macros will be to get their values

Modified: branches/ros-amd64-bringup/reactos/tools/rbuild/module.cpp
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools…
==============================================================================
--- branches/ros-amd64-bringup/reactos/tools/rbuild/module.cpp [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/tools/rbuild/module.cpp [iso-8859-1] Sat Dec  6
04:48:26 2008
@@ -745,13 +745,17 @@
 		name = e.GetAttribute ( "property", true );
 		assert( name );
 		const Property *property = project.LookupProperty( name->value );
-		if ( !property )
-		{
-			// Property not found
-			throw InvalidOperationException ( __FILE__,
-			                                  __LINE__,
-			                                  "Test on unknown property '%s' at
%s",
-			                                  name->value.c_str (), e.location.c_str () );
+		const string *PropertyValue;
+		const string EmptyString;
+
+		if (property)
+		{
+			PropertyValue = &property->value;
+		}
+		else
+		{
+			// Property does not exist, treat it as being empty
+			PropertyValue = &EmptyString;
 		}
 
 		const XMLAttribute* value;
@@ -759,7 +763,7 @@
 		assert( value );
 
 		bool negate = ( e.name == "ifnot" );
-		bool equality = ( property->value == value->value );
+		bool equality = ( *PropertyValue == value->value );
 		if ( equality == negate )
 		{
 			// Failed, skip this element

Modified: branches/ros-amd64-bringup/reactos/tools/rbuild/project.cpp
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools…
==============================================================================
--- branches/ros-amd64-bringup/reactos/tools/rbuild/project.cpp [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/tools/rbuild/project.cpp [iso-8859-1] Sat Dec  6
04:48:26 2008
@@ -399,13 +399,17 @@
 		name = e.GetAttribute ( "property", true );
 		assert( name );
 		const Property *property = LookupProperty( name->value );
-		if ( !property )
-		{
-			// Property not found
-			throw InvalidOperationException ( __FILE__,
-			                                  __LINE__,
-			                                  "Test on unknown property '%s' at
%s",
-			                                  name->value.c_str (), e.location.c_str () );
+		const string *PropertyValue;
+		const string EmptyString;
+
+		if (property)
+		{
+			PropertyValue = &property->value;
+		}
+		else
+		{
+			// Property does not exist, treat it as being empty
+			PropertyValue = &EmptyString;
 		}
 
 		const XMLAttribute* value;
@@ -413,7 +417,7 @@
 		assert( value );
 
 		bool negate = ( e.name == "ifnot" );
-		bool equality = ( property->value == value->value );
+		bool equality = ( *PropertyValue == value->value );
 		if ( equality == negate )
 		{
 			// Failed, skip this element