[ros-diffs] [mpiulachs] 29927: Fix/Update the medatada element based on Colin's suggestions (part 1)

Author: mpiulachs
Date: Sun Oct 28 03:12:20 2007
New Revision: 29927

URL: http://svn.reactos.org/svn/reactos?rev=29927&view=rev
Log:
Fix/Update the medatada element based on Colin's suggestions (part 1)

Modified:
    branches/rbuild/reactos/tools/rbuild/backend/versionreport/versionreport.cpp
    branches/rbuild/reactos/tools/rbuild/module.cpp
    branches/rbuild/reactos/tools/rbuild/rbuild.h

Modified: branches/rbuild/reactos/tools/rbuild/backend/versionreport/versionreport.cpp
URL:
http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/tools/rbuild/bac…
==============================================================================
--- branches/rbuild/reactos/tools/rbuild/backend/versionreport/versionreport.cpp
(original)
+++ branches/rbuild/reactos/tools/rbuild/backend/versionreport/versionreport.cpp Sun Oct
28 03:12:20 2007
@@ -111,7 +111,7 @@
 					fprintf ( m_VReportFile, "\t\t<base>%s</base>\r\n",
module.output->relative_path.c_str () );
 					fprintf ( m_VReportFile, "\t\t<version>%s</version>\r\n",
module.metadata->version.c_str () );
 					fprintf ( m_VReportFile, "\t\t<date>%s</date>\r\n",
module.metadata->date.c_str () );
-					fprintf ( m_VReportFile, "\t\t<owner>%s</owner>\r\n",
module.metadata->owner.c_str () );
+                    fprintf ( m_VReportFile,
"\t\t<license>%s</license>\r\n", module.metadata->license.c_str
() );
 					fprintf ( m_VReportFile, "\t</component>\r\n" );
 				}
 			}

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 Oct 28 03:12:20 2007
@@ -1795,12 +1795,12 @@
 	else
 		version = "";
 
-	/* The module copyright */
-	att = _node.GetAttribute ( "copyright", false );
+	/* The module license */
+	att = _node.GetAttribute ( "license", false );
 	if (att != NULL)
-		copyright = att->value;
-	else
-		copyright = "";
+		license = att->value;
+	else
+		license = "";
 
 	att = _node.GetAttribute ( "url", false );
 	if (att != NULL)
@@ -1814,13 +1814,6 @@
 		date = att->value;
 	else
 		date = "?";
-
-	/* When was this module updated */
-	att = _node.GetAttribute ( "owner", false );
-	if (att != NULL)
-		owner = att->value;
-	else
-		owner = "ReactOS";
 }
 
 

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 Oct 28 03:12:20 2007
@@ -572,10 +572,9 @@
 	std::string name;
 	std::string description;
 	std::string version;
-	std::string copyright;
+	std::string license;
 	std::string url;
 	std::string date;
-	std::string owner;
 
 	Metadata ( const XMLElement& _node,
 	          const Module& _module );