Commit Graph

113 Commits

Author SHA1 Message Date
Ben Marsh
b0da1f4fe7 Merging //UE4/Dev-Main to Dev-Build (//UE4/Dev-Build)
#rb none

[CL 4577636 by Ben Marsh in Dev-Build branch]
2018-11-19 10:12:17 -05:00
Matt Kuhlenschmidt
cde8160913 Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor)
#rb none

[CL 4572510 by Matt Kuhlenschmidt in Dev-Editor branch]
2018-11-16 11:15:08 -05:00
Ben Marsh
ea340d3fbf Copying //UE4/Fortnite-Staging to Dev-Main (//UE4/Dev-Main)
#rb none
#lockdown Nick.Penwarden

[CL 4567513 by Ben Marsh in Main branch]
2018-11-14 19:05:13 -05:00
Matt Kuhlenschmidt
0751bf9e3a Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor)
#rb none

[CL 4566293 by Matt Kuhlenschmidt in Dev-Editor branch]
2018-11-14 15:27:39 -05:00
Ben Marsh
73e25bf992 Merging //UE4/Dev-Main to Dev-Build (//UE4/Dev-Build)
#rb none

[CL 4556335 by Ben Marsh in Dev-Build branch]
2018-11-09 14:45:42 -05:00
Ben Marsh
b1d44977f8 Fix remote builds failing due to new default SSH key format generated by version of ssh included with MacOS Mojave. The new format (as indicated by a "BEGIN OPENSSH PRIVATE KEY" header) is not supported by the version of SSH that we ship with the engine.
* Remote building now includes the SSH error when a build fails.
* Any private keys that don't have a BEGIN RSA PRIVATE KEY header are rejected, causing MakeAndInstallSSHKey to be re-run.
* MakeAndInstallSSHKey.bat now passes -m PEM to ssh-keygen, to force generation of keys in the old format.

#rb none
#lockdown Nick.Penwarden

[CL 4555827 by Ben Marsh in Main branch]
2018-11-09 13:09:06 -05:00
Matt Kuhlenschmidt
46e3285149 Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor)
#rb none

[CL 4543237 by Matt Kuhlenschmidt in Dev-Editor branch]
2018-11-06 10:00:36 -05:00
Ben Marsh
bc435d1e8c UBT: Move generation of receipts and manifests, and execution of post-build steps, into the UBT action graph, to allow it to execute correctly when running with makefiles and when exported for other executors.
#rb none
#rnx

[CL 4522941 by Ben Marsh in Dev-Build branch]
2018-10-29 21:23:02 -04:00
Ben Marsh
0a43790392 Remove the StringUtils.FastEndsWith() method. The reason this is slow is that it uses a culture-aware comparison. Using the ordinal comparer from the FileSystemReference object should achieve the same result.
#rb none
#rnx

[CL 4515761 by Ben Marsh in Dev-Build branch]
2018-10-28 14:46:15 -04:00
Ben Marsh
89cc59756b Missing files
#rb none
#rnx

[CL 4515694 by Ben Marsh in Dev-Build branch]
2018-10-28 14:16:51 -04:00
Ben Marsh
4b8cf3ac14 Move command line classes to DotNETCommon.
#rb none
#rnx

[CL 4515685 by Ben Marsh in Dev-Build branch]
2018-10-28 14:16:15 -04:00
Ben Marsh
ff53f43673 Add a Json.Load() and Json.Save() function to quickly load and save an object to disk.
#rb none
#rnx

[CL 4511061 by Ben Marsh in Dev-Build branch]
2018-10-26 08:45:32 -04:00
Ben Marsh
3d64f99354 Add a wrapper around the FastJSON library that registers custom Epic types, and formats objects in the same style that the engine uses.
#rb none

[CL 4504313 by Ben Marsh in Dev-Build branch]
2018-10-24 17:05:26 -04:00
Ben Marsh
014add9a9f Redo changes that were (deliberately) clobbered in Dev-Main merge.
#rb none

[CL 4450647 by Ben Marsh in Dev-Build branch]
2018-10-11 09:19:19 -04:00
Ben Marsh
983f6e4d86 Merging //UE4/Dev-Main to Dev-Build (//UE4/Dev-Build)
#rb none

