Commit Graph

5108 Commits

Author SHA1 Message Date
bob tellez
d544da877b #Gauntlet Fix parameter order
[FYI] Andrew.Grant


#ROBOMERGE-SOURCE: CL 7860707 via CL 7868820
#ROBOMERGE-BOT: (v389-7813075)

[CL 7870715 by bob tellez in Main branch]
2019-08-08 07:32:39 -04:00
joakim lindqvist
e594514033 Changed order in which modules are mapped to visual studio projects
It is now Game -> Mod -> Program -> Engine -> Enterprise

This resolves issues were a Program in the game source root would take all the source code away from the Game project.
In this case now though the Program source is put into the Game project, it is best to have program target in a Programs folder under the game source rather then at the same level as the game targets.

#rb none
[review]-7795550 ben.marsh

(ushell-p4-cherrypick of 7839052 by Joakim.Lindqvist)


Fixed incorrect check for non enigne modules which broke in 7839052.
Also changed local function to a member to fix build issue.

#rb none

#jira UE-76985

#ROBOMERGE-SOURCE: CL 7865223 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v389-7813075)

[CL 7865277 by joakim lindqvist in Main branch]
2019-08-08 05:06:56 -04:00
joakim lindqvist
67315195b4 VsCode - Intellisense complaining about incorrect macro definitions
Modified OpenColor header to check if GNUC is defined before using it (as it already does a few lines below). And thus removed the global invalid GNUC define which confuses VsCode.

Fixed up spaces in define that also confused VsCode.

#rb simon.therriault
[fyi] ben.marsh

#jira UE-76985
(ushell-p4-cherrypick of 7288701 by Joakim.Lindqvist)

#ROBOMERGE-SOURCE: CL 7865169 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v389-7813075)

[CL 7865209 by joakim lindqvist in Main branch]
2019-08-08 05:06:21 -04:00
josh engebretson
dc962ec853 Fixing boolean check on platform parse
#rnx


#ROBOMERGE-SOURCE: CL 7845368 via CL 7861338
#ROBOMERGE-BOT: (v389-7813075)

[CL 7861388 by josh engebretson in Main branch]
2019-08-08 01:28:54 -04:00
andrew grant
c766272dc7 missed file from last cl
#ROBOMERGE-SOURCE: CL 7844593 via CL 7861320
#ROBOMERGE-BOT: (v389-7813075)

[CL 7861372 by andrew grant in Main branch]
2019-08-08 01:28:04 -04:00
andrew grant
c1adcb70d0 Resolve issue running packaged builds when no project file is available
#rb na


#ROBOMERGE-SOURCE: CL 7844402 via CL 7861228
#ROBOMERGE-BOT: (v389-7813075)

[CL 7861287 by andrew grant in Main branch]
2019-08-08 01:23:21 -04:00
andrew grant
9addea59a4 Fix unresolved project path for Fortnite tests
#ROBOMERGE-SOURCE: CL 7843737 via CL 7861116
#ROBOMERGE-BOT: (v389-7813075)

[CL 7861168 by andrew grant in Main branch]
2019-08-08 01:03:19 -04:00
andrew grant
9462028d66 Fix for packaging warning on Mac. No longer check mono version, just see if msbuild exists. TraceInfo if not,
#jira UE-78524
#rb na

#ROBOMERGE-OWNER: andrew.grant
#ROBOMERGE-AUTHOR: andrew.grant
#ROBOMERGE-SOURCE: CL 7855006 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v389-7813075)

[CL 7855019 by andrew grant in Main branch]
2019-08-07 21:28:08 -04:00
joe conley
09d557b514 #jira UE-78400
#jira UE-78464

Since we are compiling two architectures for HoloLens is causing the second architecture to overwrite the dependency list for the first file. Save them in different locations.

Originally we had a filter to explicitly copy the necessary files, but the filter was too wide. Now that we have this fix, removing the explicit copy filter.

#rb Ben.Marsh

#ROBOMERGE-SOURCE: CL 7846892 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v389-7813075)

[CL 7846932 by joe conley in Main branch]
2019-08-07 18:35:56 -04:00
andrew grant
d0d3313e5a Missed file from 7828884
#jira UE-78311
#rb na

#ROBOMERGE-SOURCE: CL 7833510 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v389-7813075)

[CL 7833512 by andrew grant in Main branch]
2019-08-06 21:09:38 -04:00
ben marsh
46ebd2be08 Live Coding: Allow building foreign plugins while Live Coding is active.
#rb none
#jira UE-78421

#ROBOMERGE-SOURCE: CL 7820681 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v389-7813075)

[CL 7820694 by ben marsh in Main branch]
2019-08-06 16:18:26 -04:00
andrew grant
6ac2a3bd5e Added -clean option to SyncProject (was lost in refactor)
#jira na
#rb josh.spivey

#ROBOMERGE-OWNER: andrew.grant
#ROBOMERGE-AUTHOR: andrew.grant
#ROBOMERGE-SOURCE: CL 7817240 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v389-7813075)

