Skip to content

route logFile & Unity exit code #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
benblo wants to merge 3 commits into
base: master
Choose a base branch
from
Open

route logFile & Unity exit code #2

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e236d45
if a -logFile argument is found, use it instead of a temp file
benblo May 14, 2016
2ad2018
if we not actually building, just route the Unity process exit code i…
benblo May 14, 2016
9af0a2b
delete previous log file, if any
benblo May 14, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 34 additions & 6 deletions UnityProxy/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
using System;
using System.Diagnostics;
using System.IO;
using System.Linq;
using System.Threading;

namespace UnityProxy
Expand All @@ -16,7 +17,22 @@ static void Main(string[] args)
{
string unityPath, artifactsPath;
int startingArgumentIndex = ParseArguments(args, out unityPath, out artifactsPath);

string logPath = Path.GetTempFileName();
bool hasLogFileArgument = false;
for (int i = startingArgumentIndex; i < args.Length; i++)
{
if (args[i] == "-logFile")
{
logPath = args[i + 1];
hasLogFileArgument = true;
if (File.Exists(logPath))
{
File.Delete(logPath);
}
break;
}
}

Watcher watcher = new Watcher(logPath);
Thread watcherThread = new Thread(watcher.Run);
Expand All @@ -25,7 +41,10 @@ static void Main(string[] args)
Process unity = new Process();
unity.StartInfo = new ProcessStartInfo(unityPath);

unity.StartInfo.Arguments = "-logFile \"" + logPath + "\"";
if (!hasLogFileArgument)
{
unity.StartInfo.Arguments = "-logFile \"" + logPath + "\"";
}

for (int i = startingArgumentIndex; i < args.Length; i++)
{
Expand All @@ -47,15 +66,24 @@ static void Main(string[] args)
SaveArtifacts(artifactsPath, watcher.FullLog);
}

if (watcher.FullLog.Contains(SuccessMagicString))
bool isBuilding = args.Contains("-executeMethod");
if (isBuilding)
{
Console.WriteLine("Success.");
Environment.Exit(0);
if (watcher.FullLog.Contains(SuccessMagicString))
{
Console.WriteLine("Success.");
Environment.Exit(0);
}
else
{
Console.WriteLine("Failure.");
Environment.Exit(1);
}
}
else
{
Console.WriteLine("Failure.");
Environment.Exit(1);
// just reimporting, not building
Environment.Exit(unity.ExitCode);
}
}

Expand Down