Commit Graph

38 Commits

Author SHA1 Message Date
jonathan adamczewski
4ece24e65a AutomationTool, BuildUtilities:
UnrealBuild -> Unreal for EngineDirectory, RootDirectory, IsEngineInstalled, UnrealBuildToolPath
Remove CommandUtils EngineDirectory, RootDirectory, IsEngineInstalled - use equvalents from UnrealBuildBase.Unreal

#jira none

[CL 16648181 by jonathan adamczewski in ue5-main branch]
2021-06-11 18:20:44 -04:00
jonathan adamczewski
f9cdd2dc5d UnrealBuildTool:
Move IsEngineInstalled() into BuildUtilities

#jira none

[CL 16642197 by jonathan adamczewski in ue5-main branch]
2021-06-11 11:37:23 -04:00
jonathan adamczewski
94b14ee042 UnrealBuildTool: move some path constants into BuildUtilities
RootDirectory, EngineDirectory, UnrealBuildToolPath are now found in BuildUtilities' UnrealBuild namesapce.

The way these are computed has changed. Previously, it was assumed that the application is UnrealBuildTool, and paths were constructed relative to that assembly.

Now, the assumption is that the process is located under a "Engine/Build/DotNET" sub-path and paths are constructed relative to that.

#jira none

[CL 16607440 by jonathan adamczewski in ue5-main branch]
2021-06-09 12:54:42 -04:00
jonathan adamczewski
0af1ea99af Add a common C# method for detecting the current host platform to EpicGames.Core, and move many a test to use that code.
#jira none
#rb joe.kirchoff

[CL 16593582 by jonathan adamczewski in ue5-main branch]
2021-06-08 17:01:23 -04:00
Ben Marsh
bc47b15e06 Merge utility library changes from GitSync.
[CL 16135807 by Ben Marsh in ue5-main branch]
2021-04-27 22:41:48 -04:00
Marc Audy
01b7c9f4f5 Merge UE5/RES @ 15958325 to UE5/Main
This represents UE4/Main @ 15913390 and Dev-PerfTest @ 15913304

[CL 15958515 by Marc Audy in ue5-main branch]
2021-04-08 14:32:07 -04:00
Josh Adams
b0e4357576 - UBT Code changes to remove 32-bit Windows support (C++ code for 32-bit still exists)
#rb marc.audy (concept, not each file)

[CL 15265424 by Josh Adams in ue5-main branch]
2021-01-31 15:09:58 -04:00
Ben Marsh
6f927647b1 Changing C# code over to using EpicGames.Core over DotNETCommon.
#rb none
#rnx

[CL 14962096 by Ben Marsh in ue5-main branch]
2020-12-21 23:07:37 -04:00
Ben Marsh
68f5abeb09 UBT: Convert UnrealBuildTool to use nullable references.
#rb none
#rnx

[CL 14960546 by Ben Marsh in ue5-main branch]
2020-12-20 18:47:42 -04:00
Marc Audy
50a3d7d368 Merge Release-Engine-Staging to Main @ CL# 14467590
This represents UE4/Main @ 14432125 + some cherrypick fixes

[CL 14468207 by Marc Audy in ue5-main branch]
2020-10-09 22:42:26 -04:00
Marcus Wassmer
3b81cf8201 Merging using //UE5/Main_to_//UE5/Release-Engine-Staging @14384769
autoresolved files
#rb none

[CL 14384911 by Marcus Wassmer in ue5-main branch]
2020-09-24 00:43:27 -04:00
josh adams
ec9ca72579 - Removed some leftover debug logging
#rb none

#ROBOMERGE-SOURCE: CL 12728181 via CL 12728184 via CL 12728185
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v676-12543919)

[CL 12728187 by josh adams in Main branch]
2020-04-10 13:27:43 -04:00
josh adams
aeef0802a9 - Changes to support looking in Restricted locations for .ini files
- Contains a temporary compat for DedicatedServer.ini files - in the future they will be moved to a DedicatedServer directory (like platforms are), buyt for now, it will look in existing location.
#rb ben.marsh
[FYI] josh.markiewicz,lukasz.furman,daniel.lamb,bob.tellez

#ROBOMERGE-SOURCE: CL 12726804 via CL 12726805 via CL 12726806
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v676-12543919)

[CL 12726808 by josh adams in Main branch]
2020-04-10 12:38:56 -04:00
josh adams
90ff579ecc - UBT/C++ changes needed for new Restricted locations
- Does not have the changes for new .ini file locations
#rb ben.marsh

#ROBOMERGE-SOURCE: CL 12676628 via CL 12676630 via CL 12676633
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v675-12543919)

[CL 12676637 by josh adams in Main branch]
2020-04-08 15:07:46 -04:00
ben marsh
1b5b1c9abf Remove redundant null checks causing warnings on latest version of Mono.
#rb none
#rnx
#jira

#ROBOMERGE-SOURCE: CL 12202600 in //UE4/Release-4.25/... via CL 12202614
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v662-12191386)

[CL 12202631 by ben marsh in Main branch]
2020-03-16 11:26:55 -04: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
hongyi yu
6113e739fc Merge JoshA's fix to config hierarchy from engine
- Fixed the platform extension config location checks in C# to match C++

[FYI] Josh.Adams


#ROBOMERGE-SOURCE: CL 11310070 via CL 11310074
#ROBOMERGE-BOT: (v653-11302973)

[CL 11311379 by hongyi yu in Main branch]
2020-02-10 16:05:03 -05:00
Josh Adams
fc1220a663 - Fixed the platform extension config location checks in C# to match C++
#rb hongyi.yu

[CL 11309846 by Josh Adams in Main branch]
2020-02-10 15:17:47 -05:00
justin marcus
b434d4c28e Make InstallBundleConfig a hierarchical INI.
Fix FConfigCacheIni::GetSectionNames returning names in reverse order.
Make sure build scripts properly respect bundle order.

change 2/2 - everything not internal

[at]Daniel.Lamb [at]Hongyi.Yu




#ROBOMERGE-SOURCE: CL 11047646 via CL 11047649 via CL 11047656
#ROBOMERGE-BOT: (v637-11041722)

[CL 11047666 by justin marcus in Main branch]
2020-01-17 12:25:29 -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
brandon schaefer
400d7f75a0 Expand the parents config path if its outside of the PE layer
#jira UE-82654
#rb Josh.Adams
[FYI] Josh.Adams, Ben.Marsh, Arciel.Rekman

#ROBOMERGE-SOURCE: CL 10114354 in //UE4/Release-4.24/...
#ROBOMERGE-BOT: RELEASE (Release-4.24 -> Main) (v587-10111126)

[CL 10114355 by brandon schaefer in Main branch]
2019-11-12 13:41:19 -05: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
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
Ben Marsh
cfe09c649f Merging //UE4/Dev-Main to Dev-Build (//UE4/Dev-Build)
#rb none
#rnx

[CL 6922670 by Ben Marsh in Dev-Build branch]
2019-06-10 19:47:29 -04:00
Josh Adams
07078cf3a3 - Fixed a file missing from .ini hierarchy
- Fixed some more CIS errors
#rb none

[CL 6355693 by Josh Adams in Dev-Build branch]
2019-05-07 21:04:03 -04:00