Commit Graph

142 Commits

Author SHA1 Message Date
James Hopkin
1edd7720d5 UBT: allow multiple -SingleFile arguments. Now stores SpecifcFilesToCompile list rather than single file reference.
#rb Ben.Marsh

#ROBOMERGE-OWNER: james.hopkin
#ROBOMERGE-AUTHOR: james.hopkin
#ROBOMERGE-SOURCE: CL 12779149 via CL 12779152 via CL 12779160
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v681-12776863)

[CL 12782243 by James Hopkin in Main branch]
2020-04-14 13:31:51 -04:00
Ben Marsh
d6d7c939e5 Copying //UE4/Dev-Build to Dev-Main (//UE4/Dev-Main)
#rb none

[CL 12726184 by Ben Marsh in Main branch]
2020-04-10 11:30:32 -04:00
ben marsh
7b1590f4ce UBT: Add a warning to discourage generating project files by passing arguments to GenerateProjectFiles.bat.
#rb none
#jira

#ROBOMERGE-SOURCE: CL 12356705 in //UE4/Release-4.25/... via CL 12356713
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v671-12333473)

[CL 12356726 by ben marsh in Main branch]
2020-03-20 20:55:23 -04:00
ryan vance
02bb20415f Copy up from DS to Main
#rb CopyUp



#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: ryan.vance
#ROBOMERGE-SOURCE: CL 12149088 via CL 12150247
#ROBOMERGE-BOT: (v659-12123632)

[CL 12150618 by ryan vance in Main branch]
2020-03-12 14:08:52 -04:00
ben marsh
ffd2f1ede7 Fix detection of engine modules being out of date.
#rb none
#jira UE-88824, UE-89676

#ROBOMERGE-SOURCE: CL 11658206 in //UE4/Release-4.25/... via CL 11658244
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v656-11643781)

[CL 11658322 by ben marsh in Main branch]
2020-02-27 11:10:22 -05:00
ben marsh
628a79285c Don't allow UBT to try and compile engine modules when the engine is already running.
#rb none
#jira UE-88824

#ROBOMERGE-SOURCE: CL 11637884 in //UE4/Release-4.25/... via CL 11637925
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v655-11596533)

[CL 11637942 by ben marsh in Main branch]
2020-02-26 13:33:44 -05:00
ben marsh
8031d00cef UBT: Remove read-only files when cleaning a target.
#rb none
#jira UE-89548

#ROBOMERGE-SOURCE: CL 11631033 in //UE4/Release-4.25/... via CL 11631036
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v655-11596533)

[CL 11631049 by ben marsh in Main branch]
2020-02-26 09:56:11 -05:00
ben marsh
1402b8eb9b Ignore check for active Live Coding session if the -NoHotReloadFromIDE argument is present. Allows creating a new C++ project while Live Coding is active.
#rb none
#jira UE-82398

#ROBOMERGE-SOURCE: CL 11630897 in //UE4/Release-4.25/... via CL 11630908
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v655-11596533)

[CL 11630926 by ben marsh in Main branch]
2020-02-26 09:50:01 -05:00
ben marsh
39179672d2 Output a warning if the root path is longer than 50 characters.
#rb none
#jira UE-88446
[FYI] Martin.Sevigny

#ROBOMERGE-SOURCE: CL 11625250 in //UE4/Release-4.25/... via CL 11625255
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v655-11596533)

[CL 11625268 by ben marsh in Main branch]
2020-02-25 21:06:22 -05:00
ben marsh
661248e268 UBT: Output a warning if any intermediate path is > 200 characters under the UE root directory.
#rb none
#jira UE-88446

#ROBOMERGE-SOURCE: CL 11624846 in //UE4/Release-4.25/... via CL 11624849
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v655-11596533)

[CL 11624868 by ben marsh in Main branch]
2020-02-25 20:49:06 -05:00
ben marsh
0af8f199e1 UBT: Fix log file being written to Engine directory, even in installed builds.
#rb none
#jira
UE-87654

#ROBOMERGE-SOURCE: CL 11592464 in //UE4/Release-4.25/... via CL 11592465
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v654-11333218)

[CL 11592466 by ben marsh in Main branch]
2020-02-24 19:03:20 -05:00
Rolando Caloca
5b82f15def Copying //UE4/Dev-RenderPlat-Staging@11388153 to //UE4/Main
#rb none
#rnx

[CL 11388545 by Rolando Caloca in Main branch]
2020-02-12 13:27:19 -05:00
Ben Marsh
64e23d62de UBT: Output toolchain info when doing XGE export.
#rb none
#rnx

[CL 11341939 by Ben Marsh in Main branch]
2020-02-11 12:56:09 -05:00
Chris Gagnon
c3f9a18841 Merge from Main in prep for Dev-Tools-Staging Copy up
#rb none

[CL 11221539 by Chris Gagnon in Dev-Tools-Staging branch]
2020-02-04 17:00:31 -05:00
Rolando Caloca
f63a3e857e Merging //UE4/Main@11178322 to Dev-RenderPlat-Staging
#rnx
#rb none

