[ros-diffs] [mpiulachs] 32480: - remove AutoManifest element, manifest generation has to be implemented in a different more complex way to fully support msvc 8.0

[mpiulachs at svn.reactos.org]

Author: mpiulachs
Date: Mon Feb 25 17:50:21 2008
New Revision: 32480

URL: http://svn.reactos.org/svn/reactos?rev=32480&view=rev
Log:
- remove AutoManifest element, manifest generation has to be implemented in a different more complex way to fully support msvc 8.0

Modified:
    branches/rbuild/reactos/tools/rbuild/linkerscript.cpp
    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/linkerscript.cpp
URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/tools/rbuild/linkerscript.cpp?rev=32480&r1=32479&r2=32480&view=diff
==============================================================================
--- branches/rbuild/reactos/tools/rbuild/linkerscript.cpp (original)
+++ branches/rbuild/reactos/tools/rbuild/linkerscript.cpp Mon Feb 25 17:50:21 2008
@@ -48,18 +48,6 @@
 {
 }
 
-AutoManifest::AutoManifest ( const XMLElement& node_,
-                             const Module& module_,
-                             const FileLocation& file_ )
-	: node(node_), module(module_), file(file_)
-{
-}
-
-void
-AutoManifest::ProcessXML()
-{
-}
-
 InstallComponent::InstallComponent ( const XMLElement& node_,
                              const Module& module_,
                              const FileLocation& file_ )

Modified: branches/rbuild/reactos/tools/rbuild/module.cpp
URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/tools/rbuild/module.cpp?rev=32480&r1=32479&r2=32480&view=diff
==============================================================================
--- branches/rbuild/reactos/tools/rbuild/module.cpp (original)
+++ branches/rbuild/reactos/tools/rbuild/module.cpp Mon Feb 25 17:50:21 2008
@@ -248,7 +248,6 @@
 	  pch (NULL),
 	  cplusplus (false),
 	  host (HostDefault),
-	  autoManifest (NULL),
 	  autoResource (NULL),
       installComponent (NULL)
 {
@@ -763,35 +762,6 @@
 			string dir = e.value.substr ( 0, pos );
 			string name = e.value.substr ( pos + 1);
 			autoResource = new AutoResource (
-				e, *this, FileLocation ( SourceDirectory, relative_path + sSep + dir, name, &e ) );
-		}
-		subs_invalid = true;
-	}
-	else if ( e.name == "automanifest" )
-	{
-		if ( parseContext.ifData )
-		{
-			throw XMLInvalidBuildFileException (
-				e.location,
-				"<automanifest> is not a valid sub-element of <if>" );
-		}
-		if ( autoManifest )
-		{
-			throw XMLInvalidBuildFileException (
-				e.location,
-				"Only one <automanifest> is valid per module" );
-		}
-		size_t pos = e.value.find_last_of ( "/\\" );
-		if ( pos == string::npos )
-		{
-			autoManifest = new AutoManifest (
-				e, *this, FileLocation ( SourceDirectory, relative_path, e.value, &e ) );
-		}
-		else
-		{
-			string dir = e.value.substr ( 0, pos );
-			string name = e.value.substr ( pos + 1);
-			autoManifest = new AutoManifest (
 				e, *this, FileLocation ( SourceDirectory, relative_path + sSep + dir, name, &e ) );
 		}
 		subs_invalid = true;

Modified: branches/rbuild/reactos/tools/rbuild/modulesmanifestgenerator.cpp
URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/tools/rbuild/modulesmanifestgenerator.cpp?rev=32480&r1=32479&r2=32480&view=diff
==============================================================================
--- branches/rbuild/reactos/tools/rbuild/modulesmanifestgenerator.cpp (original)
+++ branches/rbuild/reactos/tools/rbuild/modulesmanifestgenerator.cpp Mon Feb 25 17:50:21 2008
@@ -33,14 +33,7 @@
 void
 ModulesManifestGenerator::Generate ()
 {
-	for ( size_t i = 0; i < project.modules.size (); i++ )
-	{
-		Module& module = *project.modules[i];
-		if (module.autoManifest != NULL)
-		{
-			WriteManifestFile (module);
-		}
-	}
+    /* Don't do anything for now */
 }
 
 void

Modified: branches/rbuild/reactos/tools/rbuild/modulesresourcegenerator.cpp
URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/tools/rbuild/modulesresourcegenerator.cpp?rev=32480&r1=32479&r2=32480&view=diff
==============================================================================
--- branches/rbuild/reactos/tools/rbuild/modulesresourcegenerator.cpp (original)
+++ branches/rbuild/reactos/tools/rbuild/modulesresourcegenerator.cpp Mon Feb 25 17:50:21 2008
@@ -77,11 +77,13 @@
 	s = s + sprintf ( s, "#include <reactos/version.rc>\n");
 	s = s + sprintf ( s, "\n" );
 
-	if (module.autoManifest != NULL)
+    /*
+    if (module.visualStyles != NULL)
 	{
 		s = s + sprintf ( s, "1 24 DISCARDABLE \"manifest.xml\"\n");
 		s = s + sprintf ( s, "\n" );
 	}
+    */
 
 	/* Include resources for module localizations */
 	for ( size_t i = 0; i < module.localizations.size (); i++ )

Modified: branches/rbuild/reactos/tools/rbuild/rbuild.h
URL: http://svn.reactos.org/svn/reactos/branches/rbuild/reactos/tools/rbuild/rbuild.h?rev=32480&r1=32479&r2=32480&view=diff
==============================================================================
--- branches/rbuild/reactos/tools/rbuild/rbuild.h (original)
+++ branches/rbuild/reactos/tools/rbuild/rbuild.h Mon Feb 25 17:50:21 2008
@@ -114,7 +114,6 @@
 class Contributor;
 class Localization;
 class Author;
-class AutoManifest;
 class AutoResource;
 class InstallComponent;
 class InstallFolder;
@@ -440,7 +439,6 @@
 	FileLocation *output; // "path/foo.exe"
 	FileLocation *dependency; // "path/foo.exe" or "path/libfoo.a"
 	FileLocation *install;
-	AutoManifest* autoManifest;	
 	AutoResource* autoResource;
     InstallComponent* installComponent;
 
@@ -652,20 +650,6 @@
     bool IsSupportedModuleType ( ModuleType type );
 	Family ( const XMLElement& node ,
 	             const Module& _module );
-
-	void ProcessXML();
-};
-
-class AutoManifest
-{
-	const XMLElement& node;
-public:
-	const Module& module;
-	FileLocation file;
-
-	AutoManifest ( const XMLElement& node,
-	               const Module& module,
-	               const FileLocation& file );
 
 	void ProcessXML();
 };