Commit Graph

186 Commits

Author SHA1 Message Date
Joe Kirchoff
3f1de0e66c Update bundled dotnet to 6.0.302
#rb Ryan.Hummer
#rnx
#jira UE-159980
#preflight 62f152ba0264595302c59855

[CL 21273202 by Joe Kirchoff in ue5-main branch]
2022-08-08 15:06:11 -04:00
josh adams
f133254485 - Fixed up 3 Linux ContentWorker issues that came from the dotnet 6 upgrade (or other recent UE5 changes):
* Staged the wrong Dotnet directory when making CW from Windows (it would stage Dotnet/6.20.00/windows)
* The ScriptModule code that used the Automation.json files to discover the precompiled UAT script dlls didn't handle \'s on Linux in the paths, and since Windows wrote out the files, there are \'s aplenty. I fixed up the known issue, but possibly all paths loaded from the json files should be fixed up, but it's not easy to do automatically
* We moved to using RunUAT.sh instead of calling dotnet directly, however because we make the CW on Windows, dotnet was not executable, and the code in RunUAT.sh to find the dotnet executable and make it executable (chmod `which dotnet`) only works if dotnet is already executable! So, I moved the +x code into SetupDotnet.sh, on Linux and Mac
#rb eric.knapik
#preflight 62ccd2009922f7e512b6e51a

#ROBOMERGE-OWNER: josh.adams
#ROBOMERGE-AUTHOR: josh.adams
#ROBOMERGE-SOURCE: CL 21055451 via CL 21055464 via CL 21055478
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v972-20964824)
#ROBOMERGE-CONFLICT from-shelf

[CL 21076349 by josh adams in ue5-main branch]
2022-07-13 14:17:50 -04:00
robert seiver
d88ec4c971 Accepting GitHub 9284 which modifies SetupToolchain.sh to not use incomplete archives when downloading the toolchain (instead it starts from scratch)
#jira UE-156934
#fyi @Brandon.Schaefer
#preflight none

[CL 20773768 by robert seiver in ue5-main branch]
2022-06-22 10:01:04 -04:00
Josh Adams
8ba3d7ed4c - MIssed NFL path in P4VUtils installers
#rb trivial
#preflight skip

[CL 20248551 by Josh Adams in ue5-main branch]
2022-05-17 14:56:57 -04:00
Josh Adams
bcb77edc06 - Fixing up some P4VUtils paths in the installers
- Split up the binaries between platform since there are #if's due to WinForms
#rb trivial
#preflight skip

[CL 20247967 by Josh Adams in ue5-main branch]
2022-05-17 14:26:37 -04:00
Josh Adams
a6c5a6ccd9 - Updated p4vutils to dotnet6, so we can use OperatingSystem nicely
- Will compile on Mac and Linux now
- Mac replaced the WinForms functionality with AppleScript
- Linux will compile be have reduced functionality
- Fixed up paths for p4v settings and dotnet location
- Added binaries and installer scripts for all 3 platforms - won't need UGS to install, will copy to user-library location (may need some adustment on Linux, will address after)
#rb will.damon
#preflight skip

[CL 20244727 by Josh Adams in ue5-main branch]
2022-05-17 12:00:08 -04:00
Ryan Durand
0d13c0dbf4 Per platform GitDependencies with the read-only fixes.
#rnx
#rb ryan.hummer
#jira none
#preflight

[CL 20103260 by Ryan Durand in ue5-main branch]
2022-05-09 11:12:21 -04:00
brandon schaefer
de9a7c46ea Update SetupToolchain.sh to download new v20 toolchain
#jira UE-136811
#rb Ryan.Hummer, James.Singer
#preflight none

#ROBOMERGE-AUTHOR: brandon.schaefer
#ROBOMERGE-SOURCE: CL 20040844 in //UE5/Release-5.0/... via CL 20045719
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v943-19904690)

[CL 20047950 by brandon schaefer in ue5-main branch]
2022-05-04 16:14:01 -04:00
Ryan Durand
06cb489d5c Fix missing x flag on Mac version of SetupDotnet.sh, move GitDependencies to .Net 6, and fix GitDependencies binaries and scripts.
#rnx
#jira none
#rb ryan.hummer
#preflight

[CL 19983705 by Ryan Durand in ue5-main branch]
2022-04-29 15:26:36 -04:00
Ryan Hummer
c31de4d06b Reverting to the platform specific GitDependencies
#rnx
#rb none
#fyi Ryan.Durand

[CL 19969133 by Ryan Hummer in ue5-main branch]
2022-04-28 17:12:21 -04:00
Ryan Durand
fbf021c30e Update GitDependencies binaries.
#rnx
#jira UE-141050
#rb ryan.hummer

[CL 19923684 by Ryan Durand in ue5-main branch]
2022-04-26 13:16:37 -04:00
brandon schaefer
4c4f3df620 Update libssl/libcrypto to actually work with dotnet.
Previous lib was broken

#jira UE-148107
#rb Ryan.Hummer
#preflight 6266f0c85e0d3c60d8d81e8e

#ROBOMERGE-OWNER: brandon.schaefer
#ROBOMERGE-AUTHOR: brandon.schaefer
#ROBOMERGE-SOURCE: CL 19908317 in //UE5/Release-5.0/... via CL 19910321
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v943-19904690)

