Skip to content
This repository was archived by the owner on Sep 30, 2023. It is now read-only.

Commit 3beb7b6

Browse files
committed
remove unused ScriptIfFail
1 parent 5dd5852 commit 3beb7b6

File tree

2 files changed

+5
-11
lines changed

2 files changed

+5
-11
lines changed

Common/BuildYamlScriptsMaker.cs

-2
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,8 @@ public static List<BuildScriptWithBuildData> PrepareBuildScriptsFromYaml(Dep dep
1818
else
1919
{
2020
var script = buildSection.Tool.Name == "msbuild" ? BuildMsbuildScript(buildSection, dep.Name) : BuildShellScript(buildSection);
21-
var scriptIfFail = buildSection.Tool.Name == "msbuild" ? BuildMsbuildScript(buildSection, dep.Name) : BuildShellScript(buildSection);
2221
result.Add(new BuildScriptWithBuildData(
2322
script,
24-
scriptIfFail,
2523
buildSection));
2624
}
2725
}

Common/ModuleBuilder.cs

+5-9
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
using System;
1+
using Common.YamlParsers;
2+
using log4net;
3+
using System;
24
using System.Collections.Generic;
35
using System.Diagnostics;
46
using System.IO;
57
using System.Linq;
6-
using Common.YamlParsers;
7-
using log4net;
88

99
namespace Common
1010
{
@@ -110,7 +110,7 @@ private bool Build(Dep dep, string moduleYaml, string cmdFile)
110110

111111
private bool BuildByCmd(Dep dep, string cmdFile)
112112
{
113-
return RunBuildScript(dep, new BuildScriptWithBuildData(cmdFile, cmdFile, null));
113+
return RunBuildScript(dep, new BuildScriptWithBuildData(cmdFile, null));
114114
}
115115

116116
private bool RunBuildScript(Dep dep, BuildScriptWithBuildData script)
@@ -123,8 +123,6 @@ private bool RunBuildScript(Dep dep, BuildScriptWithBuildData script)
123123
for (int timesTry = 0; timesTry < 2 && exitCode != 0; timesTry++)
124124
{
125125
ModuleBuilderHelper.KillMsBuild(log);
126-
if (timesTry != 0)
127-
command = script.ScriptIfFail;
128126
log.DebugFormat("Build command: '{0}'", command);
129127
if (buildSettings.ShowOutput)
130128
ConsoleWriter.WriteInfo($"BUILDING {command}");
@@ -210,13 +208,11 @@ private ShellRunner PrepareShellRunner()
210208
public class BuildScriptWithBuildData
211209
{
212210
public readonly string Script;
213-
public readonly string ScriptIfFail;
214211
public readonly BuildData BuildData;
215212

216-
public BuildScriptWithBuildData(string script, string scriptIfFail, BuildData buildData)
213+
public BuildScriptWithBuildData(string script, BuildData buildData)
217214
{
218215
Script = script;
219-
ScriptIfFail = scriptIfFail;
220216
BuildData = buildData;
221217
}
222218
}

0 commit comments

Comments
 (0)