Commit Graph

309 Commits

Author SHA1 Message Date
nick shin
1ed1f81641 HTML5 - more code removal - build scripts section
#jira UE-80050  Remove HTML5 code from engine
#rb none
#rnx

#ROBOMERGE-SOURCE: CL 9884438 in //UE4/Release-4.24/...
#ROBOMERGE-BOT: RELEASE (Release-4.24 -> Main) (v553-9872581)

[CL 9884441 by nick shin in Main branch]
2019-10-29 15:07:15 -04:00
nick shin
970bcfd431 #jira UE-82158 HTML5 batch files dir still exists in Engine\Build\BatchFiles
#rnx
#rb none

#ROBOMERGE-SOURCE: CL 9752558 in //UE4/Release-4.24/...
#ROBOMERGE-BOT: RELEASE (Release-4.24 -> Main) (v545-9751379)

[CL 9752562 by nick shin in Main branch]
2019-10-22 17:41:57 -04:00
brandon schaefer
9abd2890cd Fix find platform extension for Linux/Mac
#jira none
#rb none
[FYI] Josh.Adams

#ROBOMERGE-SOURCE: CL 9736069 in //UE4/Release-4.24/...
#ROBOMERGE-BOT: RELEASE (Release-4.24 -> Main) (v539-9700858)

[CL 9736089 by brandon schaefer in Main branch]
2019-10-21 15:05:50 -04:00
Matt Collins
5b92997cdf Fixing our references project generation. Should write to $REFERENCE_FILE (and not %REFERENCE_FILE%)
#rb none

[CL 9577259 by Matt Collins in Main branch]
2019-10-14 19:12:44 -04:00
Rolando Caloca
1a30325d6f Copying //UE4/Dev-RenderPlat-Staging@9551419 to //UE4/Main
#rb none
#rnx

[CL 9551447 by Rolando Caloca in Main branch]
2019-10-11 15:33:31 -04:00
Stefan Boberg
1f813eb516 Copying //UE4/Dev-Core to Main (//UE4/Main)
#rb many

[CL 9405827 by Stefan Boberg in Main branch]
2019-10-03 16:26:48 -04:00
Rolando Caloca
7632478918 Merging //UE4/Main@9388041 to Dev-RenderPlat-Staging
#rb none
#rnx

[CL 9389881 by Rolando Caloca in Dev-RenderPlat-Staging branch]
2019-10-03 09:26:00 -04:00
brandon schaefer
d1923b0346 Bump to v15 8.0.1 toolchain
#jira none
#rb none
[FYI] Michael.Sartain
#lockdown cristina.riveron

#ROBOMERGE-SOURCE: CL 9380792 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v456-9359915)

[CL 9380796 by brandon schaefer in Main branch]
2019-10-02 15:29:30 -04:00
Rolando Caloca
f83ae4807a Copying //UE4/Dev-Rendering@9317594 to Dev-RenderPlat-Staging
#rb none
#rnx

[CL 9317904 by Rolando Caloca in Dev-RenderPlat-Staging branch]
2019-10-01 13:03:04 -04:00
Marcus Wassmer
6517c68ef5 Copying //UE4/Dev-RenderPlat-Staging@8684824 to Dev-Main (//UE4/Dev-Main)
#rb none

[CL 8684840 by Marcus Wassmer in Main branch]
2019-09-14 09:45:25 -04:00
Marcus Wassmer
ded7cece25 Copying //UE4/Dev-Rendering@8444433 to Dev-RenderPlat-Staging (//UE4/Dev-RenderPlat-Staging)
#rb none

[CL 8445676 by Marcus Wassmer in Dev-RenderPlat-Staging branch]
2019-09-03 19:19:28 -04:00
Ben Marsh
0d70d5e1f6 Fix error generating project files on Mac.
#rb none
#rnx
#jira UE-79164

[CL 8131598 by Ben Marsh in Dev-Build branch]
2019-08-20 20:58:23 -04:00
brandon schaefer
214f28ea00 Bump to v14 clang 8.0.1 toolchain for Linux
#jira none
#rb none
[FYI] Arciel.Rekman, Michael.Sartain

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: brandon.schaefer
#ROBOMERGE-SOURCE: CL 8039909 in //UE4/Release-4.23/... via CL 8039915
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build) (v399-8035122)

