[ros-diffs] [cwittich] 25959: fix the msvc backend on linux hosts

[cwittich at svn.reactos.org]

Author: cwittich
Date: Fri Mar  2 23:53:41 2007
New Revision: 25959

URL: http://svn.reactos.org/svn/reactos?rev=25959&view=rev
Log:
fix the msvc backend on linux hosts

Modified:
    trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp
    trunk/reactos/tools/rbuild/backend/msvc/msvc.h
    trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp

Modified: trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp?rev=25959&r1=25958&r2=25959&view=diff
==============================================================================
--- trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp (original)
+++ trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp Fri Mar  2 23:53:41 2007
@@ -224,7 +224,7 @@
 std::string
 MSVCBackend::OptFileName ( const Module& module ) const
 {
-	return DosSeparator(
+	return FixSeparatorForSystemCommand(
 		ReplaceExtension ( module.GetPath(), "_" + _get_vc_dir() + "_auto.opt" )
 		);
 }
@@ -232,7 +232,7 @@
 std::string
 MSVCBackend::SuoFileName ( const Module& module ) const
 {
-	return DosSeparator(
+	return FixSeparatorForSystemCommand(
 		ReplaceExtension ( module.GetPath(), "_" + _get_vc_dir() + "_auto.suo" )
 		);
 }
@@ -240,7 +240,7 @@
 std::string
 MSVCBackend::DswFileName ( const Module& module ) const
 {
-	return DosSeparator(
+	return FixSeparatorForSystemCommand(
 		ReplaceExtension ( module.GetPath(), "_auto.dsw" )
 		);
 }
@@ -248,7 +248,7 @@
 std::string
 MSVCBackend::SlnFileName ( const Module& module ) const
 {
-	return DosSeparator(
+	return FixSeparatorForSystemCommand(
 		ReplaceExtension ( module.GetPath(), "_" + _get_vc_dir() + "_auto.sln" )
 		);
 }
@@ -256,7 +256,7 @@
 std::string
 MSVCBackend::NcbFileName ( const Module& module ) const
 {
-	return DosSeparator(
+	return FixSeparatorForSystemCommand(
 		ReplaceExtension ( module.GetPath(), "_" + _get_vc_dir() + "_auto.ncb" )
 		);
 }
@@ -264,7 +264,7 @@
 std::string
 MSVCBackend::DspFileName ( const Module& module ) const
 {
-	return DosSeparator(
+	return FixSeparatorForSystemCommand(
 		ReplaceExtension ( module.GetPath(), "_auto.dsp" )
 		);
 }
@@ -272,7 +272,7 @@
 std::string
 MSVCBackend::VcprojFileName ( const Module& module ) const
 {
-	return DosSeparator(
+	return FixSeparatorForSystemCommand(
 			ReplaceExtension ( module.GetPath(), "_" + _get_vc_dir() + "_auto.vcproj" )
 			);
 }
@@ -297,13 +297,13 @@
 	string basepath = module.GetBasePath ();
 	string vcdir = _get_vc_dir ();
 	size_t i;
-	string intenv = Environment::GetIntermediatePath () + "\\" + basepath + "\\";
-	string outenv = Environment::GetOutputPath () + "\\" + basepath + "\\";
+	string intenv = Environment::GetIntermediatePath () + DEF_SSEP + basepath + DEF_SSEP;
+	string outenv = Environment::GetOutputPath () + DEF_SSEP + basepath + DEF_SSEP;
 	
 	if ( configuration.UseVSVersionInPath )
 	{
-		intenv += vcdir + "\\";
-		outenv += vcdir + "\\";
+		intenv += vcdir + DEF_SSEP;
+		outenv += vcdir + DEF_SSEP;
 	}
 
 	string dbg = vcdir.substr ( 0, 3 );
@@ -336,7 +336,7 @@
 		for ( i = 0; i < files.size (); i++ )
 		{
 			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 )
 				file.erase ( 0, pos+1 );
 			if ( !stricmp ( Right(file,3).c_str(), ".rc" ) )
@@ -379,7 +379,7 @@
 		{
 			file.insert (pos, "_msvc");
 		}
-		modulename += "\\" + file;
+		modulename += DEF_SSEP + file;
 		out.push_back (modulename);
 	}
 }
@@ -460,8 +460,8 @@
 		if ( module.installBase == "" || module.installName == "" )
 			continue;
 
-		string inputname = Environment::GetOutputPath () + "\\" + module.GetBasePath () + "\\" + vcdir + "\\" + config + "\\" + module.GetTargetName ();
-		string installdir = Environment::GetInstallPath () + "\\" + module.installBase + "\\" + module.installName;
+		string inputname = Environment::GetOutputPath () + DEF_SSEP + module.GetBasePath () + DEF_SSEP + vcdir + DEF_SSEP + config + DEF_SSEP + module.GetTargetName ();
+		string installdir = Environment::GetInstallPath () + DEF_SSEP + module.installBase + DEF_SSEP + module.installName;
 		if ( _copy_file( inputname, installdir ) )
 			printf ("Installed File :'%s'\n",installdir.c_str () );
 	}

Modified: trunk/reactos/tools/rbuild/backend/msvc/msvc.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/msvc/msvc.h?rev=25959&r1=25958&r2=25959&view=diff
==============================================================================
--- trunk/reactos/tools/rbuild/backend/msvc/msvc.h (original)
+++ trunk/reactos/tools/rbuild/backend/msvc/msvc.h Fri Mar  2 23:53:41 2007
@@ -112,7 +112,7 @@
 
 		// functions in vcprojmaker.cpp:
 
-		std::string _get_solution_verion ( void );
+		std::string _get_solution_version ( void );
 		std::string _gen_guid();
 		std::string _replace_str(
 			std::string string1,

Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp?rev=25959&r1=25958&r2=25959&view=diff
==============================================================================
--- trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp (original)
+++ trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp Fri Mar  2 23:53:41 2007
@@ -116,7 +116,7 @@
 
 	if ( configuration.UseVSVersionInPath )
 	{
-		vcdir = "\\" + _get_vc_dir();
+		vcdir = DEF_SSEP + _get_vc_dir();
 	}
 	// TODO FIXME - need more checks here for 'sys' and possibly 'drv'?
 
@@ -758,7 +758,7 @@
 }
 
 std::string
-MSVCBackend::_get_solution_verion ( void )
+MSVCBackend::_get_solution_version ( void )
 {
 	string version;
 
@@ -780,7 +780,7 @@
 void
 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, "\r\n" );
 }