[CL 19911580 by brandon schaefer in ue5-main branch]
2022-04-25 19:17:41 -04:00
brandon schaefer
2ee4b26db6 Fix dotnet breaking on bundled libssl1
#jira UE-149564, UE-149563
#preflight none
#rb Ryan.Hummer

#ROBOMERGE-OWNER: brandon.schaefer
#ROBOMERGE-AUTHOR: brandon.schaefer
#ROBOMERGE-SOURCE: CL 19873706 in //UE5/Release-5.0/... via CL 19877350
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v940-19807014)

[CL 19880759 by brandon schaefer in ue5-main branch]
2022-04-22 21:05:47 -04:00
Brandon Schaefer
3b7494c5da Bundle libicu for dotnet
*NOTE* these *.so depend on libstdc++, something to address later, but ideally dotnet will start bundling these vs depending on the system

#jira UE-149565
#preflight none
#rb none

[CL 19865787 by Brandon Schaefer in ue5-main branch]
2022-04-22 11:28:26 -04:00
Brandon Schaefer
ff977022dd Fix spelling
#rnx
#jira none
#rb none
#prelfight none

[CL 19835674 by Brandon Schaefer in ue5-main branch]
2022-04-20 15:01:46 -04:00
brandon schaefer
cf276bbf39 Bundle libssl1/libcrpyto1 for dotnet as it is leaking to the system depends which will not be around for Ubuntu 22.04
https://discourse.ubuntu.com/t/openssl-3-0-transition-plans/24453

#jira UE-148107
#rb jonathan.adamczewski
#preflight 62588b616e2c50550f1650d8

#ROBOMERGE-OWNER: brandon.schaefer
#ROBOMERGE-AUTHOR: brandon.schaefer
#ROBOMERGE-SOURCE: CL 19799019 in //UE5/Release-5.0/... via CL 19799963
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v939-19570697)

[CL 19809817 by brandon schaefer in ue5-main branch]
2022-04-19 11:45:46 -04:00
Brandon Schaefer
2b5a284aea Change our default behviour for Build.sh.
Now we no longer build UBT by default, aligning with Windows Build.bat. You can still pass in: -buildubt as well as -buildscw to enable some extra build options

#jira UE-149350
#rb Will.Damon, Ryan.Hummer, Robert.Seiver
#preflight 625dc0be804460ab0fda0c0a
#fyi Ryan.Hummer

[CL 19792862 by Brandon Schaefer in ue5-main branch]
2022-04-18 15:57:24 -04:00
Devin Doucette
dce5251aa1 Fixed missing quotes in GenerateProjectFiles.sh
#jira UE-148739
#preflight 6256fba77411b8ac626f5808
#rb Brandon.Schaefer

[CL 19741549 by Devin Doucette in ue5-main branch]
2022-04-13 12:46:50 -04:00
jonathan adamczewski
c1bb6901bf Upgrade to .NET 6.0
#jira UE-119846
#preflight 624cbb2ecc0872e96b0d5181

[CL 19652696 by jonathan adamczewski in ue5-main branch]
2022-04-06 14:46:50 -04:00
Brandon Schaefer
9bc8cb80ac Forgot to submit change here for zlib when building toolchain
#jira none
#rb none

[CL 19542143 by Brandon Schaefer in ue5-main branch]
2022-03-29 10:50:34 -04:00
jonathan adamczewski
5c68d1d9ef Revert //UE5/Main/... changelist 19531725 - return to NET Core 3.1
#preflight 62422fd0470aff98e946bfce
#jira UE-119846

[CL 19534572 by jonathan adamczewski in ue5-main branch]
2022-03-28 18:25:19 -04:00
jonathan adamczewski
18ac15cbb1 Upgrade to .NET 6.0
#jira UE-119846
#preflight 6241fc06470aff98e943c035

[CL 19531725 by jonathan adamczewski in ue5-main branch]
2022-03-28 15:30:56 -04:00
Brandon Schaefer
8d8f6dac39 Update some files for building v20 13.0.1 toolchain
#jira UE-136811
#rb none
#preflight none
#fyi Michael.Sartain, Robert.Seiver

[CL 19495034 by Brandon Schaefer in ue5-main branch]
2022-03-24 10:08:31 -04:00
Brandon Schaefer
adb9207567 Do not try to build UBT when running an installed builds (PR #8995 Thanks slonopotamus!)
#jira UE-146826
#rb none
#preflight none
#fyi Robert.Seiver

[CL 19485453 by Brandon Schaefer in ue5-main branch]
2022-03-23 16:46:04 -04:00
Ben Marsh
7012109f94 Upgrade GitDependencies to NET Core 3.1, and convert to a self-contained application.
- Application is now built separately and has a native executable for each supported host platform (win-x64, osx-x64, linux-x64).
- Included Publish.bat file allows publishing new builds for each platform to the correct location.
- Bundled Mono distribution is no longer required for bootstrapping the repo.
- Publish script will likely need updating to support osx-arm64 once we upgrade to NET 6.0.
- Renamed environment variables and state files to be UE_ rather than UE4_.

#fyi Ryan.Hummer, Jonathan.Adamczewski, Will.Damon, Brandon.Schaffer
#preflight none

[CL 19122278 by Ben Marsh in ue5-main branch]
2022-02-24 14:52:40 -05:00