Author: weiden Date: Mon Jun 25 21:56:54 2007 New Revision: 27276
URL: http://svn.reactos.org/svn/reactos?rev=27276&view=rev Log: Fix the build system, accidently broke it with r27269
Modified: trunk/reactos/ReactOS.rbuild trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.ocx.rbuild trunk/reactos/dll/win32/ole32/ole32.rbuild trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp trunk/reactos/tools/rbuild/include.cpp trunk/reactos/tools/rbuild/rbuild.h
Modified: trunk/reactos/ReactOS.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS.rbuild?rev=27276&am... ============================================================================== --- trunk/reactos/ReactOS.rbuild (original) +++ trunk/reactos/ReactOS.rbuild Mon Jun 25 21:56:54 2007 @@ -62,7 +62,7 @@ <include>.</include> <include>include</include> <include>include/psdk</include> - <include base="__intermediate">include/psdk</include> + <include root="intermediate">include/psdk</include> <include>include/dxsdk</include> <include>include/crt</include> <include>include/ddk</include>
Modified: trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.ocx.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/hhctrl... ============================================================================== --- trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.ocx.rbuild (original) +++ trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.ocx.rbuild Mon Jun 25 21:56:54 2007 @@ -2,6 +2,7 @@ <importlibrary definition="hhctrl.ocx.spec.def" /> <include base="hhctrl">.</include> <include base="ReactOS">include/reactos/wine</include> + <include base="ReactOS" root="intermediate">include/reactos/wine</include> <define name="__REACTOS__" /> <define name="__WINESRC__" /> <define name="__USE_W32API" />
Modified: trunk/reactos/dll/win32/ole32/ole32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/ole32.rbuil... ============================================================================== --- trunk/reactos/dll/win32/ole32/ole32.rbuild (original) +++ trunk/reactos/dll/win32/ole32/ole32.rbuild Mon Jun 25 21:56:54 2007 @@ -2,6 +2,7 @@ <autoregister infsection="OleControlDlls" type="DllRegisterServer" /> <importlibrary definition="ole32.spec.def" /> <include base="ole32">.</include> + <include base="ole32" root="intermediate">.</include> <include base="ReactOS">include/reactos/wine</include> <define name="__REACTOS__" /> <define name="__WINESRC__" />
Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw/... ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Mon Jun 25 21:56:54 2007 @@ -684,9 +684,9 @@ Include& include = *includes[i]; if ( parameters.length () > 0 ) parameters += " "; - if ( include.baseValue == "__intermediate" ) + if ( include.root == "intermediate" ) path_prefix = backend->intermediateDirectory->name + cSep; - else if (include.baseValue == "__output" ) + else if (include.root == "output" ) path_prefix = backend->outputDirectory->name + cSep; else path_prefix = ""; @@ -797,7 +797,7 @@ for ( i = 0; i < data.includes.size(); i++ ) { const Include& include = *data.includes[i]; - string includeDirectory; + string includeDirectory, path_prefix; if ( include.baseModule != NULL && ( include.baseModule->type == RpcServer || include.baseModule->type == RpcClient || @@ -806,9 +806,18 @@ backend->intermediateDirectory ); else includeDirectory = include.directory; + + if ( include.root == "intermediate" ) + path_prefix = backend->intermediateDirectory->name + cSep; + else if (include.root == "output" ) + path_prefix = backend->outputDirectory->name + cSep; + else + path_prefix = ""; + fprintf ( fMakefile, - " -I%s", + " -I%s%s", + path_prefix.c_str(), includeDirectory.c_str() ); } for ( i = 0; i < data.defines.size(); i++ )
Modified: trunk/reactos/tools/rbuild/include.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/include.cpp?re... ============================================================================== --- trunk/reactos/tools/rbuild/include.cpp (original) +++ trunk/reactos/tools/rbuild/include.cpp Mon Jun 25 21:56:54 2007 @@ -52,7 +52,6 @@ { this->directory = NormalizeFilename ( basePath + sSep + directory ); this->basePath = NormalizeFilename ( basePath ); - this->baseValue = basePath; }
Include::~Include () @@ -67,18 +66,12 @@ if ( att ) { bool referenceResolved = false; - baseValue = att->value;
if ( !module ) { - if ( att->value == "__intermediate" || att->value == "__output" ) - referenceResolved = true; - else - { - throw XMLInvalidBuildFileException ( - node->location, - "'base' attribute illegal from global <include>" ); - } + throw XMLInvalidBuildFileException ( + node->location, + "'base' attribute illegal from global <include>" ); }
if ( !referenceResolved ) @@ -109,4 +102,18 @@ } else directory = NormalizeFilename ( node->value ); + + att = node->GetAttribute ( "root", false ); + if ( att ) + { + if ( att->value != "intermediate" && att->value != "output" ) + { + throw InvalidAttributeValueException ( + node->location, + "root", + att->value ); + } + + root = att->value; + } }
Modified: trunk/reactos/tools/rbuild/rbuild.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/rbuild.h?rev=2... ============================================================================== --- trunk/reactos/tools/rbuild/rbuild.h (original) +++ trunk/reactos/tools/rbuild/rbuild.h Mon Jun 25 21:56:54 2007 @@ -366,7 +366,7 @@ const Module* baseModule; std::string directory; std::string basePath; - std::string baseValue; + std::string root;
Include ( const Project& project, const XMLElement* includeNode );
-
weiden＠svn.reactos.org