Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-11-20 14:30:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix the msvc backend on linux hosts

Browse source 
svn path=/trunk/; revision=25959
This commit is contained in:
Christoph von Wittich 2007-03-02 20:53:41 +00:00
parent f5751896c4
commit e3a80a5990
3 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
reactos/tools/rbuild/backend/msvc/msvc.cpp
View file

@ -224,7 +224,7 @@ void MSVCBackend::OutputFolders()
std::string std::string
MSVCBackend::OptFileName ( const Module& module ) const MSVCBackend::OptFileName ( const Module& module ) const
{ {
return DosSeparator( return FixSeparatorForSystemCommand(
ReplaceExtension ( module.GetPath(), "_" + _get_vc_dir() + "_auto.opt" ) ReplaceExtension ( module.GetPath(), "_" + _get_vc_dir() + "_auto.opt" )
); );
} }
@ -232,7 +232,7 @@ MSVCBackend::OptFileName ( const Module& module ) const
std::string std::string
MSVCBackend::SuoFileName ( const Module& module ) const MSVCBackend::SuoFileName ( const Module& module ) const
{ {
return DosSeparator( return FixSeparatorForSystemCommand(
ReplaceExtension ( module.GetPath(), "_" + _get_vc_dir() + "_auto.suo" ) ReplaceExtension ( module.GetPath(), "_" + _get_vc_dir() + "_auto.suo" )
); );
} }
@ -240,7 +240,7 @@ MSVCBackend::SuoFileName ( const Module& module ) const
std::string std::string
MSVCBackend::DswFileName ( const Module& module ) const MSVCBackend::DswFileName ( const Module& module ) const
{ {
return DosSeparator( return FixSeparatorForSystemCommand(
ReplaceExtension ( module.GetPath(), "_auto.dsw" ) ReplaceExtension ( module.GetPath(), "_auto.dsw" )
); );
} }
@ -248,7 +248,7 @@ MSVCBackend::DswFileName ( const Module& module ) const
std::string std::string
MSVCBackend::SlnFileName ( const Module& module ) const MSVCBackend::SlnFileName ( const Module& module ) const
{ {
return DosSeparator( return FixSeparatorForSystemCommand(
ReplaceExtension ( module.GetPath(), "_" + _get_vc_dir() + "_auto.sln" ) ReplaceExtension ( module.GetPath(), "_" + _get_vc_dir() + "_auto.sln" )
); );
} }
@ -256,7 +256,7 @@ MSVCBackend::SlnFileName ( const Module& module ) const
std::string std::string
MSVCBackend::NcbFileName ( const Module& module ) const MSVCBackend::NcbFileName ( const Module& module ) const
{ {
return DosSeparator( return FixSeparatorForSystemCommand(
ReplaceExtension ( module.GetPath(), "_" + _get_vc_dir() + "_auto.ncb" ) ReplaceExtension ( module.GetPath(), "_" + _get_vc_dir() + "_auto.ncb" )
); );
} }
@ -264,7 +264,7 @@ MSVCBackend::NcbFileName ( const Module& module ) const
std::string std::string
MSVCBackend::DspFileName ( const Module& module ) const MSVCBackend::DspFileName ( const Module& module ) const
{ {
return DosSeparator( return FixSeparatorForSystemCommand(
ReplaceExtension ( module.GetPath(), "_auto.dsp" ) ReplaceExtension ( module.GetPath(), "_auto.dsp" )
); );
} }
@ -272,7 +272,7 @@ MSVCBackend::DspFileName ( const Module& module ) const
std::string std::string
MSVCBackend::VcprojFileName ( const Module& module ) const MSVCBackend::VcprojFileName ( const Module& module ) const
{ {
return DosSeparator( return FixSeparatorForSystemCommand(
ReplaceExtension ( module.GetPath(), "_" + _get_vc_dir() + "_auto.vcproj" ) ReplaceExtension ( module.GetPath(), "_" + _get_vc_dir() + "_auto.vcproj" )
); );
} }
@ -297,13 +297,13 @@ MSVCBackend::_get_object_files ( const Module& module, vector<string>& out) cons
string basepath = module.GetBasePath (); string basepath = module.GetBasePath ();
string vcdir = _get_vc_dir (); string vcdir = _get_vc_dir ();
size_t i; size_t i;
string intenv = Environment::GetIntermediatePath () + "\\" + basepath + "\\"; string intenv = Environment::GetIntermediatePath () + DEF_SSEP + basepath + DEF_SSEP;
string outenv = Environment::GetOutputPath () + "\\" + basepath + "\\"; string outenv = Environment::GetOutputPath () + DEF_SSEP + basepath + DEF_SSEP;
if ( configuration.UseVSVersionInPath ) if ( configuration.UseVSVersionInPath )
{ {
intenv += vcdir + "\\"; intenv += vcdir + DEF_SSEP;
outenv += vcdir + "\\"; outenv += vcdir + DEF_SSEP;
} }
string dbg = vcdir.substr ( 0, 3 ); string dbg = vcdir.substr ( 0, 3 );
@ -336,7 +336,7 @@ MSVCBackend::_get_object_files ( const Module& module, vector<string>& out) cons
for ( i = 0; i < files.size (); i++ ) for ( i = 0; i < files.size (); i++ )
{ {
string file = files[i]->name; string file = files[i]->name;
string::size_type pos = file.find_last_of ("\\"); string::size_type pos = file.find_last_of (DEF_SSEP);
if ( pos != string::npos ) if ( pos != string::npos )
file.erase ( 0, pos+1 ); file.erase ( 0, pos+1 );
if ( !stricmp ( Right(file,3).c_str(), ".rc" ) ) if ( !stricmp ( Right(file,3).c_str(), ".rc" ) )
@ -379,7 +379,7 @@ MSVCBackend::_get_def_files ( const Module& module, vector<string>& out) const
{ {
file.insert (pos, "_msvc"); file.insert (pos, "_msvc");
} }
modulename += "\\" + file; modulename += DEF_SSEP + file;
out.push_back (modulename); out.push_back (modulename);
} }
} }
@ -460,8 +460,8 @@ MSVCBackend::_install_files (const std::string& vcdir, const::string& config)
if ( module.installBase == "" || module.installName == "" ) if ( module.installBase == "" || module.installName == "" )
continue; continue;
string inputname = Environment::GetOutputPath () + "\\" + module.GetBasePath () + "\\" + vcdir + "\\" + config + "\\" + module.GetTargetName (); string inputname = Environment::GetOutputPath () + DEF_SSEP + module.GetBasePath () + DEF_SSEP + vcdir + DEF_SSEP + config + DEF_SSEP + module.GetTargetName ();
string installdir = Environment::GetInstallPath () + "\\" + module.installBase + "\\" + module.installName; string installdir = Environment::GetInstallPath () + DEF_SSEP + module.installBase + DEF_SSEP + module.installName;
if ( _copy_file( inputname, installdir ) ) if ( _copy_file( inputname, installdir ) )
printf ("Installed File :'%s'\n",installdir.c_str () ); printf ("Installed File :'%s'\n",installdir.c_str () );
} }

