1
- using System ;
1
+ using Common . YamlParsers ;
2
+ using log4net ;
3
+ using System ;
2
4
using System . Collections . Generic ;
3
5
using System . Diagnostics ;
4
6
using System . IO ;
5
7
using System . Linq ;
6
- using Common . YamlParsers ;
7
- using log4net ;
8
8
9
9
namespace Common
10
10
{
@@ -110,7 +110,7 @@ private bool Build(Dep dep, string moduleYaml, string cmdFile)
110
110
111
111
private bool BuildByCmd ( Dep dep , string cmdFile )
112
112
{
113
- return RunBuildScript ( dep , new BuildScriptWithBuildData ( cmdFile , cmdFile , null ) ) ;
113
+ return RunBuildScript ( dep , new BuildScriptWithBuildData ( cmdFile , null ) ) ;
114
114
}
115
115
116
116
private bool RunBuildScript ( Dep dep , BuildScriptWithBuildData script )
@@ -123,8 +123,6 @@ private bool RunBuildScript(Dep dep, BuildScriptWithBuildData script)
123
123
for ( int timesTry = 0 ; timesTry < 2 && exitCode != 0 ; timesTry ++ )
124
124
{
125
125
ModuleBuilderHelper . KillMsBuild ( log ) ;
126
- if ( timesTry != 0 )
127
- command = script . ScriptIfFail ;
128
126
log . DebugFormat ( "Build command: '{0}'" , command ) ;
129
127
if ( buildSettings . ShowOutput )
130
128
ConsoleWriter . WriteInfo ( $ "BUILDING { command } ") ;
@@ -210,13 +208,11 @@ private ShellRunner PrepareShellRunner()
210
208
public class BuildScriptWithBuildData
211
209
{
212
210
public readonly string Script ;
213
- public readonly string ScriptIfFail ;
214
211
public readonly BuildData BuildData ;
215
212
216
- public BuildScriptWithBuildData ( string script , string scriptIfFail , BuildData buildData )
213
+ public BuildScriptWithBuildData ( string script , BuildData buildData )
217
214
{
218
215
Script = script ;
219
- ScriptIfFail = scriptIfFail ;
220
216
BuildData = buildData ;
221
217
}
222
218
}
0 commit comments