[ros-diffs] [hpoussin] 38549: Add a check to not mix up host and target modules Should probably be moved later outside of backend directory

hpoussin at svn.reactos.org hpoussin at svn.reactos.org
Sun Jan 4 09:38:19 CET 2009


Author: hpoussin
Date: Sun Jan  4 02:38:19 2009
New Revision: 38549

URL: http://svn.reactos.org/svn/reactos?rev=38549&view=rev
Log:
Add a check to not mix up host and target modules
Should probably be moved later outside of backend directory

Modified:
    trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp

Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp?rev=38549&r1=38548&r2=38549&view=diff
==============================================================================
--- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] (original)
+++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] Sun Jan  4 02:38:19 2009
@@ -778,6 +778,22 @@
 
 	if ( data.libraries.size () > 0 )
 	{
+		// Check if host and target modules are not mixed up
+		HostType current = ModuleHandlerInformations[module.type].DefaultHost;
+		std::vector<Library*>::const_iterator it;
+		for ( it = data.libraries.begin(); it != data.libraries.end(); ++it )
+		{
+			HostType imported = ModuleHandlerInformations[(*it)->importedModule->type].DefaultHost;
+			if (current != imported)
+			{
+				throw InvalidOperationException ( __FILE__,
+				                                  __LINE__,
+				                                  "Module '%s' imports module '%s', which is not of the right type",
+				                                  module.name.c_str (),
+				                                  (*it)->importedModule->name.c_str () );
+			}
+		}
+
 		string deps = GenerateImportLibraryDependenciesFromVector ( data.libraries );
 		if ( deps.size () > 0 )
 		{



More information about the Ros-diffs mailing list