2
reactos/tools/rbuild/backend/msvc/msvc.h
View file

@ -112,7 +112,7 @@ class MSVCBackend : public Backend
// functions in vcprojmaker.cpp: // functions in vcprojmaker.cpp:
std::string _get_solution_verion ( void ); std::string _get_solution_version ( void );
std::string _gen_guid(); std::string _gen_guid();
std::string _replace_str( std::string _replace_str(
std::string string1, std::string string1,

6
reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp
View file

@ -116,7 +116,7 @@ MSVCBackend::_generate_vcproj ( const Module& module )
if ( configuration.UseVSVersionInPath ) if ( configuration.UseVSVersionInPath )
{ {
vcdir = "\\" + _get_vc_dir(); vcdir = DEF_SSEP + _get_vc_dir();
} }
// TODO FIXME - need more checks here for 'sys' and possibly 'drv'? // TODO FIXME - need more checks here for 'sys' and possibly 'drv'?
@ -758,7 +758,7 @@ MSVCBackend::_replace_str(std::string string1, const std::string &find_str, cons
} }
std::string std::string
MSVCBackend::_get_solution_verion ( void ) MSVCBackend::_get_solution_version ( void )
{ {
string version; string version;
@ -780,7 +780,7 @@ MSVCBackend::_get_solution_verion ( void )
void void
MSVCBackend::_generate_sln_header ( FILE* OUT ) MSVCBackend::_generate_sln_header ( FILE* OUT )
{ {
fprintf ( OUT, "Microsoft Visual Studio Solution File, Format Version %s\r\n", _get_solution_verion().c_str() ); fprintf ( OUT, "Microsoft Visual Studio Solution File, Format Version %s\r\n", _get_solution_version().c_str() );
fprintf ( OUT, "# Visual Studio 2005\r\n" ); fprintf ( OUT, "# Visual Studio 2005\r\n" );
fprintf ( OUT, "\r\n" ); fprintf ( OUT, "\r\n" );
} }