Commit Graph

36 Commits

Author SHA1 Message Date
Wes Hunt
8211f9a97c Restor fallback for UAT trying to mount an NFS share from a 32-bit process. This requires a 64-bit OS to work, but it's actually generally fine for UAT to run in 32-bit. We now simply log the bit-ness of the process on startup for diagnostics.
#codereview:ben.marsh,richard.fawcett

[CL 2635301 by Wes Hunt in Main branch]
2015-07-28 09:18:24 -04:00
Peter Sauerbrei
42cc6d1f4d real fix for logging verbosity.
#uat

[CL 2634621 by Peter Sauerbrei in Main branch]
2015-07-27 17:28:09 -04:00
Wes Hunt
14b5318a8c Get UAT running as a 64-bit process again.
* As of .NET 4.5, the default for Any CPU is to "prefer 32-bit process", and you need to explicitly turn this off to require the process be run as 64-bit.
* See http://blogs.microsoft.co.il/sasha/2012/04/04/what-anycpu-really-means-as-of-net-45-and-visual-studio-11/ for details.
* UAT will now assert when Environment.Is64BitProcess is false on startup, as we essentially require 64-bit for certain scripts, and that's how we ran it before upgrading to .NET4.5.
* Also set default optimization options for the project, which were changed at some point.
* Finally, rolled back CL#2633880, which was trying to work around the fact that UAT was running 32-bit.
#codereview:richard.fawcett, ben.marsh

[CL 2634273 by Wes Hunt in Main branch]
2015-07-27 14:40:30 -04:00
Richard Fawcett
84c56fdf2c UAT: Add support to searching C:\\Windows\\Sysnative when exe can't be found in C:\\Windows\\System32
#codereview Ben.Marsh

[CL 2633880 by Richard Fawcett in Main branch]
2015-07-27 10:59:05 -04:00
Ben Marsh
9e31e87ce0 Explicitly pass the engine root into ReadAvailablePlugins().
[CL 2632416 by Ben Marsh in Main branch]
2015-07-24 13:23:11 -04:00
Michael Trepka
d7c5e90831 Merging CL 2632258 - Mac codesign fixes
[CL 2632260 by Michael Trepka in Main branch]
2015-07-24 10:59:55 -04:00
Peter Sauerbrei
e57bbb9483 fix for build machine failure when copying DDC stats when running BuildDerivedDataCache commandlet
[CL 2631631 by Peter Sauerbrei in Main branch]
2015-07-23 19:06:45 -04:00
Peter Sauerbrei
dc1d815f84 refactored the logging system for UAT/UBT to be more like UE4
we now use an enum similar to UE4 with Fatal, Error, Warning, Display, Log, Verbose, and VeryVerbose
Log will only go to the log file unless -verbose is passed on the command line
reduced some of the output from UAT to be Log only

[CL 2631062 by Peter Sauerbrei in Main branch]
2015-07-23 14:51:46 -04:00
Bob.Tellez
09e658827a [INTEGRATE] Change 2627031 by Bob.Tellez@Z2434 on 2015/07/21 12:06
#UE4 Fixed a problem where the wrong constructor was matched for BuildPatchToolStagingInfo when supplying two or three strings at the end of the arguments list since the last argument was optional.

[CL 2630790 by Richard Fawcett in Main branch]
2015-07-23 12:35:01 -04:00
Ben Marsh
9989daccfa [INTEGRATE] UAT: Add support for cross-app promotion
#codereview Richard.Fawcett

[CL 2629897 by Ben Marsh in Main branch]
2015-07-22 20:02:21 -04:00
Wes Hunt
7ff08138f9 Move Robust_XXX methods into InternalUtils, since it is called outside of TempStorage.
#UEB-307

[CL 2629371 by Wes Hunt in Main branch]
2015-07-22 15:21:40 -04:00
Wes Hunt
c1672d4beb Remove Remove some redundant and unused functions;
* InternalUtils::ExecutingAssemblyLocation
* InternalUtils::ExecutingAssemblyDirectory
* InternalUtils::ExecutableVersion
* CommandUtils::WriteToFile (one overload not used)
* CommandUtils::ExeFilename
* CommandUtils::ExeDirectory
* CommandUtils::CurrentDirectory
Added:
* Tools.DotNETCommon.AssemblyUtils::ExecutableVersion

