[ros-diffs] [hpoussin] 32709: Remove $(INIT) variable, which was containing all host tools Now, each rule depends only of required tools See issue #3131 for more details.

Author: hpoussin
Date: Mon Mar 17 07:26:23 2008
New Revision: 32709

URL: http://svn.reactos.org/svn/reactos?rev=3D32709&view=3Drev
Log:
Remove $(INIT) variable, which was containing all host tools
Now, each rule depends only of required tools
See issue #3131 for more details.

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

Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/=
mingw/mingw.cpp?rev=3D32709&r1=3D32708&r2=3D32709&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp (original)
+++ trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp Mon Mar 17 07:26:23 =
2008
@@ -270,7 +270,6 @@
 	fprintf ( fMakefile, "\n" );
 =

 	GenerateAllTarget ( v );
-	GenerateInitTarget ();
 	GenerateRegTestsRunTarget ();
 =

 	for ( i =3D 0; i < iend; i++ )
@@ -576,34 +575,6 @@
 	fprintf ( fMakefile, "\n\t\n\n" );
 }
 =

-string
-MingwBackend::GetBuildToolDependencies () const
-{
-	string dependencies;
-	for ( size_t i =3D 0; i < ProjectNode.modules.size (); i++ )
-	{
-		Module& module =3D *ProjectNode.modules[i];
-		if ( !module.enabled )
-			continue;
-		if ( module.type =3D=3D BuildTool )
-		{
-			if ( dependencies.length () > 0 )
-				dependencies +=3D " ";
-			dependencies +=3D GetFullName ( *module.dependency );
-		}
-	}
-	return dependencies;
-}
-
-void
-MingwBackend::GenerateInitTarget () const
-{
-	fprintf ( fMakefile,
-	          "INIT =3D %s\n",
-	          GetBuildToolDependencies ().c_str () );
-	fprintf ( fMakefile, "\n" );
-}
-
 void
 MingwBackend::GenerateRegTestsRunTarget () const
 {

Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/=
mingw/mingw.h?rev=3D32709&r1=3D32708&r2=3D32709&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/reactos/tools/rbuild/backend/mingw/mingw.h (original)
+++ trunk/reactos/tools/rbuild/backend/mingw/mingw.h Mon Mar 17 07:26:23 20=
08
@@ -75,8 +75,6 @@
 	void GenerateGlobalVariables () const;
 	bool IncludeInAllTarget ( const Module& module ) const;
 	void GenerateAllTarget ( const std::vector<MingwModuleHandler*>& handlers=
 ) const;
-	std::string GetBuildToolDependencies () const;
-	void GenerateInitTarget () const;
 	void GenerateRegTestsRunTarget () const;
 	void GenerateXmlBuildFilesMacro() const;
 	void GenerateTestSupportCode ();

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=3D32709&r1=3D32708&r2=3D32709&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp (original)
+++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Mon Mar 17 0=
7:26:23 2008
@@ -2296,7 +2296,7 @@
 		return;
 =

 	if ( module.name !=3D "psdk" )
-		dependencies.push_back ( "$(INIT) $(PSDK_TARGET) $(psdk_HEADERS)" );
+		dependencies.push_back ( "$(PSDK_TARGET) $(psdk_HEADERS)" );
 =

 	/* Check if any dependent library relies on the generated headers */
 	for ( size_t i =3D 0; i < module.project.modules.size (); i++ )