[CL 7819562 by andrew grant in Main branch]
2019-08-06 16:06:27 -04:00
andrew grant
c9ba372605 Now deal with situation where mono is >= 5.0 but msbuild does not exist. For reference it looks like mono that's bundled with UE was upgraded to 5.16 at some point but msbuild was not added.
#jira UE-78311
#rb na

#ROBOMERGE-SOURCE: CL 7814233 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v389-7813075)

[CL 7814249 by andrew grant in Main branch]
2019-08-06 14:59:16 -04:00
michael trepka
401fadda6f Don't remove extra RPATH entries from Mac executable if we're only staging the app bundle and won't be archiving it
#jira UE-62828
#rb none

#ROBOMERGE-SOURCE: CL 7810756 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v388-7785529)

[CL 7810765 by michael trepka in Main branch]
2019-08-06 13:19:53 -04:00
graeme thornton
d36f05799a Detect pak encryption being enabled when no keys have been generated. Issue a warning and disable encryption.
#jira UE-77230
#rb none

#ROBOMERGE-SOURCE: CL 7785639 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v388-7785529)

[CL 7785685 by graeme thornton in Main branch]
2019-08-06 06:50:25 -04:00
andrew grant
2c00199e7f Made -configuration a fallback to -config in BuildCookRun for consistency with UBT and Gauntlet
#jira nojira
#rb na

#ROBOMERGE-SOURCE: CL 7763293 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v385-7708028)

[CL 7763335 by andrew grant in Main branch]
2019-08-05 12:03:51 -04:00
andrew grant
7e91850e00 Fixed issue with project paths that contain a - or +.
Stop tests timing out due to shader compiles
Added error if no tests are actually run


#jira UE-78262
#rb na

#ROBOMERGE-SOURCE: CL 7762695 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v385-7708028)

[CL 7762725 by andrew grant in Main branch]
2019-08-05 11:59:45 -04:00
ben marsh
b876fefefd Fix error compiling editor targets from installed builds.
#rb none
#rnx
#jira

#ROBOMERGE-SOURCE: CL 7713312 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v385-7708028)

[CL 7713313 by ben marsh in Main branch]
2019-08-04 19:48:29 -04:00
ben marsh
67a7eca8e9 Change to SHA1 signing for MSI files. Doesn't seem to like being signed with SHA256.
#rb none
#jira
#rnx

#ROBOMERGE-SOURCE: CL 7712970 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v385-7708028)

[CL 7712971 by ben marsh in Main branch]
2019-08-03 16:33:21 -04:00
ben marsh
bf76b88671 UnrealVersionSelector: Add support for projects built with a custom build environment. Enumerate all the .target files under a project's binaries directory, and take the launch path from the most recent one which is Configuration = "Development" and Type = "Editor".
#rb none
#jira UE-71800

#ROBOMERGE-SOURCE: CL 7712967 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v385-7708028)

[CL 7712968 by ben marsh in Main branch]
2019-08-03 16:28:45 -04:00
ben marsh
a4132cf4ff UBT: Fix the path to the solution options file for VS2019, so we can collapse all the projects and select the right configuration by default.
#rb none
#jira UE-78293

#ROBOMERGE-SOURCE: CL 7709082 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v385-7708028)

[CL 7709084 by ben marsh in Main branch]
2019-08-02 14:44:48 -04:00
joe conley
f5f5db191b #jira UE-78303 Missing files in the Binary folder for HoloLens installed build from Nightly Build
Fix for 7708707, shouldn't hardcode QAGame, should use target name.

#rb trivial

#ROBOMERGE-SOURCE: CL 7709057 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v385-7708028)

[CL 7709058 by joe conley in Main branch]
2019-08-02 14:40:42 -04:00
ben marsh
ffc862e18d UBT: Fix object files not being built when using the -plugin=... argument and a monolithic target.
#rb none
#jira UE-77305
#rnx

#ROBOMERGE-SOURCE: CL 7708957 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v385-7708028)

[CL 7708958 by ben marsh in Main branch]
2019-08-02 14:28:55 -04:00
chad garyet
1031eb862a - Add architecture flavors for HoloLens
- Force Win10SDK version to 10.0.18362.0
- Fix bug in Finalize that wasn't checking for architecture flavors in platforms not Android
#rb ben.marsh
#jira UE-78303

#ROBOMERGE-SOURCE: CL 7708788 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v385-7708028)

[CL 7708789 by chad garyet in Main branch]
2019-08-02 14:08:31 -04:00
joe conley
38cdd64945 #jira UE-78303 Missing files in the Binary folder for HoloLens installed build from Nightly Build
Add /arm64 and /x64 dirs, and .xml and .pri files to hololens artifacts

#rb Chad.Garyet

#ROBOMERGE-SOURCE: CL 7708707 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v385-7708028)

[CL 7708712 by joe conley in Main branch]
2019-08-02 14:01:20 -04:00