diff options
author | Mike Buland <eichlan@xagasoft.com> | 2006-09-14 21:33:42 +0000 |
---|---|---|
committer | Mike Buland <eichlan@xagasoft.com> | 2006-09-14 21:33:42 +0000 |
commit | 2a10d964f0bd5d64210adb0537ad04f9410f56db (patch) | |
tree | 89d7708ebaac73047db97a56aef3cfbbbb1cfdc5 /src | |
parent | 1dc59875ed1e072a0c87b10e1bb43d7be2311ec8 (diff) | |
download | build-2a10d964f0bd5d64210adb0537ad04f9410f56db.tar.gz build-2a10d964f0bd5d64210adb0537ad04f9410f56db.tar.bz2 build-2a10d964f0bd5d64210adb0537ad04f9410f56db.tar.xz build-2a10d964f0bd5d64210adb0537ad04f9410f56db.zip |
Added the make-style view...useful sometimes.
Diffstat (limited to '')
-rw-r--r-- | src/build.cpp | 8 | ||||
-rw-r--r-- | src/main.cpp | 5 | ||||
-rw-r--r-- | src/performcommand.cpp | 2 | ||||
-rw-r--r-- | src/viewerfactory.cpp | 2 |
4 files changed, 9 insertions, 8 deletions
diff --git a/src/build.cpp b/src/build.cpp index 88d1207..89366f9 100644 --- a/src/build.cpp +++ b/src/build.cpp | |||
@@ -144,11 +144,11 @@ void Build::set( const std::string &cont, const std::string &var, const std::str | |||
144 | { | 144 | { |
145 | if( cont == "" ) | 145 | if( cont == "" ) |
146 | { | 146 | { |
147 | mVars[var] = val; | 147 | mVars[var] = replVars( val, cont, NULL ); |
148 | } | 148 | } |
149 | else | 149 | else |
150 | { | 150 | { |
151 | mContVars[cont][var] = val; | 151 | mContVars[cont][var] = replVars( val, cont, NULL ); |
152 | } | 152 | } |
153 | } | 153 | } |
154 | 154 | ||
@@ -156,11 +156,11 @@ void Build::setAdd( const std::string &cont, const std::string &var, const std:: | |||
156 | { | 156 | { |
157 | if( cont == "" ) | 157 | if( cont == "" ) |
158 | { | 158 | { |
159 | mVars[var] = getVar( cont, var, NULL ) + " " + val; | 159 | mVars[var] = getVar( cont, var, NULL ) + " " + replVars( val, cont, NULL ); |
160 | } | 160 | } |
161 | else | 161 | else |
162 | { | 162 | { |
163 | mContVars[cont][var] = getVar( cont, var, NULL ) + " " + val; | 163 | mContVars[cont][var] = getVar( cont, var, NULL ) + " " + replVars( val, cont, NULL ); |
164 | } | 164 | } |
165 | } | 165 | } |
166 | 166 | ||
diff --git a/src/main.cpp b/src/main.cpp index fa1608f..4f0ecca 100644 --- a/src/main.cpp +++ b/src/main.cpp | |||
@@ -50,14 +50,11 @@ public: | |||
50 | int procViewPercent( int argc, char *argv[] ) | 50 | int procViewPercent( int argc, char *argv[] ) |
51 | { | 51 | { |
52 | sView = "percent"; | 52 | sView = "percent"; |
53 | //delete pViewer; | ||
54 | //pViewer = new ViewerPercent; | ||
55 | } | 53 | } |
56 | 54 | ||
57 | int procViewMake( int argc, char *argv[] ) | 55 | int procViewMake( int argc, char *argv[] ) |
58 | { | 56 | { |
59 | //delete pViewer; | 57 | sView = "make"; |
60 | //pViewer = new ViewerMake; | ||
61 | } | 58 | } |
62 | 59 | ||
63 | std::string sCache; | 60 | std::string sCache; |
diff --git a/src/performcommand.cpp b/src/performcommand.cpp index 5a9e746..e901b0e 100644 --- a/src/performcommand.cpp +++ b/src/performcommand.cpp | |||
@@ -1,6 +1,7 @@ | |||
1 | #include "performcommand.h" | 1 | #include "performcommand.h" |
2 | #include "plugger.h" | 2 | #include "plugger.h" |
3 | #include "build.h" | 3 | #include "build.h" |
4 | #include "viewer.h" | ||
4 | 5 | ||
5 | PluginInterface2(command, PerformCommand, Perform, "Mike Buland", 0, 1 ); | 6 | PluginInterface2(command, PerformCommand, Perform, "Mike Buland", 0, 1 ); |
6 | 7 | ||
@@ -21,6 +22,7 @@ Perform *PerformCommand::duplicate( Build &bld, const std::string &cont, VarMap | |||
21 | 22 | ||
22 | void PerformCommand::execute( Build &bld ) | 23 | void PerformCommand::execute( Build &bld ) |
23 | { | 24 | { |
25 | bld.getView()->executeCmd( lParam.front() ); | ||
24 | int n = system( lParam.front().c_str() ); | 26 | int n = system( lParam.front().c_str() ); |
25 | if( n != 0 ) | 27 | if( n != 0 ) |
26 | throw BuildException( | 28 | throw BuildException( |
diff --git a/src/viewerfactory.cpp b/src/viewerfactory.cpp index 3dbc232..8024a7e 100644 --- a/src/viewerfactory.cpp +++ b/src/viewerfactory.cpp | |||
@@ -2,11 +2,13 @@ | |||
2 | 2 | ||
3 | extern struct PluginInfo plain; | 3 | extern struct PluginInfo plain; |
4 | extern struct PluginInfo percent; | 4 | extern struct PluginInfo percent; |
5 | extern struct PluginInfo make; | ||
5 | 6 | ||
6 | ViewerFactory::ViewerFactory() | 7 | ViewerFactory::ViewerFactory() |
7 | { | 8 | { |
8 | registerBuiltinPlugin( &plain ); | 9 | registerBuiltinPlugin( &plain ); |
9 | registerBuiltinPlugin( &percent ); | 10 | registerBuiltinPlugin( &percent ); |
11 | registerBuiltinPlugin( &make ); | ||
10 | } | 12 | } |
11 | 13 | ||
12 | ViewerFactory::~ViewerFactory() | 14 | ViewerFactory::~ViewerFactory() |