Copying //UE4/Dev-Build to //UE4/Dev-Main (Source: //UE4/Dev-Build @ 2959429)
==========================
MAJOR FEATURES + CHANGES
==========================
Change 2945275 on 2016/04/15 by Ben.Marsh
BuildCommonTools: Stop forcing the DeleteBuildProducts flag to true; just respect the -Clean parameter from the command line.
Change 2946668 on 2016/04/18 by Ben.Marsh
EC: Prevent lookbehind for UBT error strings on Mac.
Change 2952657 on 2016/04/22 by Ben.Marsh
UGS: Require the user to explicitly choose to show *.uprojectdirs files, to discourage people from selecting the first thing they see in a synced branch. The uprojectdirs workflow is only used by Engine QA, but catches a lot of people out.
Change 2954256 on 2016/04/25 by Ben.Marsh
EC: Fix lines starting with error: and warning: being swallowed by the postprocessor. Also remove confusing 4 line look-behind on generic error and warning messages.
Change 2954449 on 2016/04/25 by Ben.Marsh
Use the original application name for log files (and for the prefix in stdout), rather than the application name after the host platform has modified it. Prevents UAT/UBT calls showing up with a "mono: " prefix on Mac, rather than "AutomationTool:" or "UnrealBuildTool:".
Change 2955885 on 2016/04/26 by Ben.Marsh
BuildGraph: Allow passing -Clean on the command line to propagate to UE4Build, impacting how targets are compiled as well as clearing the cached BuildGraph state. Add a second parameter, -ClearHistory, to just wipe the history of completed nodes.
Change 2955919 on 2016/04/26 by Chad.Garyet
Fixed timestamp resolution to check for two seconds instead of two ticks. This was causing mac builders to throw false positives on file changes
Change 2956118 on 2016/04/26 by Ben.Marsh
BuildGraph: Add support for conditional blocks in BuildGraph scripts, either with a simple condition, or picking from a list of options. Two new elements can be added anywhere in scripts:
<Do If="...">
<!-- Inner elements -->
</Do>
<Choose>
<Option If="...">
<!-- Inner elements -->
</Option>
<Option If="...">
<!-- Inner elements -->
</Option>
<Otherwise>
<!-- Inner elements -->
</Otherwise>
</Choose>
Change 2956792 on 2016/04/26 by Ben.Marsh
EC: Prevent scheduled builds being queued up, and starting at times other than the times they're scheduled for. Prevents builds which have just been added to the stream settings from starting immediately, and prevents full builds starting during the day (as soon as the first change is made).
Change 2957131 on 2016/04/26 by Ben.Marsh
EC: Increase the precedence of the stack trace matcher.
Change 2957419 on 2016/04/27 by Ben.Marsh
EC: Skip the "end: stack for UAT" line in postp.
Change 2957588 on 2016/04/27 by Ben.Marsh
Core: Change formatting for callstacks for crashes and ensures so that EC can parse them from logs more easily.
Change 2958047 on 2016/04/27 by Ben.Marsh
BuildGraph: Feature to generate reports as part of build graph scripts. Reports operate similarly to triggers, but just provide a summary of completed jobsteps without offering to run a downstream job. Syntax is similar to declaring aggregates: <Report Name="Summary" Requires="Node1;Node2"/>
Change 2958188 on 2016/04/27 by Ben.Marsh
BuildGraph: Automatically generate a report when a preflight completes.
Change 2959053 on 2016/04/28 by Ben.Marsh
BuildGraph: Move the CleanTempStorage commandlet into BuildGraph, and add support for cleaning out new-style temp storage directories (which do not contain TempManifest files).
Change 2959429 on 2016/04/28 by Ben.Marsh
UAT: Add a script to describe a stream being copied up to its parent. To use, just run the UAT command "StreamCopyDescription -Stream=//UE4/Dev-Build". Optionally specify -Changes=//UE4/OtherStream/Engine/...
#lockdown Nick.Penwarden
[CL 2959583 by Ben Marsh in Main branch]
2016-04-28 14:13:21 -04:00
|
|
|
|
// Copyright 1998-2016 Epic Games, Inc. All Rights Reserved.
|
|
|
|
|
|
|
|
|
|
|
|
using System;
|
|
|
|
|
|
using System.Collections.Generic;
|
|
|
|
|
|
using System.Diagnostics;
|
|
|
|
|
|
using System.IO;
|
|
|
|
|
|
using System.Text.RegularExpressions;
|
|
|
|
|
|
using System.Threading;
|
|
|
|
|
|
using System.Reflection;
|
|
|
|
|
|
using System.Linq;
|
|
|
|
|
|
using AutomationTool;
|
|
|
|
|
|
using UnrealBuildTool;
|
|
|
|
|
|
|
|
|
|
|
|
namespace AutomationTool
|
|
|
|
|
|
{
|
|
|
|
|
|
/// <summary>
|
|
|
|
|
|
/// Generates a changelist description for copying a stream to its parent
|
|
|
|
|
|
/// </summary>
|
|
|
|
|
|
[RequireP4]
|
|
|
|
|
|
public class StreamCopyDescription : BuildCommand
|
|
|
|
|
|
{
|
|
|
|
|
|
/// <summary>
|
|
|
|
|
|
/// Execute the command
|
|
|
|
|
|
/// </summary>
|
|
|
|
|
|
public override void ExecuteBuild()
|
|
|
|
|
|
{
|
|
|
|
|
|
// Get the source and target streams
|
|
|
|
|
|
string Stream = ParseParamValue("Stream", P4Env.BuildRootP4);
|
|
|
|
|
|
string Changes = ParseParamValue("Changes", null);
|
2016-07-06 22:10:20 -04:00
|
|
|
|
string Lockdown = ParseParamValue("Lockdown", "Nick.Penwarden");
|
Copying //UE4/Dev-Build to //UE4/Dev-Main (Source: //UE4/Dev-Build @ 2959429)
==========================
MAJOR FEATURES + CHANGES
==========================
Change 2945275 on 2016/04/15 by Ben.Marsh
BuildCommonTools: Stop forcing the DeleteBuildProducts flag to true; just respect the -Clean parameter from the command line.
Change 2946668 on 2016/04/18 by Ben.Marsh
EC: Prevent lookbehind for UBT error strings on Mac.
Change 2952657 on 2016/04/22 by Ben.Marsh
UGS: Require the user to explicitly choose to show *.uprojectdirs files, to discourage people from selecting the first thing they see in a synced branch. The uprojectdirs workflow is only used by Engine QA, but catches a lot of people out.
Change 2954256 on 2016/04/25 by Ben.Marsh
EC: Fix lines starting with error: and warning: being swallowed by the postprocessor. Also remove confusing 4 line look-behind on generic error and warning messages.
Change 2954449 on 2016/04/25 by Ben.Marsh
Use the original application name for log files (and for the prefix in stdout), rather than the application name after the host platform has modified it. Prevents UAT/UBT calls showing up with a "mono: " prefix on Mac, rather than "AutomationTool:" or "UnrealBuildTool:".
Change 2955885 on 2016/04/26 by Ben.Marsh
BuildGraph: Allow passing -Clean on the command line to propagate to UE4Build, impacting how targets are compiled as well as clearing the cached BuildGraph state. Add a second parameter, -ClearHistory, to just wipe the history of completed nodes.
Change 2955919 on 2016/04/26 by Chad.Garyet
Fixed timestamp resolution to check for two seconds instead of two ticks. This was causing mac builders to throw false positives on file changes
Change 2956118 on 2016/04/26 by Ben.Marsh
BuildGraph: Add support for conditional blocks in BuildGraph scripts, either with a simple condition, or picking from a list of options. Two new elements can be added anywhere in scripts:
<Do If="...">
<!-- Inner elements -->
</Do>
<Choose>
<Option If="...">
<!-- Inner elements -->
</Option>
<Option If="...">
<!-- Inner elements -->
</Option>
<Otherwise>
<!-- Inner elements -->
</Otherwise>
</Choose>
Change 2956792 on 2016/04/26 by Ben.Marsh
EC: Prevent scheduled builds being queued up, and starting at times other than the times they're scheduled for. Prevents builds which have just been added to the stream settings from starting immediately, and prevents full builds starting during the day (as soon as the first change is made).
Change 2957131 on 2016/04/26 by Ben.Marsh
EC: Increase the precedence of the stack trace matcher.
Change 2957419 on 2016/04/27 by Ben.Marsh
EC: Skip the "end: stack for UAT" line in postp.
Change 2957588 on 2016/04/27 by Ben.Marsh
Core: Change formatting for callstacks for crashes and ensures so that EC can parse them from logs more easily.
Change 2958047 on 2016/04/27 by Ben.Marsh
BuildGraph: Feature to generate reports as part of build graph scripts. Reports operate similarly to triggers, but just provide a summary of completed jobsteps without offering to run a downstream job. Syntax is similar to declaring aggregates: <Report Name="Summary" Requires="Node1;Node2"/>
Change 2958188 on 2016/04/27 by Ben.Marsh
BuildGraph: Automatically generate a report when a preflight completes.
Change 2959053 on 2016/04/28 by Ben.Marsh
BuildGraph: Move the CleanTempStorage commandlet into BuildGraph, and add support for cleaning out new-style temp storage directories (which do not contain TempManifest files).
Change 2959429 on 2016/04/28 by Ben.Marsh
UAT: Add a script to describe a stream being copied up to its parent. To use, just run the UAT command "StreamCopyDescription -Stream=//UE4/Dev-Build". Optionally specify -Changes=//UE4/OtherStream/Engine/...
#lockdown Nick.Penwarden
[CL 2959583 by Ben Marsh in Main branch]
2016-04-28 14:13:21 -04:00
|
|
|
|
|
|
|
|
|
|
// Get changes which haven't been copied up from the current stream
|
|
|
|
|
|
string Descriptions;
|
2016-07-06 22:10:20 -04:00
|
|
|
|
string SourceStream;
|
|
|
|
|
|
int LastCl;
|
Copying //UE4/Dev-Build to //UE4/Dev-Main (Source: //UE4/Dev-Build @ 2959429)
==========================
MAJOR FEATURES + CHANGES
==========================
Change 2945275 on 2016/04/15 by Ben.Marsh
BuildCommonTools: Stop forcing the DeleteBuildProducts flag to true; just respect the -Clean parameter from the command line.
Change 2946668 on 2016/04/18 by Ben.Marsh
EC: Prevent lookbehind for UBT error strings on Mac.
Change 2952657 on 2016/04/22 by Ben.Marsh
UGS: Require the user to explicitly choose to show *.uprojectdirs files, to discourage people from selecting the first thing they see in a synced branch. The uprojectdirs workflow is only used by Engine QA, but catches a lot of people out.
Change 2954256 on 2016/04/25 by Ben.Marsh
EC: Fix lines starting with error: and warning: being swallowed by the postprocessor. Also remove confusing 4 line look-behind on generic error and warning messages.
Change 2954449 on 2016/04/25 by Ben.Marsh
Use the original application name for log files (and for the prefix in stdout), rather than the application name after the host platform has modified it. Prevents UAT/UBT calls showing up with a "mono: " prefix on Mac, rather than "AutomationTool:" or "UnrealBuildTool:".
Change 2955885 on 2016/04/26 by Ben.Marsh
BuildGraph: Allow passing -Clean on the command line to propagate to UE4Build, impacting how targets are compiled as well as clearing the cached BuildGraph state. Add a second parameter, -ClearHistory, to just wipe the history of completed nodes.
Change 2955919 on 2016/04/26 by Chad.Garyet
Fixed timestamp resolution to check for two seconds instead of two ticks. This was causing mac builders to throw false positives on file changes
Change 2956118 on 2016/04/26 by Ben.Marsh
BuildGraph: Add support for conditional blocks in BuildGraph scripts, either with a simple condition, or picking from a list of options. Two new elements can be added anywhere in scripts:
<Do If="...">
<!-- Inner elements -->
</Do>
<Choose>
<Option If="...">
<!-- Inner elements -->
</Option>
<Option If="...">
<!-- Inner elements -->
</Option>
<Otherwise>
<!-- Inner elements -->
</Otherwise>
</Choose>
Change 2956792 on 2016/04/26 by Ben.Marsh
EC: Prevent scheduled builds being queued up, and starting at times other than the times they're scheduled for. Prevents builds which have just been added to the stream settings from starting immediately, and prevents full builds starting during the day (as soon as the first change is made).
Change 2957131 on 2016/04/26 by Ben.Marsh
EC: Increase the precedence of the stack trace matcher.
Change 2957419 on 2016/04/27 by Ben.Marsh
EC: Skip the "end: stack for UAT" line in postp.
Change 2957588 on 2016/04/27 by Ben.Marsh
Core: Change formatting for callstacks for crashes and ensures so that EC can parse them from logs more easily.
Change 2958047 on 2016/04/27 by Ben.Marsh
BuildGraph: Feature to generate reports as part of build graph scripts. Reports operate similarly to triggers, but just provide a summary of completed jobsteps without offering to run a downstream job. Syntax is similar to declaring aggregates: <Report Name="Summary" Requires="Node1;Node2"/>
Change 2958188 on 2016/04/27 by Ben.Marsh
BuildGraph: Automatically generate a report when a preflight completes.
Change 2959053 on 2016/04/28 by Ben.Marsh
BuildGraph: Move the CleanTempStorage commandlet into BuildGraph, and add support for cleaning out new-style temp storage directories (which do not contain TempManifest files).
Change 2959429 on 2016/04/28 by Ben.Marsh
UAT: Add a script to describe a stream being copied up to its parent. To use, just run the UAT command "StreamCopyDescription -Stream=//UE4/Dev-Build". Optionally specify -Changes=//UE4/OtherStream/Engine/...
#lockdown Nick.Penwarden
[CL 2959583 by Ben Marsh in Main branch]
2016-04-28 14:13:21 -04:00
|
|
|
|
if (Changes == null)
|
|
|
|
|
|
{
|
|
|
|
|
|
ProcessResult Result = P4.P4(String.Format("interchanges -l -S {0}", Stream), AllowSpew: false);
|
|
|
|
|
|
Descriptions = Result.Output.Replace("\r\n", "\n");
|
2016-07-06 22:10:20 -04:00
|
|
|
|
SourceStream = Stream;
|
|
|
|
|
|
|
|
|
|
|
|
// Get the last submitted change in the source stream
|
|
|
|
|
|
List<P4Connection.ChangeRecord> ChangeRecords;
|
|
|
|
|
|
if (!P4.Changes(out ChangeRecords, String.Format("-m1 {0}/...", SourceStream), AllowSpew: false))
|
|
|
|
|
|
{
|
|
|
|
|
|
throw new AutomationException("Couldn't get changes for this branch");
|
|
|
|
|
|
}
|
|
|
|
|
|
LastCl = ChangeRecords[0].CL;
|
Copying //UE4/Dev-Build to //UE4/Dev-Main (Source: //UE4/Dev-Build @ 2959429)
==========================
MAJOR FEATURES + CHANGES
==========================
Change 2945275 on 2016/04/15 by Ben.Marsh
BuildCommonTools: Stop forcing the DeleteBuildProducts flag to true; just respect the -Clean parameter from the command line.
Change 2946668 on 2016/04/18 by Ben.Marsh
EC: Prevent lookbehind for UBT error strings on Mac.
Change 2952657 on 2016/04/22 by Ben.Marsh
UGS: Require the user to explicitly choose to show *.uprojectdirs files, to discourage people from selecting the first thing they see in a synced branch. The uprojectdirs workflow is only used by Engine QA, but catches a lot of people out.
Change 2954256 on 2016/04/25 by Ben.Marsh
EC: Fix lines starting with error: and warning: being swallowed by the postprocessor. Also remove confusing 4 line look-behind on generic error and warning messages.
Change 2954449 on 2016/04/25 by Ben.Marsh
Use the original application name for log files (and for the prefix in stdout), rather than the application name after the host platform has modified it. Prevents UAT/UBT calls showing up with a "mono: " prefix on Mac, rather than "AutomationTool:" or "UnrealBuildTool:".
Change 2955885 on 2016/04/26 by Ben.Marsh
BuildGraph: Allow passing -Clean on the command line to propagate to UE4Build, impacting how targets are compiled as well as clearing the cached BuildGraph state. Add a second parameter, -ClearHistory, to just wipe the history of completed nodes.
Change 2955919 on 2016/04/26 by Chad.Garyet
Fixed timestamp resolution to check for two seconds instead of two ticks. This was causing mac builders to throw false positives on file changes
Change 2956118 on 2016/04/26 by Ben.Marsh
BuildGraph: Add support for conditional blocks in BuildGraph scripts, either with a simple condition, or picking from a list of options. Two new elements can be added anywhere in scripts:
<Do If="...">
<!-- Inner elements -->
</Do>
<Choose>
<Option If="...">
<!-- Inner elements -->
</Option>
<Option If="...">
<!-- Inner elements -->
</Option>
<Otherwise>
<!-- Inner elements -->
</Otherwise>
</Choose>
Change 2956792 on 2016/04/26 by Ben.Marsh
EC: Prevent scheduled builds being queued up, and starting at times other than the times they're scheduled for. Prevents builds which have just been added to the stream settings from starting immediately, and prevents full builds starting during the day (as soon as the first change is made).
Change 2957131 on 2016/04/26 by Ben.Marsh
EC: Increase the precedence of the stack trace matcher.
Change 2957419 on 2016/04/27 by Ben.Marsh
EC: Skip the "end: stack for UAT" line in postp.
Change 2957588 on 2016/04/27 by Ben.Marsh
Core: Change formatting for callstacks for crashes and ensures so that EC can parse them from logs more easily.
Change 2958047 on 2016/04/27 by Ben.Marsh
BuildGraph: Feature to generate reports as part of build graph scripts. Reports operate similarly to triggers, but just provide a summary of completed jobsteps without offering to run a downstream job. Syntax is similar to declaring aggregates: <Report Name="Summary" Requires="Node1;Node2"/>
Change 2958188 on 2016/04/27 by Ben.Marsh
BuildGraph: Automatically generate a report when a preflight completes.
Change 2959053 on 2016/04/28 by Ben.Marsh
BuildGraph: Move the CleanTempStorage commandlet into BuildGraph, and add support for cleaning out new-style temp storage directories (which do not contain TempManifest files).
Change 2959429 on 2016/04/28 by Ben.Marsh
UAT: Add a script to describe a stream being copied up to its parent. To use, just run the UAT command "StreamCopyDescription -Stream=//UE4/Dev-Build". Optionally specify -Changes=//UE4/OtherStream/Engine/...
#lockdown Nick.Penwarden
[CL 2959583 by Ben Marsh in Main branch]
2016-04-28 14:13:21 -04:00
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
{
|
2016-04-29 05:46:08 -04:00
|
|
|
|
ProcessResult Result = P4.P4(String.Format("changes -l {0}", Changes), AllowSpew: false);
|
Copying //UE4/Dev-Build to //UE4/Dev-Main (Source: //UE4/Dev-Build @ 2959429)
==========================
MAJOR FEATURES + CHANGES
==========================
Change 2945275 on 2016/04/15 by Ben.Marsh
BuildCommonTools: Stop forcing the DeleteBuildProducts flag to true; just respect the -Clean parameter from the command line.
Change 2946668 on 2016/04/18 by Ben.Marsh
EC: Prevent lookbehind for UBT error strings on Mac.
Change 2952657 on 2016/04/22 by Ben.Marsh
UGS: Require the user to explicitly choose to show *.uprojectdirs files, to discourage people from selecting the first thing they see in a synced branch. The uprojectdirs workflow is only used by Engine QA, but catches a lot of people out.
Change 2954256 on 2016/04/25 by Ben.Marsh
EC: Fix lines starting with error: and warning: being swallowed by the postprocessor. Also remove confusing 4 line look-behind on generic error and warning messages.
Change 2954449 on 2016/04/25 by Ben.Marsh
Use the original application name for log files (and for the prefix in stdout), rather than the application name after the host platform has modified it. Prevents UAT/UBT calls showing up with a "mono: " prefix on Mac, rather than "AutomationTool:" or "UnrealBuildTool:".
Change 2955885 on 2016/04/26 by Ben.Marsh
BuildGraph: Allow passing -Clean on the command line to propagate to UE4Build, impacting how targets are compiled as well as clearing the cached BuildGraph state. Add a second parameter, -ClearHistory, to just wipe the history of completed nodes.
Change 2955919 on 2016/04/26 by Chad.Garyet
Fixed timestamp resolution to check for two seconds instead of two ticks. This was causing mac builders to throw false positives on file changes
Change 2956118 on 2016/04/26 by Ben.Marsh
BuildGraph: Add support for conditional blocks in BuildGraph scripts, either with a simple condition, or picking from a list of options. Two new elements can be added anywhere in scripts:
<Do If="...">
<!-- Inner elements -->
</Do>
<Choose>
<Option If="...">
<!-- Inner elements -->
</Option>
<Option If="...">
<!-- Inner elements -->
</Option>
<Otherwise>
<!-- Inner elements -->
</Otherwise>
</Choose>
Change 2956792 on 2016/04/26 by Ben.Marsh
EC: Prevent scheduled builds being queued up, and starting at times other than the times they're scheduled for. Prevents builds which have just been added to the stream settings from starting immediately, and prevents full builds starting during the day (as soon as the first change is made).
Change 2957131 on 2016/04/26 by Ben.Marsh
EC: Increase the precedence of the stack trace matcher.
Change 2957419 on 2016/04/27 by Ben.Marsh
EC: Skip the "end: stack for UAT" line in postp.
Change 2957588 on 2016/04/27 by Ben.Marsh
Core: Change formatting for callstacks for crashes and ensures so that EC can parse them from logs more easily.
Change 2958047 on 2016/04/27 by Ben.Marsh
BuildGraph: Feature to generate reports as part of build graph scripts. Reports operate similarly to triggers, but just provide a summary of completed jobsteps without offering to run a downstream job. Syntax is similar to declaring aggregates: <Report Name="Summary" Requires="Node1;Node2"/>
Change 2958188 on 2016/04/27 by Ben.Marsh
BuildGraph: Automatically generate a report when a preflight completes.
Change 2959053 on 2016/04/28 by Ben.Marsh
BuildGraph: Move the CleanTempStorage commandlet into BuildGraph, and add support for cleaning out new-style temp storage directories (which do not contain TempManifest files).
Change 2959429 on 2016/04/28 by Ben.Marsh
UAT: Add a script to describe a stream being copied up to its parent. To use, just run the UAT command "StreamCopyDescription -Stream=//UE4/Dev-Build". Optionally specify -Changes=//UE4/OtherStream/Engine/...
#lockdown Nick.Penwarden
[CL 2959583 by Ben Marsh in Main branch]
2016-04-28 14:13:21 -04:00
|
|
|
|
Descriptions = Result.Output.Replace("\r\n", "\n");
|
2016-07-06 22:10:20 -04:00
|
|
|
|
SourceStream = Regex.Replace(Changes, @"(\/(?:\/[^\/]*){2}).*", "$1");
|
|
|
|
|
|
LastCl = Int32.Parse(Regex.Replace(Changes, ".*,", ""));
|
Copying //UE4/Dev-Build to //UE4/Dev-Main (Source: //UE4/Dev-Build @ 2959429)
==========================
MAJOR FEATURES + CHANGES
==========================
Change 2945275 on 2016/04/15 by Ben.Marsh
BuildCommonTools: Stop forcing the DeleteBuildProducts flag to true; just respect the -Clean parameter from the command line.
Change 2946668 on 2016/04/18 by Ben.Marsh
EC: Prevent lookbehind for UBT error strings on Mac.
Change 2952657 on 2016/04/22 by Ben.Marsh
UGS: Require the user to explicitly choose to show *.uprojectdirs files, to discourage people from selecting the first thing they see in a synced branch. The uprojectdirs workflow is only used by Engine QA, but catches a lot of people out.
Change 2954256 on 2016/04/25 by Ben.Marsh
EC: Fix lines starting with error: and warning: being swallowed by the postprocessor. Also remove confusing 4 line look-behind on generic error and warning messages.
Change 2954449 on 2016/04/25 by Ben.Marsh
Use the original application name for log files (and for the prefix in stdout), rather than the application name after the host platform has modified it. Prevents UAT/UBT calls showing up with a "mono: " prefix on Mac, rather than "AutomationTool:" or "UnrealBuildTool:".
Change 2955885 on 2016/04/26 by Ben.Marsh
BuildGraph: Allow passing -Clean on the command line to propagate to UE4Build, impacting how targets are compiled as well as clearing the cached BuildGraph state. Add a second parameter, -ClearHistory, to just wipe the history of completed nodes.
Change 2955919 on 2016/04/26 by Chad.Garyet
Fixed timestamp resolution to check for two seconds instead of two ticks. This was causing mac builders to throw false positives on file changes
Change 2956118 on 2016/04/26 by Ben.Marsh
BuildGraph: Add support for conditional blocks in BuildGraph scripts, either with a simple condition, or picking from a list of options. Two new elements can be added anywhere in scripts:
<Do If="...">
<!-- Inner elements -->
</Do>
<Choose>
<Option If="...">
<!-- Inner elements -->
</Option>
<Option If="...">
<!-- Inner elements -->
</Option>
<Otherwise>
<!-- Inner elements -->
</Otherwise>
</Choose>
Change 2956792 on 2016/04/26 by Ben.Marsh
EC: Prevent scheduled builds being queued up, and starting at times other than the times they're scheduled for. Prevents builds which have just been added to the stream settings from starting immediately, and prevents full builds starting during the day (as soon as the first change is made).
Change 2957131 on 2016/04/26 by Ben.Marsh
EC: Increase the precedence of the stack trace matcher.
Change 2957419 on 2016/04/27 by Ben.Marsh
EC: Skip the "end: stack for UAT" line in postp.
Change 2957588 on 2016/04/27 by Ben.Marsh
Core: Change formatting for callstacks for crashes and ensures so that EC can parse them from logs more easily.
Change 2958047 on 2016/04/27 by Ben.Marsh
BuildGraph: Feature to generate reports as part of build graph scripts. Reports operate similarly to triggers, but just provide a summary of completed jobsteps without offering to run a downstream job. Syntax is similar to declaring aggregates: <Report Name="Summary" Requires="Node1;Node2"/>
Change 2958188 on 2016/04/27 by Ben.Marsh
BuildGraph: Automatically generate a report when a preflight completes.
Change 2959053 on 2016/04/28 by Ben.Marsh
BuildGraph: Move the CleanTempStorage commandlet into BuildGraph, and add support for cleaning out new-style temp storage directories (which do not contain TempManifest files).
Change 2959429 on 2016/04/28 by Ben.Marsh
UAT: Add a script to describe a stream being copied up to its parent. To use, just run the UAT command "StreamCopyDescription -Stream=//UE4/Dev-Build". Optionally specify -Changes=//UE4/OtherStream/Engine/...
#lockdown Nick.Penwarden
[CL 2959583 by Ben Marsh in Main branch]
2016-04-28 14:13:21 -04:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// Clean any workspace names that may reveal internal information
|
|
|
|
|
|
Descriptions = Regex.Replace(Descriptions, "(Change[^@]*)@.*", "$1", RegexOptions.Multiline);
|
|
|
|
|
|
|
|
|
|
|
|
// Remove changes by the build machine
|
|
|
|
|
|
Descriptions = Regex.Replace(Descriptions, "[^\n]*buildmachine\n(\n|\t[^\n]*\n)*", "");
|
|
|
|
|
|
|
|
|
|
|
|
// Figure out the target stream
|
|
|
|
|
|
ProcessResult StreamResult = P4.P4(String.Format("stream -o {0}", Stream), AllowSpew: false);
|
|
|
|
|
|
if (StreamResult.ExitCode != 0)
|
|
|
|
|
|
{
|
|
|
|
|
|
throw new AutomationException("Couldn't get stream description for {0}", Stream);
|
|
|
|
|
|
}
|
|
|
|
|
|
string Target = P4Spec.FromString(StreamResult.Output).GetField("Parent");
|
|
|
|
|
|
if(Target == null)
|
|
|
|
|
|
{
|
|
|
|
|
|
throw new AutomationException("Couldn't get parent stream for {0}", Stream);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// Write the output file
|
Copying //UE4/Dev-Build to //UE4/Dev-Main (Source: //UE4/Dev-Build @ 2972140)
==========================
MAJOR FEATURES + CHANGES
==========================
Change 2959679 on 2016/04/28 by Ben.Marsh
UGS: Show the original author for changes with a #ROBOMERGE-AUTHOR tag.
Change 2959695 on 2016/04/28 by Ben.Marsh
UGS: Only filter out changes from by buildmachine that contain the string "CIS Counter".
Change 2960798 on 2016/04/29 by Ben.Marsh
Remove C++ version of ParallelExecutor. Now implemented in C# as part of UAT.
Change 2960928 on 2016/04/29 by Ben.Marsh
UGS: Change filter for buildmachine changes to only include rebuilt lightmaps.
Change 2963214 on 2016/05/02 by Ben.Marsh
BuildGraph: Allow specifying optional dependencies for a node, indicating that the build products from an upstream node are desired, but should not block the node from running.
Change 2964454 on 2016/05/03 by Ben.Marsh
Change PostBuildInfoTool to PostBadgeStatus, and add position-independent argument parsing.
Change 2964533 on 2016/05/03 by Ben.Marsh
BuildGraph: Add the ability to generate summary badges from BuildGraph scripts, which can be pushed into a separate database for consumption by UGS.
Change 2964852 on 2016/05/03 by Ben.Marsh
BuildGraph: Add a task which can submit a set of files to Perforce, optionally creating and using a different workspace to do so.
Change 2966856 on 2016/05/04 by Ben.Marsh
EC: Allow specifying a filter for the changes considered when looking for the most recent change. Allows filtering out content changes for UGS builds, code-only builds, etc...
Change 2966867 on 2016/05/04 by Ben.Marsh
EC: Restore code to always set time in CIS state; we never want large builds to trigger off their defined interval.
Change 2967504 on 2016/05/05 by Ben.Marsh
UAT: Make sure the intermediate directory exists before writing out the list of changes in StreamCopyDescription.
Change 2967778 on 2016/05/05 by Ben.Marsh
UAT: Detect the P4 environment by querying Perforce for the setting of P4PORT, rather than assuming it's set in an environment variable. Windows stores this setting in the registry rather than the environment, but it's also valid to be set via P4CONFIG.
Change 2967815 on 2016/05/05 by Ben.Marsh
EC: Copy the initial resource pool setting from the stream settings into an EC property
Change 2967873 on 2016/05/05 by Ben.Marsh
EC: Allow stream settings to be stored directly in /GUBP_V5/Streams/ rather than having to be in a child property sheet.
Change 2969294 on 2016/05/06 by Ben.Marsh
EC: Extend ConformResources command to allow updating the pools that resources are assigned to, and to limit the number of machines which are syncing at once. Also added new EC procedure to allow specifying these arguments.
Change 2969371 on 2016/05/06 by Ben.Marsh
EC: Allow overriding the stream and workspace identifier synced by the builders. Overriding the stream allows syncing a narrower view of files (eg. Dev-Main vs Main), and overriding the workspace identifier allows sharing a workspace between two streams.
Change 2970623 on 2016/05/09 by Ben.Marsh
UAT: Prevent Ctrl-C handler delegate from being garbage collected and failing to be triggered.
Change 2970627 on 2016/05/09 by Ben.Marsh
UAT: Don't limit the list of valid target platforms specified on the command line to just those that we have initialized. Ignoring the platform if the SDK is not installed is never what the user wants.
Change 2972140 on 2016/05/10 by Ben.Marsh
Change 'Engine, Tools and Monolithics' to include QAGame and Template editors, but exclude everything downstream of a trigger.
#lockdown Nick.Penwarden
[CL 2972146 by Ben Marsh in Main branch]
2016-05-10 08:49:41 -04:00
|
|
|
|
string OutputDirName = Path.Combine(CommandUtils.CmdEnv.LocalRoot, "Engine", "Intermediate");
|
|
|
|
|
|
CommandUtils.CreateDirectory(OutputDirName);
|
|
|
|
|
|
string OutputFileName = Path.Combine(OutputDirName, "Changes.txt");
|
Copying //UE4/Dev-Build to //UE4/Dev-Main (Source: //UE4/Dev-Build @ 2959429)
==========================
MAJOR FEATURES + CHANGES
==========================
Change 2945275 on 2016/04/15 by Ben.Marsh
BuildCommonTools: Stop forcing the DeleteBuildProducts flag to true; just respect the -Clean parameter from the command line.
Change 2946668 on 2016/04/18 by Ben.Marsh
EC: Prevent lookbehind for UBT error strings on Mac.
Change 2952657 on 2016/04/22 by Ben.Marsh
UGS: Require the user to explicitly choose to show *.uprojectdirs files, to discourage people from selecting the first thing they see in a synced branch. The uprojectdirs workflow is only used by Engine QA, but catches a lot of people out.
Change 2954256 on 2016/04/25 by Ben.Marsh
EC: Fix lines starting with error: and warning: being swallowed by the postprocessor. Also remove confusing 4 line look-behind on generic error and warning messages.
Change 2954449 on 2016/04/25 by Ben.Marsh
Use the original application name for log files (and for the prefix in stdout), rather than the application name after the host platform has modified it. Prevents UAT/UBT calls showing up with a "mono: " prefix on Mac, rather than "AutomationTool:" or "UnrealBuildTool:".
Change 2955885 on 2016/04/26 by Ben.Marsh
BuildGraph: Allow passing -Clean on the command line to propagate to UE4Build, impacting how targets are compiled as well as clearing the cached BuildGraph state. Add a second parameter, -ClearHistory, to just wipe the history of completed nodes.
Change 2955919 on 2016/04/26 by Chad.Garyet
Fixed timestamp resolution to check for two seconds instead of two ticks. This was causing mac builders to throw false positives on file changes
Change 2956118 on 2016/04/26 by Ben.Marsh
BuildGraph: Add support for conditional blocks in BuildGraph scripts, either with a simple condition, or picking from a list of options. Two new elements can be added anywhere in scripts:
<Do If="...">
<!-- Inner elements -->
</Do>
<Choose>
<Option If="...">
<!-- Inner elements -->
</Option>
<Option If="...">
<!-- Inner elements -->
</Option>
<Otherwise>
<!-- Inner elements -->
</Otherwise>
</Choose>
Change 2956792 on 2016/04/26 by Ben.Marsh
EC: Prevent scheduled builds being queued up, and starting at times other than the times they're scheduled for. Prevents builds which have just been added to the stream settings from starting immediately, and prevents full builds starting during the day (as soon as the first change is made).
Change 2957131 on 2016/04/26 by Ben.Marsh
EC: Increase the precedence of the stack trace matcher.
Change 2957419 on 2016/04/27 by Ben.Marsh
EC: Skip the "end: stack for UAT" line in postp.
Change 2957588 on 2016/04/27 by Ben.Marsh
Core: Change formatting for callstacks for crashes and ensures so that EC can parse them from logs more easily.
Change 2958047 on 2016/04/27 by Ben.Marsh
BuildGraph: Feature to generate reports as part of build graph scripts. Reports operate similarly to triggers, but just provide a summary of completed jobsteps without offering to run a downstream job. Syntax is similar to declaring aggregates: <Report Name="Summary" Requires="Node1;Node2"/>
Change 2958188 on 2016/04/27 by Ben.Marsh
BuildGraph: Automatically generate a report when a preflight completes.
Change 2959053 on 2016/04/28 by Ben.Marsh
BuildGraph: Move the CleanTempStorage commandlet into BuildGraph, and add support for cleaning out new-style temp storage directories (which do not contain TempManifest files).
Change 2959429 on 2016/04/28 by Ben.Marsh
UAT: Add a script to describe a stream being copied up to its parent. To use, just run the UAT command "StreamCopyDescription -Stream=//UE4/Dev-Build". Optionally specify -Changes=//UE4/OtherStream/Engine/...
#lockdown Nick.Penwarden
[CL 2959583 by Ben Marsh in Main branch]
2016-04-28 14:13:21 -04:00
|
|
|
|
using (StreamWriter Writer = new StreamWriter(OutputFileName))
|
|
|
|
|
|
{
|
2016-07-06 22:10:20 -04:00
|
|
|
|
Writer.WriteLine("Copying {0} to {1} (Source: {2} @ {3})", Stream, Target.Trim(), SourceStream, LastCl);
|
|
|
|
|
|
Writer.WriteLine("#lockdown {0}", Lockdown);
|
Copying //UE4/Dev-Build to //UE4/Dev-Main (Source: //UE4/Dev-Build @ 2959429)
==========================
MAJOR FEATURES + CHANGES
==========================
Change 2945275 on 2016/04/15 by Ben.Marsh
BuildCommonTools: Stop forcing the DeleteBuildProducts flag to true; just respect the -Clean parameter from the command line.
Change 2946668 on 2016/04/18 by Ben.Marsh
EC: Prevent lookbehind for UBT error strings on Mac.
Change 2952657 on 2016/04/22 by Ben.Marsh
UGS: Require the user to explicitly choose to show *.uprojectdirs files, to discourage people from selecting the first thing they see in a synced branch. The uprojectdirs workflow is only used by Engine QA, but catches a lot of people out.
Change 2954256 on 2016/04/25 by Ben.Marsh
EC: Fix lines starting with error: and warning: being swallowed by the postprocessor. Also remove confusing 4 line look-behind on generic error and warning messages.
Change 2954449 on 2016/04/25 by Ben.Marsh
Use the original application name for log files (and for the prefix in stdout), rather than the application name after the host platform has modified it. Prevents UAT/UBT calls showing up with a "mono: " prefix on Mac, rather than "AutomationTool:" or "UnrealBuildTool:".
Change 2955885 on 2016/04/26 by Ben.Marsh
BuildGraph: Allow passing -Clean on the command line to propagate to UE4Build, impacting how targets are compiled as well as clearing the cached BuildGraph state. Add a second parameter, -ClearHistory, to just wipe the history of completed nodes.
Change 2955919 on 2016/04/26 by Chad.Garyet
Fixed timestamp resolution to check for two seconds instead of two ticks. This was causing mac builders to throw false positives on file changes
Change 2956118 on 2016/04/26 by Ben.Marsh
BuildGraph: Add support for conditional blocks in BuildGraph scripts, either with a simple condition, or picking from a list of options. Two new elements can be added anywhere in scripts:
<Do If="...">
<!-- Inner elements -->
</Do>
<Choose>
<Option If="...">
<!-- Inner elements -->
</Option>
<Option If="...">
<!-- Inner elements -->
</Option>
<Otherwise>
<!-- Inner elements -->
</Otherwise>
</Choose>
Change 2956792 on 2016/04/26 by Ben.Marsh
EC: Prevent scheduled builds being queued up, and starting at times other than the times they're scheduled for. Prevents builds which have just been added to the stream settings from starting immediately, and prevents full builds starting during the day (as soon as the first change is made).
Change 2957131 on 2016/04/26 by Ben.Marsh
EC: Increase the precedence of the stack trace matcher.
Change 2957419 on 2016/04/27 by Ben.Marsh
EC: Skip the "end: stack for UAT" line in postp.
Change 2957588 on 2016/04/27 by Ben.Marsh
Core: Change formatting for callstacks for crashes and ensures so that EC can parse them from logs more easily.
Change 2958047 on 2016/04/27 by Ben.Marsh
BuildGraph: Feature to generate reports as part of build graph scripts. Reports operate similarly to triggers, but just provide a summary of completed jobsteps without offering to run a downstream job. Syntax is similar to declaring aggregates: <Report Name="Summary" Requires="Node1;Node2"/>
Change 2958188 on 2016/04/27 by Ben.Marsh
BuildGraph: Automatically generate a report when a preflight completes.
Change 2959053 on 2016/04/28 by Ben.Marsh
BuildGraph: Move the CleanTempStorage commandlet into BuildGraph, and add support for cleaning out new-style temp storage directories (which do not contain TempManifest files).
Change 2959429 on 2016/04/28 by Ben.Marsh
UAT: Add a script to describe a stream being copied up to its parent. To use, just run the UAT command "StreamCopyDescription -Stream=//UE4/Dev-Build". Optionally specify -Changes=//UE4/OtherStream/Engine/...
#lockdown Nick.Penwarden
[CL 2959583 by Ben Marsh in Main branch]
2016-04-28 14:13:21 -04:00
|
|
|
|
Writer.WriteLine();
|
|
|
|
|
|
Writer.WriteLine("==========================");
|
|
|
|
|
|
Writer.WriteLine("MAJOR FEATURES + CHANGES");
|
|
|
|
|
|
Writer.WriteLine("==========================");
|
|
|
|
|
|
Writer.WriteLine();
|
|
|
|
|
|
|
|
|
|
|
|
foreach (string Line in Descriptions.Split('\n'))
|
|
|
|
|
|
{
|
|
|
|
|
|
string TrimLine = Line.TrimStart();
|
2016-07-06 22:10:20 -04:00
|
|
|
|
if(!TrimLine.StartsWith("#codereview", StringComparison.OrdinalIgnoreCase) && !TrimLine.StartsWith("#rb", StringComparison.OrdinalIgnoreCase) && !TrimLine.StartsWith("#lockdown", StringComparison.OrdinalIgnoreCase))
|
Copying //UE4/Dev-Build to //UE4/Dev-Main (Source: //UE4/Dev-Build @ 2959429)
==========================
MAJOR FEATURES + CHANGES
==========================
Change 2945275 on 2016/04/15 by Ben.Marsh
BuildCommonTools: Stop forcing the DeleteBuildProducts flag to true; just respect the -Clean parameter from the command line.
Change 2946668 on 2016/04/18 by Ben.Marsh
EC: Prevent lookbehind for UBT error strings on Mac.
Change 2952657 on 2016/04/22 by Ben.Marsh
UGS: Require the user to explicitly choose to show *.uprojectdirs files, to discourage people from selecting the first thing they see in a synced branch. The uprojectdirs workflow is only used by Engine QA, but catches a lot of people out.
Change 2954256 on 2016/04/25 by Ben.Marsh
EC: Fix lines starting with error: and warning: being swallowed by the postprocessor. Also remove confusing 4 line look-behind on generic error and warning messages.
Change 2954449 on 2016/04/25 by Ben.Marsh
Use the original application name for log files (and for the prefix in stdout), rather than the application name after the host platform has modified it. Prevents UAT/UBT calls showing up with a "mono: " prefix on Mac, rather than "AutomationTool:" or "UnrealBuildTool:".
Change 2955885 on 2016/04/26 by Ben.Marsh
BuildGraph: Allow passing -Clean on the command line to propagate to UE4Build, impacting how targets are compiled as well as clearing the cached BuildGraph state. Add a second parameter, -ClearHistory, to just wipe the history of completed nodes.
Change 2955919 on 2016/04/26 by Chad.Garyet
Fixed timestamp resolution to check for two seconds instead of two ticks. This was causing mac builders to throw false positives on file changes
Change 2956118 on 2016/04/26 by Ben.Marsh
BuildGraph: Add support for conditional blocks in BuildGraph scripts, either with a simple condition, or picking from a list of options. Two new elements can be added anywhere in scripts:
<Do If="...">
<!-- Inner elements -->
</Do>
<Choose>
<Option If="...">
<!-- Inner elements -->
</Option>
<Option If="...">
<!-- Inner elements -->
</Option>
<Otherwise>
<!-- Inner elements -->
</Otherwise>
</Choose>
Change 2956792 on 2016/04/26 by Ben.Marsh
EC: Prevent scheduled builds being queued up, and starting at times other than the times they're scheduled for. Prevents builds which have just been added to the stream settings from starting immediately, and prevents full builds starting during the day (as soon as the first change is made).
Change 2957131 on 2016/04/26 by Ben.Marsh
EC: Increase the precedence of the stack trace matcher.
Change 2957419 on 2016/04/27 by Ben.Marsh
EC: Skip the "end: stack for UAT" line in postp.
Change 2957588 on 2016/04/27 by Ben.Marsh
Core: Change formatting for callstacks for crashes and ensures so that EC can parse them from logs more easily.
Change 2958047 on 2016/04/27 by Ben.Marsh
BuildGraph: Feature to generate reports as part of build graph scripts. Reports operate similarly to triggers, but just provide a summary of completed jobsteps without offering to run a downstream job. Syntax is similar to declaring aggregates: <Report Name="Summary" Requires="Node1;Node2"/>
Change 2958188 on 2016/04/27 by Ben.Marsh
BuildGraph: Automatically generate a report when a preflight completes.
Change 2959053 on 2016/04/28 by Ben.Marsh
BuildGraph: Move the CleanTempStorage commandlet into BuildGraph, and add support for cleaning out new-style temp storage directories (which do not contain TempManifest files).
Change 2959429 on 2016/04/28 by Ben.Marsh
UAT: Add a script to describe a stream being copied up to its parent. To use, just run the UAT command "StreamCopyDescription -Stream=//UE4/Dev-Build". Optionally specify -Changes=//UE4/OtherStream/Engine/...
#lockdown Nick.Penwarden
[CL 2959583 by Ben Marsh in Main branch]
2016-04-28 14:13:21 -04:00
|
|
|
|
{
|
|
|
|
|
|
Writer.WriteLine(Line);
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
Log("Written {0}.", OutputFileName);
|
|
|
|
|
|
|
|
|
|
|
|
// Open it with the default text editor
|
|
|
|
|
|
Process.Start(OutputFileName);
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|