Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-03 22:46:17 +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 "";
}
string
Environment::GetArch ()
{
return GetEnvironmentVariablePathOrDefault ( "ROS_ARCH", "i386" );
}
/* static */ string
Environment::GetEnvironmentVariablePathOrDefault ( const string& name,
const string& defaultValue )
@ -50,7 +56,7 @@ Environment::GetEnvironmentVariablePathOrDefault ( const string& name,
Environment::GetIntermediatePath ()
{
string defaultIntermediate =
string( "obj-" ) + GetEnvironmentVariablePathOrDefault ( "ROS_CDOUTPUT", "i386" );
string( "obj-" ) + GetArch ();
return GetEnvironmentVariablePathOrDefault ( "ROS_INTERMEDIATE",
defaultIntermediate );
}
@ -59,7 +65,7 @@ Environment::GetIntermediatePath ()
Environment::GetOutputPath ()
{
string defaultOutput =
string( "output-" ) + GetEnvironmentVariablePathOrDefault ( "ROS_CDOUTPUT", "i386" );
string( "output-" ) + GetArch ();
return GetEnvironmentVariablePathOrDefault ( "ROS_OUTPUT",
defaultOutput );
}
@ -67,8 +73,7 @@ Environment::GetOutputPath ()
/* static */ string
Environment::GetInstallPath ()
{
string defaultInstall =
string( "reactos." ) + GetEnvironmentVariablePathOrDefault ( "ROS_CDOUTPUT", "" );
string defaultInstall = GetCdOutputPath ();
return GetEnvironmentVariablePathOrDefault ( "ROS_INSTALL",
defaultInstall );
}

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

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