[CL 2629222 by Wes Hunt in Main branch]
2015-07-22 14:00:30 -04:00
Ben Marsh
dd08437233 Rename BuildReceipt to TargetReceipt, to clarify its purpose.
[CL 2629145 by Ben Marsh in Main branch]
2015-07-22 13:10:12 -04:00
Ben Marsh
a5f534451b Remove the ENGINE_VERSION define from Version.h and ObjectVersion.cpp; it's superceded by GEngineVersion. EngineVersion.cpp now defines the constants GEngineVersionChangelist and GCompatibleWithEngineVersionChangelist, which are used to construct GEngineVersion and GCompatibleWithEngineVersion. Modifying those constants allows updating the engine version separately to the defines used for resource files (allowing UGS to update the version number without triggering all files to be relinked).
[CL 2625344 by Ben Marsh in Main branch]
2015-07-18 16:57:53 -04:00
Wes Hunt
d2a1b60eaa UE-18654 - Fix uses of GetExecutingAssembly in UAT/UBT
#codereview:ben.marsh

[CL 2624862 by Wes Hunt in Main branch]
2015-07-17 16:38:17 -04:00
James Moran
df424026a3 Enable HTML5 networking plugin by default.
Allow UAT to deploy websocket dedicated servers for HTML5.
UEPLAT-793 & UEPLAT-795

[CL 2621662 by James Moran in Main branch]
2015-07-15 09:24:49 -04:00
Ben Marsh
96b6932640 Fix case of build.version for Linux.
[CL 2617529 by Ben Marsh in Main branch]
2015-07-10 22:01:36 -04:00
Ben Marsh
417d294f48 Ensure build.version is writeable before updating it.
[CL 2617103 by Ben Marsh in Main branch]
2015-07-10 15:37:22 -04:00
Ben Marsh
9be95b3c51 Add a function to IDesktopPlatform to query the version of an engine (either from the new JSON build.version file, or from Version.h if that fails). Make UE4Build.cs update it during builds.
[CL 2617067 by Ben Marsh in Main branch]
2015-07-10 15:21:32 -04:00
Peter Sauerbrei
dfd0911cac file missing from previous signing submission
[CL 2616990 by Peter Sauerbrei in Main branch]
2015-07-10 14:28:29 -04:00
Peter Sauerbrei
e8d08e52fd UEB-117 - Move secure signing to the platforms
#codereview ben.marsh

[CL 2616956 by Peter Sauerbrei in Main branch]
2015-07-10 14:06:52 -04:00
Ben Marsh
dcaec587e9 Add AutomationUtils.Automation.dll to UAT build products.
[CL 2616035 by Ben Marsh in Main branch]
2015-07-09 20:05:56 -04:00
James Moran
e89583075e emscripten's file_packager.py requires EM_CONFIG is set before it's run.
#codereview ankit.khare

[CL 2615093 by James Moran in Main branch]
2015-07-09 10:31:56 -04:00
Wes Hunt
7fa290bb33 Summary: running UAT from VS is simpler and faster.
UEB-261 - Ensure that compiling AutomationTool in VS will compile all other Automation Projects
* Just set AutomationTool as your startup project and pass the command to execute.
* VS will build the script modules at build time, instead of every time at runtime.
* To make this happen, "UBT.exe -ProjectFiles" now generates a companion AutomationTool.csproj.References that make AutomationTool depend on all Automation modules.
* AutomationTool.exe defaults to not building script modules at runtime. Pass -compile if you want to dynamically build them.
* Without the .references file, AutomationTool will only build itself and you will need to pass -compile.
* RunUAT.bat still works that same, defaulting to runtime compilation and supporting -nocompile flag. It then passes -compile (or nothing) to AutomationTool.

Other
* All Automation projects target .Net 4.5. Some already were and had hard dependencies on them (Rocket and SyncGithub -> Octokit). Now that AutomationTool directly depends on them, everything had to use .Net 4.5.
* Decoupled logic for -NoCompile and -NoCompileEditor. The flags are still confusing, but -NoCompile is no longer linked to -NoCompileEditor.
* Had to leave in stub support in UAT for -NoCompile else RunUAT.bat passes it along and UAT complains that it doesn't understand it.
* Added a CommandUtils.Run option to support run command, but still output the run duration.
* Reduced the verbosity when UAT.proj is run from dozens of lines per module to a single Module -> Output line. It was looking like there were problems, but it was just msbuild spew.
#codereview:ben.marsh

[CL 2615060 by Wes Hunt in Main branch]
2015-07-09 10:15:37 -04:00
Wes Hunt
da49e11f87 For for UAT RunSingleInstance not correctly honoring uebp_UATMutexNoWait. It would run the command and then try and take the mutex and run it again, which would fail when it couldn't take the mutex (because uebp_UATMutexNoWait is only set when another UAT is expected to already be running).
[CL 2613790 by Wes Hunt in Main branch]
2015-07-08 13:35:20 -04:00