[CL 11195678 by Rolando Caloca in Dev-RenderPlat-Staging branch]
2020-01-31 10:34:10 -05:00
andrew grant
0190597b2d Added some more smarts to how UBT resolves the project argument when generating files. This makes it easier to generate project files manually as the behavior is more inline with other commands that can just take a project
Look for a candidate file either based on the -project argument or if there is an argument that ends in .uproject. Then check if the candidate exists (e.g if it's a full path),  if not use the ueprojectdirs entries to see if it exists in one of those directories.

(Note - it would be good to reconcile this code with some things in the Automation csproj that do the same thing, but there wasn't an obvious project for that to live in...).

[at]ben.marsh
#rb swarm


#ROBOMERGE-SOURCE: CL 11195074 via CL 11195078
#ROBOMERGE-BOT: (v640-11091645)

[CL 11195320 by andrew grant in Main branch]
2020-01-31 10:24:39 -05:00
Max Chen
b4881d8bf8 Copying //UE4/Dev-Editor to Dev-Tools-Staging (//UE4/Dev-Tools-Staging) @11123875
#rb none
#jira none

[CL 11123880 by Max Chen in Dev-Tools-Staging branch]
2020-01-27 20:11:15 -05:00
Juan Canada
2ecf4f9708 Merging //UE4/Dev-Main@10877709 to Dev-RenderPlat-Staging(//UE4/Dev-Rendering)
#rnx
#rb none

[CL 10895568 by Juan Canada in Dev-RenderPlat-Staging branch]
2020-01-07 13:45:01 -05:00
ben marsh
03ae195b79 Updating copyrights for Engine Programs.
#rnx
#rb none
#jira none

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: ryan.durand
#ROBOMERGE-SOURCE: CL 10869242 in //Fortnite/Release-12.00/... via CL 10869536 via CL 10870955
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build) (v624-10872983)

[CL 10876681 by ben marsh in Dev-Build branch]
2020-01-05 17:24:44 -05:00
Ryan Durand
9ef3748747 Updating copyrights for Engine Programs.
#rnx
#rb none
#jira none

#ROBOMERGE-OWNER: ryan.durand
#ROBOMERGE-AUTHOR: ryan.durand
#ROBOMERGE-SOURCE: CL 10869242 in //Fortnite/Release-12.00/... via CL 10869536
#ROBOMERGE-BOT: FORTNITE (Main -> Dev-EngineMerge) (v613-10869866)

[CL 10870955 by Ryan Durand in Main branch]
2019-12-26 23:01:54 -05:00
michael lentine
11934a4783 Add cross platform ISPC support from Dev-Anim to accelerate Chaos computations.
#rb Ben.Marsh

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: michael.lentine
#ROBOMERGE-SOURCE: CL 10727300 via CL 10727303 via CL 10727314 via CL 10727316 via CL 10727317
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build) (v610-10636431)

[CL 10822710 by michael lentine in Dev-Build branch]
2019-12-19 14:57:16 -05:00
michael lentine
f302c5d5fc Add cross platform ISPC support from Dev-Anim to accelerate Chaos computations.
#rb Ben.Marsh


#ROBOMERGE-OWNER: michael.lentine
#ROBOMERGE-AUTHOR: michael.lentine
#ROBOMERGE-SOURCE: CL 10727300 via CL 10727303 via CL 10727314 via CL 10727316
#ROBOMERGE-BOT: (v610-10636431)

[CL 10727317 by michael lentine in Main branch]
2019-12-13 23:35:01 -05:00
Joakim Lindqvist
3a8b293b1e Some command line arguments are now passed on to the target creation (visual studio version specifically). This fixes issues were overriding the visual studio version from command line would not be used in targets, resulting in errors when option like setting the compiler version were also used.
Reported in UDN:
https://udn.unrealengine.com/questions/528859/view.html

Also fixed so that HololensTarget is actually getting configured from setting sources, including command line and BuildConfiguration.xml which I added attributes for to match how Windows targets can be configured.

#rb ben.marsh

[CL 9866335 by Joakim Lindqvist in Dev-Build branch]
2019-10-28 04:53:02 -04:00
mitchell wilson
58c8a73ac3 Copying //UE4/Dev-Documentation to Samples-Main (//UE4/Samples-Main)
#rb none
#rnx

#ROBOMERGE-OWNER: jeanmichel.dignard
#ROBOMERGE-AUTHOR: mitchell.wilson
#ROBOMERGE-SOURCE: CL 9551884 in //UE4/Main/...
#ROBOMERGE-BOT: VP (Main -> Dev-Tools-Staging) (v538-9681622)

[CL 9692885 by mitchell wilson in Dev-Tools-Staging branch]
2019-10-18 13:42:07 -04:00
Mitchell Wilson
f0a83e9112 Copying //UE4/Dev-Documentation to Samples-Main (//UE4/Samples-Main)
#rb none
#rnx

[CL 9551884 by Mitchell Wilson in Main branch]
2019-10-11 16:59:16 -04:00