[ros-diffs] [hpoussin] 28118: Autogenerate syssetup.inf file in intermediate directory

[hpoussin at svn.reactos.org]

Author: hpoussin
Date: Fri Aug  3 13:41:42 2007
New Revision: 28118

URL: http://svn.reactos.org/svn/reactos?rev=28118&view=rev
Log:
Autogenerate syssetup.inf file in intermediate directory

Modified:
    trunk/reactos/media/inf/inf.rbuild
    trunk/reactos/tools/rbuild/installfile.cpp
    trunk/reactos/tools/rbuild/syssetupgenerator.cpp

Modified: trunk/reactos/media/inf/inf.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/inf.rbuild?rev=28118&r1=28117&r2=28118&view=diff
==============================================================================
--- trunk/reactos/media/inf/inf.rbuild (original)
+++ trunk/reactos/media/inf/inf.rbuild Fri Aug  3 13:41:42 2007
@@ -14,7 +14,7 @@
 <installfile base="inf">nettcpip.inf</installfile>
 <installfile base="inf">ports.inf</installfile>
 <installfile base="inf">scsi.inf</installfile>
-<installfile base="inf">syssetup.inf</installfile>
+<installfile base="inf" root="intermediate">syssetup.inf</installfile>
 <installfile base="inf">usbport.inf</installfile>
 <installfile base="inf">usbstor.inf</installfile>
 <installfile base="inf">xboxdisp.inf</installfile>

Modified: trunk/reactos/tools/rbuild/installfile.cpp
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/installfile.cpp?rev=28118&r1=28117&r2=28118&view=diff
==============================================================================
--- trunk/reactos/tools/rbuild/installfile.cpp (original)
+++ trunk/reactos/tools/rbuild/installfile.cpp Fri Aug  3 13:41:42 2007
@@ -23,8 +23,8 @@
 using std::string;
 
 InstallFile::InstallFile ( const Project& project_,
-	                       const XMLElement& installfileNode,
-	                       const string& path )
+                           const XMLElement& installfileNode,
+                           const string& path )
 	: project ( project_ ),
 	  node ( installfileNode )
 {
@@ -40,7 +40,24 @@
 	else
 		newname = node.value;
 	name = node.value;
-	this->path = path;
+
+	att = node.GetAttribute ( "root", false );
+	if ( att != NULL)
+	{
+		if ( att->value == "intermediate" )
+			this->path = Environment::GetIntermediatePath () + sSep + path;
+		else if ( att->value == "output" )
+			this->path = Environment::GetOutputPath () + sSep + path;
+		else
+		{
+			throw InvalidAttributeValueException (
+				node.location,
+				"root",
+				att->value );
+		}
+	}
+	else
+		this->path = path;
 }
 
 InstallFile::~InstallFile ()

Modified: trunk/reactos/tools/rbuild/syssetupgenerator.cpp
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/syssetupgenerator.cpp?rev=28118&r1=28117&r2=28118&view=diff
==============================================================================
--- trunk/reactos/tools/rbuild/syssetupgenerator.cpp (original)
+++ trunk/reactos/tools/rbuild/syssetupgenerator.cpp Fri Aug  3 13:41:42 2007
@@ -39,7 +39,7 @@
 	unsigned long errorLine;
 
 	string syssetupTemplate = "media" + sSep + "inf" + sSep + "syssetup.inf.tpl";
-	string syssetup = "media" + sSep + "inf" + sSep + "syssetup.inf";
+	string syssetup = Environment::GetIntermediatePath() + sSep + "media" + sSep + "inf" + sSep + "syssetup.inf";
 
 	if ( 0 != InfHostOpenFile ( &inf, syssetupTemplate.c_str (), &errorLine ) )
 		throw new FileNotFoundException ( syssetupTemplate );