Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-04 00:55:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add method to get target arch in rbuild

Browse source 
svn path=/trunk/; revision=28894
This commit is contained in:
Hervé Poussineau 2007-09-06 07:46:48 +00:00
parent 7338e88f05
commit 0eccb4aa9d
2 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

13
reactos/tools/rbuild/project.cpp
View file

@ -35,6 +35,12 @@ Environment::GetVariable ( const string& name )
return ""; return "";
} }
string
Environment::GetArch ()
{
return GetEnvironmentVariablePathOrDefault ( "ROS_ARCH", "i386" );
}
/* static */ string /* static */ string
Environment::GetEnvironmentVariablePathOrDefault ( const string& name, Environment::GetEnvironmentVariablePathOrDefault ( const string& name,
const string& defaultValue ) const string& defaultValue )
@ -50,7 +56,7 @@ Environment::GetEnvironmentVariablePathOrDefault ( const string& name,
Environment::GetIntermediatePath () Environment::GetIntermediatePath ()
{ {
string defaultIntermediate = string defaultIntermediate =
string( "obj-" ) + GetEnvironmentVariablePathOrDefault ( "ROS_CDOUTPUT", "i386" ); string( "obj-" ) + GetArch ();
return GetEnvironmentVariablePathOrDefault ( "ROS_INTERMEDIATE", return GetEnvironmentVariablePathOrDefault ( "ROS_INTERMEDIATE",
defaultIntermediate ); defaultIntermediate );
} }
@ -59,7 +65,7 @@ Environment::GetIntermediatePath ()
Environment::GetOutputPath () Environment::GetOutputPath ()
{ {
string defaultOutput = string defaultOutput =
string( "output-" ) + GetEnvironmentVariablePathOrDefault ( "ROS_CDOUTPUT", "i386" ); string( "output-" ) + GetArch ();
return GetEnvironmentVariablePathOrDefault ( "ROS_OUTPUT", return GetEnvironmentVariablePathOrDefault ( "ROS_OUTPUT",
defaultOutput ); defaultOutput );
} }
@ -67,8 +73,7 @@ Environment::GetOutputPath ()
/* static */ string /* static */ string
Environment::GetInstallPath () Environment::GetInstallPath ()
{ {
string defaultInstall = string defaultInstall = GetCdOutputPath ();
string( "reactos." ) + GetEnvironmentVariablePathOrDefault ( "ROS_CDOUTPUT", "" );
return GetEnvironmentVariablePathOrDefault ( "ROS_INSTALL", return GetEnvironmentVariablePathOrDefault ( "ROS_INSTALL",
defaultInstall ); defaultInstall );
} }

1
reactos/tools/rbuild/rbuild.h
View file

@ -153,6 +153,7 @@ class Environment
{ {
public: public:
static std::string GetVariable ( const std::string& name ); static std::string GetVariable ( const std::string& name );
static std::string GetArch ();
static std::string GetIntermediatePath (); static std::string GetIntermediatePath ();
static std::string GetOutputPath (); static std::string GetOutputPath ();
static std::string GetCdOutputPath (); static std::string GetCdOutputPath ();