[ros-diffs] [mpiulachs] 30512: - Add the "families" target that will print the available build families from buildfamilies.rbuild - fix some typos

[mpiulachs at svn.reactos.org]

Author: mpiulachs
Date: Sat Nov 17 00:11:25 2007
New Revision: 30512

URL: http://svn.reactos.org/svn/reactos?rev=30512&view=rev
Log:
- Add the "families" target that will print the available build families from buildfamilies.rbuild
- fix some typos 

Modified:
    branches/rbuild/reactos/Makefile
    branches/rbuild/reactos/buildfamilies.rbuild
    branches/rbuild/reactos/tools/rbuild/backend/mingw/mingw.cpp
    branches/rbuild/reactos/tools/rbuild/backend/mingw/mingw.h

Modified: branches/rbuild/reactos/Makefile
URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/Makefile?rev=30512&r1=30511&r2=30512&view=diff
==============================================================================
--- branches/rbuild/reactos/Makefile (original)
+++ branches/rbuild/reactos/Makefile Sat Nov 17 00:11:25 2007
@@ -46,6 +46,8 @@
 #        This is faster than the depends target which does a complete dependency
 #        check of the ReactOS codebase.
 #
+#    families
+#        A list will be shown with all available build families.
 #
 # Accepted environment variables:
 #

Modified: branches/rbuild/reactos/buildfamilies.rbuild
URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/buildfamilies.rbuild?rev=30512&r1=30511&r2=30512&view=diff
==============================================================================
--- branches/rbuild/reactos/buildfamilies.rbuild (original)
+++ branches/rbuild/reactos/buildfamilies.rbuild Sat Nov 17 00:11:25 2007
@@ -10,18 +10,18 @@
 	<buildfamily name="applications" />
 	<buildfamily name="guiapplications" description="Win32 GUI applications" />
 	<buildfamily name="cuiapplications" description="Win32 console applications" />
-	<buildfamily name="nativeapplications"  description="Native console applications"/>
+	<buildfamily name="nativeapplications" description="Native console applications"/>
 
 	<!-- By functionality -->
 	<buildfamily name="games" />
 	<buildfamily name="screensavers" />
 	<buildfamily name="services" />
 	<buildfamily name="shells" />
-	<buildfamily name="cpapplets" />
+	<buildfamily name="cplapplets" />
 
 	<!-- Drivers -->
 	<buildfamily name="drivers" />
-	<buildfamily name="fsdrivers"  description="File system drivers" />
+	<buildfamily name="fsdrivers" description="File system drivers" />
 	<buildfamily name="hardwaredrivers" description="Hardware drivers" />
 	<buildfamily name="displaydrivers" description="Hardware display drivers" />
 	<buildfamily name="inputdrivers" description="I/O device drivers" />

Modified: branches/rbuild/reactos/tools/rbuild/backend/mingw/mingw.cpp
URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/tools/rbuild/backend/mingw/mingw.cpp?rev=30512&r1=30511&r2=30512&view=diff
==============================================================================
--- branches/rbuild/reactos/tools/rbuild/backend/mingw/mingw.cpp (original)
+++ branches/rbuild/reactos/tools/rbuild/backend/mingw/mingw.cpp Sat Nov 17 00:11:25 2007
@@ -337,6 +337,7 @@
 	GenerateXmlBuildFilesMacro ();
 	UnpackWineResources ();
 	ProcessModules ();
+    GenerateFamiliesTargetsInfo ();
 	GenerateInstallTarget ();
 	GenerateTestTarget ();
 	GenerateDirectoryTargets ();
@@ -577,40 +578,35 @@
 	}
 	fprintf ( fMakefile, "\n\t\n\n" );
 }
-/*
-void
-MingwBackend::GenerateFamiliesTarget () const
-{
+
+void
+MingwBackend::GenerateFamiliesTargetsInfo () const
+{
+    fprintf ( fMakefile, "families:\n");
+    fprintf ( fMakefile, "\t at echo=================== Available Build Families ===================\n\n" );
+
 	for ( size_t i = 0; i < ProjectNode.buildfamilies.size (); i++ )
 	{
 		BuildFamily& buildfamily = *ProjectNode.buildfamilies[i];
+		
+        if ( buildfamily.description.length () > 0 )
+        {
 			fprintf ( fMakefile,
-                "%s:",
-                      buildfamily.name.c_str () );
-
-	    for ( size_t i = 0; i < ProjectNode.modules.size (); i++ )
-	    {
-		    Module& module = *ProjectNode.modules[i];
-		    if ( !module.enabled )
-			    continue;
-
-            for ( size_t i = 0; i < module.families.size (); i++ )
-	        {
-		        Family& family = *module.families[i];
-
-                if (family.name == buildfamily.name)
-                {
-			        fprintf ( fMakefile,
-			                  " %s",
-			                  GetTargetMacro(module).c_str () );
-                }
-	        }
-	    }
+                "\t at echo %s (%s)\n",
+                      buildfamily.name.c_str () ,
+                      buildfamily.description.c_str());
+        }
+        else
+        {
+			fprintf ( fMakefile,
+                "\t at echo %s\n",
+                      buildfamily.name.c_str ());
+        }
 	}
 
 	fprintf ( fMakefile, "\n\t\n\n" );
 }
-*/
+
 string
 MingwBackend::GetBuildToolDependencies () const
 {

Modified: branches/rbuild/reactos/tools/rbuild/backend/mingw/mingw.h
URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/tools/rbuild/backend/mingw/mingw.h?rev=30512&r1=30511&r2=30512&view=diff
==============================================================================
--- branches/rbuild/reactos/tools/rbuild/backend/mingw/mingw.h (original)
+++ branches/rbuild/reactos/tools/rbuild/backend/mingw/mingw.h Sat Nov 17 00:11:25 2007
@@ -76,7 +76,7 @@
 	bool IncludeInAllTarget ( const Module& module ) const;
 	void GenerateAllTarget ( const std::vector<MingwModuleHandler*>& handlers ) const;
 	std::string GetBuildToolDependencies () const;
-    void GenerateFamiliesTarget() const;
+    void GenerateFamiliesTargetsInfo() const;
     void GenerateInitTarget () const;
 	void GenerateRegTestsRunTarget () const;
 	void GenerateXmlBuildFilesMacro() const;