Commit Graph

262 Commits

Author SHA1 Message Date
andrew grant
fb608ba070 Now automatically detect if mono5 is installed on Mac and use msbuild if so, otherwise stick to xbuild
[FYI] arciel.rekman, michael.sartain



#ROBOMERGE-OWNER: andrew.grant
#ROBOMERGE-AUTHOR: andrew.grant
#ROBOMERGE-SOURCE: CL 7541249 via CL 7541252 via CL 7555938
#ROBOMERGE-BOT: (v372-7473910)

[CL 7555946 by andrew grant in Main branch]
2019-07-23 13:23:01 -04:00
andrew grant
92c8c8937f Switched UAT build process on Mac to use msbuild.
Enabled parallel msbuild for Mac
Added HashCollection class that can hold and serialize a collection of content hashes
Added quick dependency checking to UAT build by hashing csproj, input and output files for all modules
Reduced some logging when not running with -verbose

#rb Ben.Marsh
[FYI] Ben.Marsh


#ROBOMERGE-OWNER: andrew.grant
#ROBOMERGE-AUTHOR: andrew.grant
#ROBOMERGE-SOURCE: CL 7290522 via CL 7290525 via CL 7292711 via CL 7292732 via CL 7308901
#ROBOMERGE-BOT: (v371-7306989)

[CL 7315952 by andrew grant in Main branch]
2019-07-15 20:50:01 -04:00
joe graf
aaf4aa949e Fixed the error when checking a default value that doesn't exist on Mac for generation of project files
#rb: none
#jira: UE-76437

#ROBOMERGE-SOURCE: CL 7065728 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v367-6836689)

[CL 7065739 by joe graf in Main branch]
2019-06-18 14:36:54 -04:00
Jeff Fisher
bcc5bcf128 Copying //UE4/Dev-VR to Main (//UE4/Main)
-Copy up for 4.23
#rb none

[CL 6911980 by Jeff Fisher in Main branch]
2019-06-10 12:22:13 -04:00
Ben Marsh
0dd13809ed Put C# files for platform extensions under a platform subfolder.
#rb none
#fyi Josh.Adams
#rnx

[CL 6860870 by Ben Marsh in Main branch]
2019-06-06 11:04:22 -04:00
Chris Gagnon
930e33cb48 Copying //UE4/Dev-Editor to Dev-Main (//UE4/Dev-Main) for 4.23 From CL 6837861
#rb none

[CL 6838042 by Chris Gagnon in Main branch]
2019-06-04 15:42:48 -04:00
Arciel Rekman
7ef9626fe8 Copying //UE4/Dev-Console@6677439 to Dev-Main (//UE4/Dev-Main)
#rb none

[CL 6677614 by Arciel Rekman in Main branch]
2019-05-30 14:48:02 -04:00
Ben Marsh
0cc6e3dca6 Copying //UE4/Dev-Build to Dev-Main (//UE4/Dev-Main)
#rb none
#rnx

[CL 6631504 by Ben Marsh in Main branch]
2019-05-24 11:51:54 -04:00
ben marsh
d698950f1e Improve error message when GenerateProjectFiles.bat fails due to no Visual Studio installation having an MSBuild installation available.
#rb none
#jira UE-74162

#ROBOMERGE-SOURCE: CL 6316167 in //UE4/Release-4.22/...
#ROBOMERGE-BOT: RELEASE (Release-4.22 -> Main)

[CL 6317365 by ben marsh in Main branch]
2019-05-06 11:32:53 -04:00
chad garyet
7cbb98305b - Add check for installedbuild.txt to force -compile to off
- Remove deletion of UAT intermediates if we are doing a -compile to match the .bat behavior
#jira none
[CODEREVIEW] ben.marsh

#ROBOMERGE-SOURCE: CL 5834895 in //UE4/Release-4.22/...
#ROBOMERGE-BOT: RELEASE (Release-4.22 -> Main)

[CL 5834896 by chad garyet in Main branch]
2019-04-12 09:16:40 -04:00
ben marsh
10fbee8618 Allow pre-release versions of Visual Studio when getting path to MSBuild.
#rb none
#jira UE-72173

#ROBOMERGE-SOURCE: CL 5708642 in //UE4/Release-4.22/...
#ROBOMERGE-BOT: RELEASE (Release-4.22 -> Main)

[CL 5711367 by ben marsh in Main branch]
2019-04-03 13:31:02 -04:00
ben marsh
fc7c25f48e Fix failure to compile C# projects when only VS2019 is installed. MSBuild has been moved into a different directory.
#rb none
#jira UE-72173

#ROBOMERGE-SOURCE: CL 5673098 in //UE4/Release-4.22/...
#ROBOMERGE-BOT: RELEASE (Release-4.22 -> Main)

