[ros-diffs] [mpiulachs] 32467: - minor fixes

Author: mpiulachs
Date: Sun Feb 24 14:57:58 2008
New Revision: 32467

URL: http://svn.reactos.org/svn/reactos?rev=32467&view=rev
Log:
- minor fixes

Modified:
    branches/rbuild/reactos/tools/rbuild/module.cpp
    branches/rbuild/reactos/tools/rbuild/modulesmanifestgenerator.cpp
    branches/rbuild/reactos/tools/rbuild/modulesresourcegenerator.cpp
    branches/rbuild/reactos/tools/rbuild/rbuild.h

Modified: branches/rbuild/reactos/tools/rbuild/module.cpp
URL:
http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/tools/rbuild/mod…
==============================================================================
--- branches/rbuild/reactos/tools/rbuild/module.cpp (original)
+++ branches/rbuild/reactos/tools/rbuild/module.cpp Sun Feb 24 14:57:58 2008
@@ -1779,6 +1779,7 @@
         alias = "";
 
     att = node.GetAttribute ( "firstname", true );
+	assert(att);
 	if (att != NULL)
 		firstName = att->value;
 	else
@@ -1813,6 +1814,12 @@
 		website = att->value;
 	else
 		website = "";
+
+    att = node.GetAttribute ( "ircnick", false );
+	if (att != NULL)
+		ircnick = att->value;
+	else
+		ircnick = "";
 }
 
 Author::Author ( const XMLElement& _node , const Module& module_ , AuthorRole
role_ , const string& alias_)