[CL 8053795 by brandon schaefer in Dev-Build branch]
2019-08-14 23:22:58 -04:00
brandon schaefer
5e6b22cf98 Bump to v14 clang 8.0.1 toolchain for Linux
#jira none
#rb none
[FYI] Arciel.Rekman, Michael.Sartain

#ROBOMERGE-SOURCE: CL 8039909 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v399-8035122)

[CL 8039915 by brandon schaefer in Main branch]
2019-08-14 13:26:41 -04:00
andrew grant
cc804afeab Missed file from 7828884
#jira UE-78311
#rb na

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: andrew.grant
#ROBOMERGE-SOURCE: CL 7833510 in //UE4/Release-4.23/... via CL 7833512
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build) (v389-7813075)

[CL 7867731 by andrew grant in Dev-Build branch]
2019-08-08 06:16:11 -04:00
andrew grant
23966ba3d1 Require that installed mono is >= 5.0 to be used above UE bundled version (mono 4 does not appear to support .NET 4.6.2 projects)
Only use msbuild in mono when using an installed copy and not just when >= 5.0. The UE dist uses 5.16 but does not have the msbuild executable or dependencies (will address for 4.24 - UE-78476)

Explicitly use bash when calling .RunUAT.sh from from root stub file for OSs that are set to use a different shell

#jira UE-78311
[FYI] ben.marsh,arciel.rekman,michael.trepka,tim.gautier
#rb na

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: andrew.grant
#ROBOMERGE-SOURCE: CL 7828884 in //UE4/Release-4.23/... via CL 7828885
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build) (v389-7813075)

[CL 7867209 by andrew grant in Dev-Build branch]
2019-08-08 05:36:57 -04:00
andrew grant
518a5055ff Fix check for whether mono >= 5 is installed
#jira UE-78311, UE-78395
#rb na

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: andrew.grant
#ROBOMERGE-SOURCE: CL 7794961 in //UE4/Release-4.23/... via CL 7794983
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build) (v389-7813075)

[CL 7867082 by andrew grant in Dev-Build branch]
2019-08-08 05:28: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
andrew grant
3398e55fc1 Require that installed mono is >= 5.0 to be used above UE bundled version (mono 4 does not appear to support .NET 4.6.2 projects)
Only use msbuild in mono when using an installed copy and not just when >= 5.0. The UE dist uses 5.16 but does not have the msbuild executable or dependencies (will address for 4.24 - UE-78476)

Explicitly use bash when calling .RunUAT.sh from from root stub file for OSs that are set to use a different shell

#jira UE-78311
[FYI] ben.marsh,arciel.rekman,michael.trepka,tim.gautier
#rb na

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

[CL 7828885 by andrew grant in Main branch]
2019-08-06 19:56:37 -04:00
andrew grant
e171bd88c7 Fix check for whether mono >= 5 is installed
#jira UE-78311, UE-78395
#rb na

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

[CL 7794983 by andrew grant in Main branch]
2019-08-06 11:27:26 -04:00
andrew grant
a69bc0bd78 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: ben.marsh
#ROBOMERGE-AUTHOR: andrew.grant
#ROBOMERGE-SOURCE: CL 7541249 via CL 7541252 via CL 7555938 via CL 7555946
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build) (v372-7473910)

[CL 7594324 by andrew grant in Dev-Build branch]
2019-07-24 01:59:35 -04:00
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
a98a690033 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: ben.marsh
#ROBOMERGE-AUTHOR: andrew.grant
#ROBOMERGE-SOURCE: CL 7290522 via CL 7290525 via CL 7292711 via CL 7292732 via CL 7308901 via CL 7315952
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build) (v371-7306989)

[CL 7360867 by andrew grant in Dev-Build branch]
2019-07-17 02:21:07 -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
Josh Adams
84150c0c8f - Changed the directory structure from /Platforms/Engine to /Engine/Platforms (and .../Project/Platforms)
- Some fixes to get project platform files compiling
#rb ben.marsh

[CL 7294119 by Josh Adams in Dev-Build branch]
2019-07-12 16:09:23 -04:00