[CL 5711348 by ben marsh in Main branch]
2019-04-03 13:30:41 -04:00
dougmoscrop
713a04b875 PR #5615: Fix quotes on SetupMono.sh for Mac (Contributed by dougmoscrop)
#jira UE-71327
#rb trivial

#ROBOMERGE-SOURCE: CL 5358688 in //UE4/Release-4.22/...
#ROBOMERGE-BOT: RELEASE (Release-4.22 -> Main)

[CL 5367897 by michael trepka in Main branch]
2019-03-12 07:09:13 -04:00
ben marsh
04ae685571 Fix error messages that instruct the user to install Visual Studio 2015 (should be 2017)
#rb none
#rnx
#jira

#ROBOMERGE-SOURCE: CL 5343248 in //UE4/Release-4.22/...
#ROBOMERGE-BOT: RELEASE (Release-4.22 -> Main)

[CL 5343253 by ben marsh in Main branch]
2019-03-07 17:35:38 -05:00
ben marsh
3d75bb6a66 Add a dedicated file to check whether binary prerequisites have been downloaded from GitHub, rather than checking for SwarmAgent.exe or any other build product.
#rb none
#jira UE-71058

#ROBOMERGE-SOURCE: CL 5305673 in //UE4/Release-4.22/...
#ROBOMERGE-BOT: RELEASE (Release-4.22 -> Main)

[CL 5314625 by ben marsh in Main branch]
2019-03-06 12:43:55 -05:00
arciel rekman
ae2fc6b3cb Linux: fix which spam on some systems (UE-69994).
#rb none
[CODEREVIEW] Brandon.Schaefer
#jira UE-69994

#ROBOMERGE-SOURCE: CL 5291112 in //UE4/Release-4.22/...
#ROBOMERGE-BOT: RELEASE (Release-4.22 -> Main)

[CL 5308921 by arciel rekman in Main branch]
2019-03-05 18:48:02 -05:00
ben marsh
5be527253d Fix warning when generating project files in a minimal workspace (due to no documentation folder).
#rb none
#jira

#ROBOMERGE-SOURCE: CL 5259512 in //UE4/Release-4.22/...
#ROBOMERGE-BOT: RELEASE (Release-4.22 -> Main)

[CL 5259514 by ben marsh in Main branch]
2019-03-01 01:31:42 -05:00
ben marsh
0a7bff24d0 Remove RPCUtility.
#rb none
#jira UE-70509
[FYI] Peter.Sauerbrei

#ROBOMERGE-SOURCE: CL 5174514 in //UE4/Release-4.22/...
#ROBOMERGE-BOT: RELEASE (Release-4.22 -> Main)

[CL 5207569 by ben marsh in Main branch]
2019-02-26 16:38:49 -05:00
Chris Gagnon
80918bea22 Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor)
#rb none

[CL 5110714 by Chris Gagnon in Dev-Editor branch]
2019-02-21 13:05:30 -05:00
Brandon Schaefer
17026acec8 Pull v13 toolchain now
#jira none
#rb none
#fyi Arciel.Rekman

[CL 5064413 by Brandon Schaefer in Dev-Editor branch]
2019-02-19 13:13:42 -05:00
jamie dale
0fc3f7d709 Removing redundant batch file that no longer works
#jira UE-70002
#rnx

#ROBOMERGE-SOURCE: CL 4995428 in //UE4/Release-4.22/...
#ROBOMERGE-BOT: RELEASE (Release-4.22 -> Main)

[CL 4995434 by jamie dale in Main branch]
2019-02-14 10:55:31 -05:00
arciel rekman
1c470dc6a1 Linux: download to the v13 toolchain for 4.22 (UE-69672)
#jira UE-69672
#rb none

#ROBOMERGE-SOURCE: CL 4967350 in //UE4/Release-4.22/...
#ROBOMERGE-BOT: RELEASE (Release-4.22 -> Main)

[CL 4968670 by arciel rekman in Main branch]
2019-02-12 09:41:26 -05:00
ben marsh
f5a745925c Suppress message when fixing Slate png case. Users don't need to know about this.
#rb none
#rnx
#jira

#ROBOMERGE-SOURCE: CL 4957421 in //UE4/Release-4.22/...
#ROBOMERGE-BOT: RELEASE (Release-4.22 -> Main)

[CL 4968452 by ben marsh in Main branch]
2019-02-12 09:39:56 -05:00
ben marsh
1c6fa8eee6 Prevent FixMonoFiles.version from being updated unnecessarily.
#rb none
#jira UE-69520

#ROBOMERGE-SOURCE: CL 4898171 in //UE4/Release-4.22/...
#ROBOMERGE-BOT: RELEASE (Release-4.22 -> Main)

[CL 4898175 by ben marsh in Main branch]
2019-02-05 10:11:53 -05:00
Chris Gagnon
a48e767b94 Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor)
#rb none

[CL 4835066 by Chris Gagnon in Dev-Editor branch]
2019-01-29 16:15:19 -05:00