aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Buland <eichlan@xagasoft.com>2010-05-16 05:19:48 +0000
committerMike Buland <eichlan@xagasoft.com>2010-05-16 05:19:48 +0000
commitd66465a69fdc7922fa372e80cfae23e2fe3a6396 (patch)
tree6127aa0e5c300a5ae7aa22c1195002ca46490589
parenta2c615fe781cc64a4603d6ba198ea4fd91b36c8d (diff)
downloadbuild-d66465a69fdc7922fa372e80cfae23e2fe3a6396.tar.gz
build-d66465a69fdc7922fa372e80cfae23e2fe3a6396.tar.bz2
build-d66465a69fdc7922fa372e80cfae23e2fe3a6396.tar.xz
build-d66465a69fdc7922fa372e80cfae23e2fe3a6396.zip
Works with the minor changes that have happened to libbu++, it's ready for new
features and fixes :)
-rw-r--r--src/rule.cpp2
-rw-r--r--src/runner.cpp4
-rw-r--r--src/target.cpp6
-rw-r--r--src/viewdefault.cpp4
4 files changed, 8 insertions, 8 deletions
diff --git a/src/rule.cpp b/src/rule.cpp
index 7578707..2cbb2ad 100644
--- a/src/rule.cpp
+++ b/src/rule.cpp
@@ -148,7 +148,7 @@ void Rule::setDisplay( const Bu::FString &sStr )
148 148
149const Bu::FString &Rule::getDisplay() const 149const Bu::FString &Rule::getDisplay() const
150{ 150{
151 return ((bool)sDisplay)?(sDisplay):(sName); 151 return (sDisplay.isSet())?(sDisplay):(sName);
152} 152}
153 153
154void Rule::addRequires( const AstBranch *pBr ) 154void Rule::addRequires( const AstBranch *pBr )
diff --git a/src/runner.cpp b/src/runner.cpp
index 947f2f5..e1f3da9 100644
--- a/src/runner.cpp
+++ b/src/runner.cpp
@@ -748,7 +748,7 @@ Variable Runner::run( AstBranch::NodeList::const_iterator n )
748 else 748 else
749 { 749 {
750 Bu::FString sTag = vTags.toString(); 750 Bu::FString sTag = vTags.toString();
751 if( sTag ) 751 if( sTag.isSet() )
752 { 752 {
753 rCont.addTargetToTag( pCurTarget, sTag ); 753 rCont.addTargetToTag( pCurTarget, sTag );
754 } 754 }
@@ -775,7 +775,7 @@ Variable Runner::run( AstBranch::NodeList::const_iterator n )
775 else 775 else
776 { 776 {
777 Bu::FString sTag = vTags.toString(); 777 Bu::FString sTag = vTags.toString();
778 if( sTag ) 778 if( sTag.isSet() )
779 { 779 {
780 pCurRule->addTag( sTag ); 780 pCurRule->addTag( sTag );
781 } 781 }
diff --git a/src/target.cpp b/src/target.cpp
index 4f9dd77..958fcf5 100644
--- a/src/target.cpp
+++ b/src/target.cpp
@@ -219,7 +219,7 @@ const VarHash &Target::getVars() const
219 219
220void Target::setDisplay( const Bu::FString &sNewDisplay ) 220void Target::setDisplay( const Bu::FString &sNewDisplay )
221{ 221{
222 if( !sDisplay ) 222 if( !sDisplay.isSet() )
223 sDisplay = sNewDisplay; 223 sDisplay = sNewDisplay;
224} 224}
225 225
@@ -292,7 +292,7 @@ void Target::mergeUnder( const Target *pSrc )
292 merge( lsRequires, pSrc->lsRequires ); 292 merge( lsRequires, pSrc->lsRequires );
293 merge( lsOutput, pSrc->lsOutput ); 293 merge( lsOutput, pSrc->lsOutput );
294 294
295 if( !sPrefix ) 295 if( !sPrefix.isSet() )
296 sPrefix = pSrc->sPrefix; 296 sPrefix = pSrc->sPrefix;
297 297
298 sRule = pSrc->sRule; 298 sRule = pSrc->sRule;
@@ -309,7 +309,7 @@ void Target::mergeUnder( const Target *pSrc )
309 } 309 }
310 } 310 }
311 311
312 if( !sDisplay ) 312 if( !sDisplay.isSet() )
313 sDisplay = pSrc->sDisplay; 313 sDisplay = pSrc->sDisplay;
314 314
315 // Now we need to reset our vars. 315 // Now we need to reset our vars.
diff --git a/src/viewdefault.cpp b/src/viewdefault.cpp
index df7be13..fdc1604 100644
--- a/src/viewdefault.cpp
+++ b/src/viewdefault.cpp
@@ -131,7 +131,7 @@ void ViewDefault::cmdStarted( const Bu::FString &/*sCmd*/ )
131void ViewDefault::cmdFinished( const Bu::FString &sStdOut, 131void ViewDefault::cmdFinished( const Bu::FString &sStdOut,
132 const Bu::FString &sStdErr, long /*iExit*/ ) 132 const Bu::FString &sStdErr, long /*iExit*/ )
133{ 133{
134 if( sStdOut ) 134 if( sStdOut.isSet() )
135 { 135 {
136 Bu::FString::const_iterator b; 136 Bu::FString::const_iterator b;
137 b = sStdOut.begin(); 137 b = sStdOut.begin();
@@ -147,7 +147,7 @@ void ViewDefault::cmdFinished( const Bu::FString &sStdOut,
147 } 147 }
148 sio << C_BR_GREEN << "\\-----" << C_RESET << sio.nl; 148 sio << C_BR_GREEN << "\\-----" << C_RESET << sio.nl;
149 } 149 }
150 if( sStdErr ) 150 if( sStdErr.isSet() )
151 { 151 {
152 Bu::FString::const_iterator b; 152 Bu::FString::const_iterator b;
153 b = sStdErr.begin(); 153 b = sStdErr.begin();