Commit Graph

41 Commits

Author SHA1 Message Date
Peter Sauerbrei
7e009894ea fix for invalid option when code signing multiple executables at once
#uat
#codereview ben.marsh, justin.sargent

[CL 2639159 by Peter Sauerbrei in Main branch]
2015-07-30 14:55:28 -04:00
Ben Marsh
79351a008c Remove build.properties. Applications can now use Build.version for structured version information; timestamp was only used by the launcher, so it now uses its own.
[CL 2638907 by Ben Marsh in Main branch]
2015-07-30 12:24:22 -04:00
Ben Marsh
047fafaf98 Add a -ScriptsForProject parameter to UAT, which causes it to only compile and load scripts for a certain project. Fixes issues when only syncing source for one project, as is typical in UGS workflows. Always pass that parameter from the editor, and always compile UAT when running from a non-installed, non-promoted build.
#codereview Bob.Tellez

[CL 2638899 by Ben Marsh in Main branch]
2015-07-30 12:15:19 -04:00
Bob Tellez
ad8874b794 [AUTOMERGE]
Creating an app bundle when archiving for mac is now optional.

--------
Integrated using branch Ue4-To-UE4-Fortnite-Simple (reversed) of change#2637748 by Bob.Tellez on 2015/07/29 17:46:21.

[CL 2637750 by Bob Tellez in Main branch]
2015-07-29 17:47:13 -04:00
Wes Hunt
5381c65593 Convert to a better exception class and error message. Most tools assume NotImplementedException means something very specific.
[CL 2637669 by Wes Hunt in Main branch]
2015-07-29 17:04:27 -04:00
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