Modified: branches/rbuild/reactos/tools/rbuild/modulesmanifestgenerator.cpp
URL:
http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/tools/rbuild/mod…
==============================================================================
--- branches/rbuild/reactos/tools/rbuild/modulesmanifestgenerator.cpp (original)
+++ branches/rbuild/reactos/tools/rbuild/modulesmanifestgenerator.cpp Sun Feb 24 14:57:58
2008
@@ -36,7 +36,6 @@
 	for ( size_t i = 0; i < project.modules.size (); i++ )
 	{
 		Module& module = *project.modules[i];
-
 		if (module.autoManifest != NULL)
 		{
 			WriteManifestFile (module);
@@ -55,37 +54,37 @@
 		throw OutOfMemoryException ();
 	
 	s = buf;
-	s = s + sprintf ( s, "<?xml version=\"1.0\"
encoding=\"UTF-8\" standalone=\"yes\"?>");
-	s = s + sprintf ( s, "<assembly
xmlns=\"urn:schemas-microsoft-com:asm.v1\"
manifestVersion=\"1.0\">");
-	s = s + sprintf ( s, " <assemblyIdentity");
-	s = s + sprintf ( s, "  version=\"1.0.0.0\"");
-	s = s + sprintf ( s, "  processorArchitecture=\"x86\"");
-	s = s + sprintf ( s, "  name=\"ReactOS.System.Module\"");
-	s = s + sprintf ( s, "  type=\"win32\"");
-	s = s + sprintf ( s, " />");
+	s = s + sprintf ( s, "<?xml version=\"1.0\"
encoding=\"UTF-8\" standalone=\"yes\"?>\n");
+	s = s + sprintf ( s, "<assembly
xmlns=\"urn:schemas-microsoft-com:asm.v1\"
manifestVersion=\"1.0\">\n");
+	s = s + sprintf ( s, " <assemblyIdentity\n");
+	s = s + sprintf ( s, "  version=\"1.0.0.0\"\n");
+	s = s + sprintf ( s, "  processorArchitecture=\"x86\"\n");
+	s = s + sprintf ( s, "  name=\"ReactOS.System.Module\"\n");
+	s = s + sprintf ( s, "  type=\"win32\"\n");
+	s = s + sprintf ( s, " />\n");
 	
 	if (module.metadata != NULL)
 	{
-		s = s + sprintf ( s, " <description>%s</description>" ,
module.metadata->description.c_str());
+		s = s + sprintf ( s, " <description>%s</description>\n" ,
module.metadata->description.c_str());
 	}
 	else
 	{
-		s = s + sprintf ( s, " <description>%s<description>" ,
module.name.c_str());
+		s = s + sprintf ( s, " <description>%s<description>\n" ,
module.name.c_str());
 	}
 	
-	s = s + sprintf ( s, " <dependency>");
-	s = s + sprintf ( s, "  <dependentAssembly>");
- 	s = s + sprintf ( s, "  <assemblyIdentity");
- 	s = s + sprintf ( s, "   type=\"win32\"");
- 	s = s + sprintf ( s, "  
name=\"Microsoft.Windows.Common-Controls\"");
- 	s = s + sprintf ( s, "   version=\"6.0.0.0\"");
- 	s = s + sprintf ( s, "   processorArchitecture=\"x86\"");
- 	s = s + sprintf ( s, "   publicKeyToken=\"6595b64144ccf1df\"");
- 	s = s + sprintf ( s, "   language=\"*\"");
-	s = s + sprintf ( s, "   />");
-	s = s + sprintf ( s, "  </dependentAssembly>");
-	s = s + sprintf ( s, " </dependency>");
-	s = s + sprintf ( s, "</assembly>");
+	s = s + sprintf ( s, " <dependency>\n");
+	s = s + sprintf ( s, "  <dependentAssembly>\n");
+ 	s = s + sprintf ( s, "  <assemblyIdentity\n");
+ 	s = s + sprintf ( s, "   type=\"win32\"\n");
+ 	s = s + sprintf ( s, "  
name=\"Microsoft.Windows.Common-Controls\"\n");
+ 	s = s + sprintf ( s, "   version=\"6.0.0.0\"\n");
+ 	s = s + sprintf ( s, "   processorArchitecture=\"x86\"\n");
+ 	s = s + sprintf ( s, "   publicKeyToken=\"6595b64144ccf1df\"\n");
+ 	s = s + sprintf ( s, "   language=\"*\"\n");
+	s = s + sprintf ( s, "   />\n");
+	s = s + sprintf ( s, "  </dependentAssembly>\n");
+	s = s + sprintf ( s, " </dependency>\n");
+	s = s + sprintf ( s, "</assembly>\n");
 
 	FileSupportCode::WriteIfChanged ( buf, NormalizeFilename (
Environment::GetIntermediatePath () + sSep + module.output->relative_path + sSep +
"manifest.xml" ) );
 

Modified: branches/rbuild/reactos/tools/rbuild/modulesresourcegenerator.cpp
URL:
http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/tools/rbuild/mod…
==============================================================================
--- branches/rbuild/reactos/tools/rbuild/modulesresourcegenerator.cpp (original)
+++ branches/rbuild/reactos/tools/rbuild/modulesresourcegenerator.cpp Sun Feb 24 14:57:58
2008
@@ -36,7 +36,6 @@
 	for ( size_t i = 0; i < project.modules.size (); i++ )
 	{
 		Module& module = *project.modules[i];
-
 		if (module.autoResource != NULL)
 		{
 			WriteResourceFile (module);

Modified: branches/rbuild/reactos/tools/rbuild/rbuild.h
URL:
http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/tools/rbuild/rbu…
==============================================================================
--- branches/rbuild/reactos/tools/rbuild/rbuild.h (original)
+++ branches/rbuild/reactos/tools/rbuild/rbuild.h Sun Feb 24 14:57:58 2008
@@ -106,7 +106,6 @@
 class CompilationUnit;
 class FileLocation;
 class AutoRegister;
-class ModulesResourceGenerator;
 class ModulesResourceGenerator;
 class CreditsGenerator;
 class SourceFileTest;
@@ -732,6 +731,7 @@
     std::string city;
     std::string country;
     std::string website;
+    std::string ircnick;
     bool active;
 
     Contributor ( const XMLElement& _node);
@@ -1051,9 +1051,6 @@
 private:
 	bool IsSupportedModuleType ( ModuleType type );
 	void Initialize();
-	//static std::string ReplaceVariable ( const std::string& name,
-	//                                     const std::string& value,
-	//                                     std::string path );
 };
 
 
@@ -1066,10 +1063,6 @@
 	CDFile ( const Project& project,
 	         const XMLElement& bootstrapNode,
 	         const std::string& path );
-//private:
-//	static std::string ReplaceVariable ( const std::string& name,
-//	                                     const std::string& value,
-//	                                     std::string path );
 };
 
 class BootstrapFile : public XmlNode
@@ -1081,10 +1074,6 @@
 	BootstrapFile ( const Project& project,
 	         const XMLElement& bootstrapNode,
 	         const std::string& path );
-//private:
-//	static std::string ReplaceVariable ( const std::string& name,
-//	                                     const std::string& value,
-//	                                     std::string path );
 };
 
 class InstallFile : public XmlNode