[hpoussin] 29377: Remove usewrc attribute in rbuild files ; wrc should be able to compile all resources
Author: hpoussin Date: Wed Oct 3 18:09:45 2007 New Revision: 29377
URL: http://svn.reactos.org/svn/reactos?rev=29377&view=rev Log: Remove usewrc attribute in rbuild files ; wrc should be able to compile all resources
Modified: trunk/reactos/Makefile trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp trunk/reactos/tools/rbuild/module.cpp trunk/reactos/tools/rbuild/project.dtd trunk/reactos/tools/rbuild/rbuild.h
Modified: trunk/reactos/Makefile URL: http://svn.reactos.org/svn/reactos/trunk/reactos/Makefile?rev=29377&r1=2... ============================================================================== --- trunk/reactos/Makefile (original) +++ trunk/reactos/Makefile Wed Oct 3 18:09:45 2007 @@ -298,7 +298,6 @@ objcopy = $(Q)$(PREFIX_)objcopy dlltool = $(Q)$(PREFIX_)dlltool strip = $(Q)$(PREFIX_)strip -windres = $(Q)$(PREFIX_)windres
# Set utilities ifeq ($(OSTYPE),msys)
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 Wed Oct 3 18:09:45 2007 @@ -1095,55 +1095,39 @@
const FileLocation *objectFilename = GetObjectFilename ( sourceFile, &clean_files );
- if ( module.useWRC ) - { - string sourceFilenamePart = module.name + "." + ReplaceExtension ( sourceFile->name, "" ); - FileLocation rciFilename ( TemporaryDirectory, - "", - sourceFilenamePart + ".rci.tmp" ); - FileLocation resFilename ( TemporaryDirectory, - "", - sourceFilenamePart + ".res.tmp" ); - - fprintf ( fMakefile, - "%s: %s $(WRC_TARGET) | %s\n", - backend->GetFullName ( *objectFilename ).c_str (), - dependencies.c_str (), - backend->GetFullPath ( *objectFilename ).c_str () ); - fprintf ( fMakefile, "\t$(ECHO_WRC)\n" ); - fprintf ( fMakefile, - "\t${gcc} -xc -E -DRC_INVOKED ${%s} %s > %s\n", - windresflagsMacro.c_str (), - backend->GetFullName ( *sourceFile ).c_str (), - backend->GetFullName ( rciFilename ).c_str () ); - fprintf ( fMakefile, - "\t$(Q)$(WRC_TARGET) ${%s} %s %s\n", - windresflagsMacro.c_str (), - backend->GetFullName ( rciFilename ).c_str (), - backend->GetFullName ( resFilename ).c_str () ); - fprintf ( fMakefile, - "\t-@${rm} %s 2>$(NUL)\n", - backend->GetFullName ( rciFilename ).c_str () ); - fprintf ( fMakefile, - "\t${windres} %s -o $@\n", - backend->GetFullName ( resFilename ).c_str () ); - fprintf ( fMakefile, - "\t-@${rm} %s 2>$(NUL)\n", - backend->GetFullName ( resFilename ).c_str () ); - } - else - { - fprintf ( fMakefile, - "%s: %s $(WRC_TARGET) | %s\n", - backend->GetFullName ( *objectFilename ).c_str (), - dependencies.c_str (), - backend->GetFullPath ( *objectFilename ).c_str () ); - fprintf ( fMakefile, "\t$(ECHO_WRC)\n" ); - fprintf ( fMakefile, - "\t${windres} $(%s) %s -o $@\n", - windresflagsMacro.c_str (), - backend->GetFullName ( *sourceFile ).c_str () ); - } + string sourceFilenamePart = module.name + "." + ReplaceExtension ( sourceFile->name, "" ); + FileLocation rciFilename ( TemporaryDirectory, + "", + sourceFilenamePart + ".rci.tmp" ); + FileLocation resFilename ( TemporaryDirectory, + "", + sourceFilenamePart + ".res.tmp" ); + + fprintf ( fMakefile, + "%s: %s $(WRC_TARGET) | %s\n", + backend->GetFullName ( *objectFilename ).c_str (), + dependencies.c_str (), + backend->GetFullPath ( *objectFilename ).c_str () ); + fprintf ( fMakefile, "\t$(ECHO_WRC)\n" ); + fprintf ( fMakefile, + "\t${gcc} -xc -E -DRC_INVOKED ${%s} %s > %s\n", + windresflagsMacro.c_str (), + backend->GetFullName ( *sourceFile ).c_str (), + backend->GetFullName ( rciFilename ).c_str () ); + fprintf ( fMakefile, + "\t$(Q)$(WRC_TARGET) ${%s} %s %s\n", + windresflagsMacro.c_str (), + backend->GetFullName ( rciFilename ).c_str (), + backend->GetFullName ( resFilename ).c_str () ); + fprintf ( fMakefile, + "\t-@${rm} %s 2>$(NUL)\n", + backend->GetFullName ( rciFilename ).c_str () ); + fprintf ( fMakefile, + "\t${windres} %s -o $@\n", + backend->GetFullName ( resFilename ).c_str () ); + fprintf ( fMakefile, + "\t-@${rm} %s 2>$(NUL)\n", + backend->GetFullName ( resFilename ).c_str () ); }
void
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 Oct 3 18:09:45 2007 @@ -414,12 +414,6 @@ } else install = NULL; - - att = moduleNode.GetAttribute ( "usewrc", false ); - if ( att != NULL ) - useWRC = att->value == "true"; - else - useWRC = true;
att = moduleNode.GetAttribute ( "allowwarnings", false ); if ( att == NULL )
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 Oct 3 18:09:45 2007 @@ -123,7 +123,6 @@ underscoresymbols (true|yes|false|no) "no" installbase %Text; #IMPLIED installname %Text; #IMPLIED - usewrc %Text; #IMPLIED allowwarnings (true|false) "false" aliasof %Text; #IMPLIED unicode (true|yes|false|no) "no"
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 Oct 3 18:09:45 2007 @@ -355,7 +355,6 @@ std::string prefix; HostType host; std::string aliasedModuleName; - bool useWRC; bool allowWarnings; bool enabled; bool isStartupLib;
-
hpoussin＠svn.reactos.org