[hpoussin] 29103: Remove rbuild stdlib="host" attribute. That was a workaround to build system deficiency. Now, base the workaround on presence of C++ files in module
Author: hpoussin Date: Wed Sep 19 15:11:57 2007 New Revision: 29103
URL: http://svn.reactos.org/svn/reactos?rev=29103&view=rev Log: Remove rbuild stdlib="host" attribute. That was a workaround to build system deficiency. Now, base the workaround on presence of C++ files in module
Modified: trunk/reactos/base/applications/games/solitaire/solitaire.rbuild trunk/reactos/base/applications/network/telnet/telnet.rbuild trunk/reactos/base/shell/explorer/explorer.rbuild trunk/reactos/dll/win32/glu32/glu32.rbuild trunk/reactos/dll/win32/usp10/usp10.rbuild trunk/reactos/tools/rbuild/backend/codeblocks/codeblocks.cpp trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h trunk/reactos/tools/rbuild/module.cpp trunk/reactos/tools/rbuild/project.dtd trunk/reactos/tools/rbuild/rbuild.h
Modified: trunk/reactos/base/applications/games/solitaire/solitaire.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/sol... ============================================================================== --- trunk/reactos/base/applications/games/solitaire/solitaire.rbuild (original) +++ trunk/reactos/base/applications/games/solitaire/solitaire.rbuild Wed Sep 19 15:11:57 2007 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> -<module name="sol" type="win32gui" installbase="system32" installname="sol.exe" unicode="no" allowwarnings="true" stdlib="host"> +<module name="sol" type="win32gui" installbase="system32" installname="sol.exe" unicode="no" allowwarnings="true"> <include base="sol">.</include> <include base="sol">cardlib</include> <linkerflag>-lstdc++</linkerflag>
Modified: trunk/reactos/base/applications/network/telnet/telnet.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/t... ============================================================================== --- trunk/reactos/base/applications/network/telnet/telnet.rbuild (original) +++ trunk/reactos/base/applications/network/telnet/telnet.rbuild Wed Sep 19 15:11:57 2007 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> -<module name="telnet" type="win32cui" installbase="system32" installname="telnet.exe" allowwarnings ="true" stdlib="host"> +<module name="telnet" type="win32cui" installbase="system32" installname="telnet.exe" allowwarnings ="true"> <include base="telnet">.</include> <define name="__USE_W32API" /> <define name="__REACTOS__" />
Modified: trunk/reactos/base/shell/explorer/explorer.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explore... ============================================================================== --- trunk/reactos/base/shell/explorer/explorer.rbuild (original) +++ trunk/reactos/base/shell/explorer/explorer.rbuild Wed Sep 19 15:11:57 2007 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd"> <group xmlns:xi="http://www.w3.org/2001/XInclude"> -<module name="explorer" type="win32gui" installname="explorer.exe" allowwarnings="true" stdlib="host" usewrc="false"> +<module name="explorer" type="win32gui" installname="explorer.exe" allowwarnings="true" usewrc="false"> <linkerflag>-fexceptions</linkerflag> <include base="explorer">.</include> <define name="__USE_W32API" />
Modified: trunk/reactos/dll/win32/glu32/glu32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/glu32/glu32.rbuil... ============================================================================== --- trunk/reactos/dll/win32/glu32/glu32.rbuild (original) +++ trunk/reactos/dll/win32/glu32/glu32.rbuild Wed Sep 19 15:11:57 2007 @@ -1,4 +1,4 @@ -<module name="glu32" type="win32dll" entrypoint="0" baseaddress="${BASEADDRESS_GLU32}" installbase="system32" installname="glu32.dll" allowwarnings="true" stdlib="host"> +<module name="glu32" type="win32dll" entrypoint="0" baseaddress="${BASEADDRESS_GLU32}" installbase="system32" installname="glu32.dll" allowwarnings="true"> <importlibrary definition="glu32.def" /> <include base="glu32">include</include> <include base="glu32">libnurbs/internals</include> @@ -17,7 +17,7 @@ <library>msvcrt</library> <directory name="libnurbs"> <directory name="interface"> - <file>bezierEval.cc</file> + <file>bezierEval.cc</file> <file>bezierPatch.cc</file> <file>bezierPatchMesh.cc</file> <file>glcurveval.cc</file>
Modified: trunk/reactos/dll/win32/usp10/usp10.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/usp10.rbuil... ============================================================================== --- trunk/reactos/dll/win32/usp10/usp10.rbuild (original) +++ trunk/reactos/dll/win32/usp10/usp10.rbuild Wed Sep 19 15:11:57 2007 @@ -1,4 +1,4 @@ -<module name="usp10" type="win32dll" entrypoint="0" installbase="system32" installname="usp10.dll" allowwarnings ="true" stdlib="host"> +<module name="usp10" type="win32dll" entrypoint="0" installbase="system32" installname="usp10.dll" allowwarnings ="true"> <importlibrary definition="usp10.spec.def" /> <include base="usp10">.</include> <include base="ReactOS">include/reactos/wine</include>
Modified: trunk/reactos/tools/rbuild/backend/codeblocks/codeblocks.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/codebl... ============================================================================== --- trunk/reactos/tools/rbuild/backend/codeblocks/codeblocks.cpp (original) +++ trunk/reactos/tools/rbuild/backend/codeblocks/codeblocks.cpp Wed Sep 19 15:11:57 2007 @@ -625,7 +625,7 @@ } else { - fprintf ( OUT, "\t\t\t\t\t<Add option="%s" />\r\n", module.useHostStdlib ? "-nostartfiles" : "-nostartfiles -Wl,--nostdlib" ); + fprintf ( OUT, "\t\t\t\t\t<Add option="%s" />\r\n", module.cplusplus ? "-nostartfiles" : "-nostartfiles -Wl,--nostdlib" ); fprintf ( OUT, "\t\t\t\t\t<Add library="gcc" />\r\n" ); } } @@ -641,7 +641,7 @@ else if ( module.type == NativeDLL) fprintf ( OUT, "\t\t\t\t\t<Add option="-nostartfiles -Wl,--shared" />\r\n" );
- fprintf ( OUT, "\t\t\t\t\t<Add option="%s" />\r\n", module.useHostStdlib ? "-nostartfiles" : "-nostartfiles -Wl,--nostdlib" ); + fprintf ( OUT, "\t\t\t\t\t<Add option="%s" />\r\n", module.cplusplus ? "-nostartfiles" : "-nostartfiles -Wl,--nostdlib" ); fprintf ( OUT, "\t\t\t\t\t<Add library="gcc" />\r\n" ); }
Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw/... ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h Wed Sep 19 15:11:57 2007 @@ -330,7 +330,7 @@ MingwWin32DLLModuleHandler ( const Module& module ); virtual HostType DefaultHost() { return HostFalse; } virtual void Process (); - std::string TypeSpecificLinkerFlags() { return module.useHostStdlib ? "-nostartfiles -lgcc" : "-nostartfiles -nostdlib -lgcc"; } + std::string TypeSpecificLinkerFlags() { return module.cplusplus ? "-nostartfiles -lgcc" : "-nostartfiles -nostdlib -lgcc"; } void AddImplicitLibraries ( Module& module ); private: void GenerateWin32DLLModuleTarget (); @@ -343,7 +343,7 @@ MingwWin32OCXModuleHandler ( const Module& module ); virtual HostType DefaultHost() { return HostFalse; } virtual void Process (); - std::string TypeSpecificLinkerFlags() { return module.useHostStdlib ? "-nostartfiles -lgcc" : "-nostartfiles -nostdlib -lgcc"; } + std::string TypeSpecificLinkerFlags() { return module.cplusplus ? "-nostartfiles -lgcc" : "-nostartfiles -nostdlib -lgcc"; } void AddImplicitLibraries ( Module& module ); private: void GenerateWin32OCXModuleTarget (); @@ -356,7 +356,7 @@ MingwWin32CUIModuleHandler ( const Module& module ); virtual HostType DefaultHost() { return HostFalse; } virtual void Process (); - std::string TypeSpecificLinkerFlags() { return module.useHostStdlib ? "-nostartfiles -lgcc" : "-nostartfiles -nostdlib -lgcc"; } + std::string TypeSpecificLinkerFlags() { return module.cplusplus ? "-nostartfiles -lgcc" : "-nostartfiles -nostdlib -lgcc"; } void AddImplicitLibraries ( Module& module ); private: void GenerateWin32CUIModuleTarget (); @@ -369,7 +369,7 @@ MingwWin32GUIModuleHandler ( const Module& module ); virtual HostType DefaultHost() { return HostFalse; } virtual void Process (); - std::string TypeSpecificLinkerFlags() { return module.useHostStdlib ? "-nostartfiles -lgcc" : "-nostartfiles -nostdlib -lgcc"; } + std::string TypeSpecificLinkerFlags() { return module.cplusplus ? "-nostartfiles -lgcc" : "-nostartfiles -nostdlib -lgcc"; } void AddImplicitLibraries ( Module& module ); private: void GenerateWin32GUIModuleTarget ();
Modified: trunk/reactos/tools/rbuild/module.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/module.cpp?rev... ============================================================================== --- trunk/reactos/tools/rbuild/module.cpp (original) +++ trunk/reactos/tools/rbuild/module.cpp Wed Sep 19 15:11:57 2007 @@ -297,25 +297,6 @@ } else isUnicode = false; - - att = moduleNode.GetAttribute ( "stdlib", false ); - if ( att != NULL ) - { - const char* p = att->value.c_str(); - if ( !stricmp ( p, "host" ) ) - useHostStdlib = true; - else if ( !stricmp ( p, "default" ) ) - useHostStdlib = false; - else - { - throw InvalidAttributeValueException ( - moduleNode.location, - "stdlib", - att->value ); - } - } - else - useHostStdlib = false;
if (isUnicode) {
Modified: trunk/reactos/tools/rbuild/project.dtd URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/project.dtd?re... ============================================================================== --- trunk/reactos/tools/rbuild/project.dtd (original) +++ trunk/reactos/tools/rbuild/project.dtd Wed Sep 19 15:11:57 2007 @@ -127,7 +127,6 @@ allowwarnings (true|false) "false" aliasof %Text; #IMPLIED unicode (true|yes|false|no) "no" - stdlib (host) #IMPLIED isstartuplib (true) #IMPLIED buildtype %Text; #FIXED "OFWLDR"
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 Wed Sep 19 15:11:57 2007 @@ -357,7 +357,6 @@ bool useWRC; bool allowWarnings; bool enabled; - bool useHostStdlib; bool isStartupLib; FileLocation *output; // "path/foo.exe" FileLocation *dependency; // "path/foo.exe" or "path/libfoo.a"
-
hpoussin＠svn.reactos.org