[ros-diffs] [cfinck] 31836: Get rid of bin2res and all rbuild stuff associated with it. We don't need it anymore after the latest winesyncs. This also requires adding an '<include base="stdole2" root="intermediate">.</include>' line to stdole2.rbuild, because previously this include directory was automatically added when processing Wine modules. This is already done for similar modules like "msi".
cfinck at svn.reactos.org
cfinck at svn.reactos.org
Thu Jan 17 01:35:44 CET 2008
Author: cfinck
Date: Thu Jan 17 03:35:44 2008
New Revision: 31836
URL: http://svn.reactos.org/svn/reactos?rev=31836&view=rev
Log:
Get rid of bin2res and all rbuild stuff associated with it. We don't need it anymore after the latest winesyncs.
This also requires adding an '<include base="stdole2" root="intermediate">.</include>' line to stdole2.rbuild, because previously this include directory was automatically added when processing Wine modules.
This is already done for similar modules like "msi".
Removed:
trunk/reactos/tools/bin2res/
trunk/reactos/tools/rbuild/wineresource.cpp
Modified:
trunk/reactos/dll/win32/stdole2.tlb/stdole2.rbuild
trunk/reactos/media/doc/README.WINE
trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp
trunk/reactos/tools/rbuild/backend/mingw/mingw.h
trunk/reactos/tools/rbuild/rbuild.h
trunk/reactos/tools/rbuild/rbuild.mak
trunk/reactos/tools/rbuild/rbuild.vcproj
trunk/reactos/tools/tools.mak
Modified: trunk/reactos/dll/win32/stdole2.tlb/stdole2.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/stdole2.tlb/stdole2.rbuild?rev=31836&r1=31835&r2=31836&view=diff
==============================================================================
--- trunk/reactos/dll/win32/stdole2.tlb/stdole2.rbuild (original)
+++ trunk/reactos/dll/win32/stdole2.tlb/stdole2.rbuild Thu Jan 17 03:35:44 2008
@@ -11,6 +11,7 @@
<module name="stdole2" type="win32dll" extension=".tlb" installbase="system32" installname="stdole2.tlb">
<importlibrary definition="stdole2.tlb.spec.def" />
<include base="stdole2">.</include>
+ <include base="stdole2" root="intermediate">.</include>
<include base="ReactOS">include/reactos/wine</include>
<dependency>std_ole_v2</dependency>
<define name="__WINESRC__" />
Modified: trunk/reactos/media/doc/README.WINE
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=31836&r1=31835&r2=31836&view=diff
==============================================================================
--- trunk/reactos/media/doc/README.WINE (original)
+++ trunk/reactos/media/doc/README.WINE Thu Jan 17 03:35:44 2008
@@ -23,7 +23,6 @@
reactos/tools/unicode # Synced to Wine-0_9_5
reactos/tools/wpp # Synced to Wine-0_9_5
-reactos/tools/bin2res # Resource to binary converter
reactos/tools/winebuild # Synced to Wine-20071217
reactos/tools/wmc # Synced to Wine-20071201
reactos/tools/wrc # Synced to Wine-0_9_53
Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp?rev=31836&r1=31835&r2=31836&view=diff
==============================================================================
--- trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp (original)
+++ trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp Thu Jan 17 03:35:44 2008
@@ -334,7 +334,6 @@
GenerateHeader ();
GenerateGlobalVariables ();
GenerateXmlBuildFilesMacro ();
- UnpackWineResources ();
ProcessModules ();
GenerateInstallTarget ();
GenerateTestTarget ();
@@ -677,22 +676,6 @@
fprintf ( fMakefile, "\n" );
}
-string
-MingwBackend::GetBin2ResExecutable ()
-{
- return NormalizeFilename ( Environment::GetOutputPath () + sSep + "tools/bin2res/bin2res" + ExePostfix );
-}
-
-void
-MingwBackend::UnpackWineResources ()
-{
- printf ( "Unpacking WINE resources..." );
- WineResource wineResource ( ProjectNode,
- GetBin2ResExecutable () );
- wineResource.UnpackResources ( configuration.Verbose );
- printf ( "done\n" );
-}
-
void
MingwBackend::GenerateTestSupportCode ()
{
Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw/mingw.h?rev=31836&r1=31835&r2=31836&view=diff
==============================================================================
--- trunk/reactos/tools/rbuild/backend/mingw/mingw.h (original)
+++ trunk/reactos/tools/rbuild/backend/mingw/mingw.h Thu Jan 17 03:35:44 2008
@@ -79,8 +79,6 @@
void GenerateInitTarget () const;
void GenerateRegTestsRunTarget () const;
void GenerateXmlBuildFilesMacro() const;
- std::string GetBin2ResExecutable ();
- void UnpackWineResources ();
void GenerateTestSupportCode ();
void GenerateCompilationUnitSupportCode ();
void GenerateSysSetup ();
Modified: trunk/reactos/tools/rbuild/rbuild.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/rbuild.h?rev=31836&r1=31835&r2=31836&view=diff
==============================================================================
--- trunk/reactos/tools/rbuild/rbuild.h (original)
+++ trunk/reactos/tools/rbuild/rbuild.h Thu Jan 17 03:35:44 2008
@@ -89,7 +89,6 @@
class LinkerScript;
class Property;
class TestSupportCode;
-class WineResource;
class AutomaticDependency;
class Bootstrap;
class CDFile;
@@ -701,26 +700,6 @@
};
-class WineResource
-{
-public:
- const Project& project;
- std::string bin2res;
-
- WineResource ( const Project& project,
- std::string bin2res );
- ~WineResource ();
- void UnpackResources ( bool verbose );
-private:
- bool IsSpecFile ( const File& file );
- bool IsWineModule ( const Module& module );
- bool IsResourceFile ( const File& file );
- std::string GetResourceFilename ( const Module& module );
- void UnpackResourcesInModule ( Module& module,
- bool verbose );
-};
-
-
class SourceFile
{
public:
Modified: trunk/reactos/tools/rbuild/rbuild.mak
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/rbuild.mak?rev=31836&r1=31835&r2=31836&view=diff
==============================================================================
--- trunk/reactos/tools/rbuild/rbuild.mak (original)
+++ trunk/reactos/tools/rbuild/rbuild.mak Thu Jan 17 03:35:44 2008
@@ -264,7 +264,6 @@
stubbedcomponent.cpp \
syssetupgenerator.cpp \
testsupportcode.cpp \
- wineresource.cpp \
xmlnode.cpp \
)
Modified: trunk/reactos/tools/rbuild/rbuild.vcproj
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/rbuild.vcproj?rev=31836&r1=31835&r2=31836&view=diff
==============================================================================
--- trunk/reactos/tools/rbuild/rbuild.vcproj (original)
+++ trunk/reactos/tools/rbuild/rbuild.vcproj Thu Jan 17 03:35:44 2008
@@ -1045,30 +1045,6 @@
</FileConfiguration>
</File>
<File
- RelativePath="wineresource.cpp"
- >
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- BasicRuntimeChecks="3"
- />
- </FileConfiguration>
- </File>
- <File
RelativePath=".\xmlnode.cpp"
>
</File>
Removed: trunk/reactos/tools/rbuild/wineresource.cpp
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/wineresource.cpp?rev=31835&view=auto
==============================================================================
--- trunk/reactos/tools/rbuild/wineresource.cpp (original)
+++ trunk/reactos/tools/rbuild/wineresource.cpp (removed)
@@ -1,125 +1,0 @@
-/*
- * Copyright (C) 2005 Casper S. Hornstrup
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-#include "pch.h"
-#include <assert.h>
-
-#include "rbuild.h"
-
-using std::string;
-using std::vector;
-
-WineResource::WineResource ( const Project& project,
- string bin2res )
- : project ( project ),
- bin2res ( bin2res )
-{
-}
-
-WineResource::~WineResource ()
-{
-}
-
-bool
-WineResource::IsSpecFile ( const File& file )
-{
- string extension = GetExtension ( file.file );
- if ( extension == ".spec" || extension == ".SPEC" )
- return true;
- return false;
-}
-
-bool
-WineResource::IsWineModule ( const Module& module )
-{
- const vector<File*>& files = module.non_if_data.files;
- for ( size_t i = 0; i < files.size (); i++ )
- {
- if ( IsSpecFile ( *files[i] ) )
- return true;
- }
- return false;
-}
-
-bool
-WineResource::IsResourceFile ( const File& file )
-{
- string extension = GetExtension ( file.file );
- if ( extension == ".rc" || extension == ".RC" )
- return true;
- return false;
-}
-
-string
-WineResource::GetResourceFilename ( const Module& module )
-{
- const vector<File*>& files = module.non_if_data.files;
- for ( size_t i = 0; i < files.size (); i++ )
- {
- if ( IsResourceFile ( *files[i] ) )
- return files[i]->file.relative_path + sSep + files[i]->file.name;
- }
- return "";
-}
-
-void
-WineResource::UnpackResources ( bool verbose )
-{
- for ( size_t i = 0; i < project.modules.size (); i++ )
- {
- if ( IsWineModule ( *project.modules[i] ) )
- {
- UnpackResourcesInModule ( *project.modules[i],
- verbose );
- }
- }
-}
-
-void
-WineResource::UnpackResourcesInModule ( Module& module,
- bool verbose )
-{
- string resourceFilename = GetResourceFilename ( module );
- if ( resourceFilename.length () == 0 )
- return;
-
- if ( verbose )
- {
- printf ( "\nUnpacking resources for %s",
- module.name.c_str () );
- }
-
- string relativeDirectory = module.output->relative_path;
- string outputDirectory = Environment::GetIntermediatePath() + sSep + module.output->relative_path;
- string parameters = ssprintf ( "-b %s -O %s -f -x %s",
- NormalizeFilename ( relativeDirectory ).c_str (),
- NormalizeFilename ( outputDirectory ).c_str (),
- NormalizeFilename ( resourceFilename ).c_str () );
- string command = FixSeparatorForSystemCommand(bin2res) + " " + parameters;
-
- Directory( relativeDirectory ).GenerateTree( IntermediateDirectory, project.configuration.Verbose );
-
- int exitcode = system ( command.c_str () );
- if ( exitcode != 0 )
- {
- throw InvocationFailedException ( command,
- exitcode );
- }
- module.non_if_data.includes.push_back( new Include ( module.project,
- IntermediateDirectory,
- module.output->relative_path ) );
-}
Modified: trunk/reactos/tools/tools.mak
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/tools.mak?rev=31836&r1=31835&r2=31836&view=diff
==============================================================================
--- trunk/reactos/tools/tools.mak (original)
+++ trunk/reactos/tools/tools.mak Thu Jan 17 03:35:44 2008
@@ -41,7 +41,6 @@
${host_gpp} $(TOOLS_CPPFLAGS) -c $< -o $@
include tools/bin2c.mak
-include tools/bin2res/bin2res.mak
include tools/buildno/buildno.mak
include tools/cabman/cabman.mak
include tools/cdmake/cdmake.mak
More information about the Ros-diffs
mailing list