[CL 4450587 by Ben Marsh in Dev-Build branch]
2018-10-11 09:04:26 -04:00
ben marsh
80bced1121 Fix issues with mismatched solution/project configurations.
* Every C++ project now has an "invalid" configuration. Trying to build any solution configuration which does not apply to the project will now build that, which prints an error rather than building a completely different configuration.
* Available configurations are now parsed from C# files, so the "Release" configuration will now be used if "Development" is not available, and platforms are supported correctly.
* Programs are now built in game and editor configurations.

#rb none
#jira UE-59288

#ROBOMERGE-SOURCE: CL 4432766 in //UE4/Release-4.21/...
#ROBOMERGE-BOT: RELEASE (Release-4.21 -> Release-Staging-4.21)

[CL 4432767 by ben marsh in Staging-4.21 branch]
2018-10-05 14:20:40 -04:00
ben marsh
d35a845858 Output Visual Studio project files in the same format as Visual Studio, and use StringBuilders everywhere to avoid large numbers of string copies.
#rb none
#jira

#ROBOMERGE-SOURCE: CL 4431637 in //UE4/Release-4.21/...
#ROBOMERGE-BOT: RELEASE (Release-4.21 -> Release-Staging-4.21)

[CL 4431638 by ben marsh in Staging-4.21 branch]
2018-10-05 10:26:06 -04:00
ben marsh
f715abf901 Fix extra blank line at the end of ManagedProcess output.
#rb none
#jira UE-64780

#ROBOMERGE-SOURCE: CL 4426400 in //UE4/Release-4.21/...
#ROBOMERGE-BOT: RELEASE (Release-4.21 -> Release-Staging-4.21)

[CL 4426401 by ben marsh in Staging-4.21 branch]
2018-10-03 20:07:01 -04:00
ben marsh
b3498c74e1 UBT: Don't assume that console encoding is UTF-8 when using ParallelExecutor.
#rb none
#jira UE-64248

#ROBOMERGE-SOURCE: CL 4403151 in //UE4/Release-4.21/...
#ROBOMERGE-BOT: RELEASE (Release-4.21 -> Release-Staging-4.21)

[CL 4403153 by ben marsh in Staging-4.21 branch]
2018-09-27 16:43:37 -04:00
ben marsh
6b4551bbdf UBT: Fix a couple of edge cases when parsing output from child processes.
* If a single line was larger than 32kb, the process would be treated as having terminated.
* If the last output line did not have a trailing newline, the line would be dropped.

#rb none
#jira UE-64234

#ROBOMERGE-SOURCE: CL 4403074 in //UE4/Release-4.21/...
#ROBOMERGE-BOT: RELEASE (Release-4.21 -> Release-Staging-4.21)

[CL 4403075 by ben marsh in Staging-4.21 branch]
2018-09-27 16:32:12 -04:00
Ben Marsh
e270cddb14 Output any printable errors from Perforce as text, rather than as a hex dump.
#rb none

[CL 4385763 by Ben Marsh in Dev-Build branch]
2018-09-21 10:07:08 -04:00
Ben Marsh
0e40feeea3 UBT: Don't assume that console encoding is UTF-8 when using ParallelExecutor.
#rb none

[CL 4378791 by Ben Marsh in Dev-Build branch]
2018-09-19 15:56:24 -04:00
Ben Marsh
fbba95f673 UBT: Fix a couple of edge cases when parsing output from child processes.
* If a single line was larger than 32kb, the process would be treated as having terminated.
* If the last output line did not have a trailing newline, the line would be dropped.

#rb none
#jira UE-64234

[CL 4375598 by Ben Marsh in Dev-Build branch]
2018-09-18 20:13:24 -04:00
Ben Marsh
55ab20e910 Add convenience methods for creating a FileReference or DirectoryReference from a (possibly null) string.
#rb none
#rnx

[CL 4369414 by Ben Marsh in Dev-Build branch]
2018-09-17 12:20:07 -04:00
Ben Marsh
910812214e UBT: Add support for running UBT in different modes with separate command line parsing and entry points. Different modes derive from the ToolMode class, and use a [ToolMode] attribute to specify their name. Executing a mode is done with the -Mode=XXX parameter on the command line. The default mode implements traditional UBT functionality, but the WriteDocumentation mode can be used to output HTML documentation for BuildConfiguration, ModuleRules and TargetRules classes.
#rb none

[CL 4367612 by Ben Marsh in Dev-Build branch]
2018-09-15 12:58:49 -04:00