Commit Graph

3418 Commits

Author SHA1 Message Date
Ben Marsh
c8999e6093 Make sure the version manifests and file names are serialized to the UBT makefile. If they're not written out, we won't be able to update the *.modules files correctly when switching between targets, unless we're discarding the makefile.
#codereview Jamie.Dale

[CL 2653646 by Ben Marsh in Main branch]
2015-08-12 17:52:25 -04:00
Michael Trepka
d5a4db5f86 Always compile ShaderCompileWorker along with the editor in Xcode
[CL 2653183 by Michael Trepka in Main branch]
2015-08-12 14:26:37 -04:00
Ben Marsh
3bb5d71d68 Remove promotion build nodes, aggregate nodes, and triggers.
[CL 2653116 by Ben Marsh in Main branch]
2015-08-12 13:58:01 -04:00
Ben Marsh
6b1b6d9bf1 Always compile ShaderCompileWorker along with the editor.
[CL 2652931 by Ben Marsh in Main branch]
2015-08-12 12:13:26 -04:00
Ben Marsh
f4855c823b Avoid throwing exceptions if the path to .buildmutex files doesn't exist.
[CL 2652920 by Ben Marsh in Main branch]
2015-08-12 12:01:25 -04:00
Paul Fazio
9464c5e0d6 UEB-327 - Signing process should fail over to alternate timestamp server when we receive "The specified timestamp server either could not be reached or returned an invalid response"
#codereview Ben.Marsh, Peter.Sauerbrei

[CL 2652815 by Paul Fazio in Main branch]
2015-08-12 11:03:28 -04:00
Ori Cohen
e13700b667 Added the ability to turn on release physx libs for all configurations
[CL 2652723 by Ori Cohen in Main branch]
2015-08-12 10:22:52 -04:00
Ben Marsh
599a3fcae0 Include the Templates/TemplateResources folder when filtering the engine to use for generating DDC.
[CL 2652697 by Ben Marsh in Main branch]
2015-08-12 10:05:08 -04:00
Jeff Campeau
6e5b895a54 Disable DualShock and Morpheus support for VS2015
[CL 2651897 by Jeff Campeau in Main branch]
2015-08-11 17:29:08 -04:00
Jeff Campeau
35d4842420 Disable some warnings for VS2015
[CL 2651883 by Jeff Campeau in Main branch]
2015-08-11 17:19:03 -04:00
Daniel Lamb
01fb1e902c Added support for diffing generated cooked content against supplied cooked pak file.
[CL 2651863 by Daniel Lamb in Main branch]
2015-08-11 17:11:41 -04:00
Mark Satterthwaite
d0e5c59013 Remove unnecessary variable declaration to silence unused warning.
[CL 2651432 by Mark Satterthwaite in Main branch]
2015-08-11 14:02:16 -04:00
Mark Satterthwaite
934f141a98 Update Distcc/DMUCS integration for new version of DistCode - must provide the correct DistProp & server for DMUCS and acquire the number of build hosts via Xcode on OS X.
[CL 2651279 by Mark Satterthwaite in Main branch]
2015-08-11 12:16:48 -04:00
Ben Marsh
89432f444b Separate Rocket builds from Git promotions. A separate trigger email will be sent for making Rocket builds from now on.
[CL 2651000 by Ben Marsh in Main branch]
2015-08-11 08:14:46 -04:00
Ben Marsh
7f9774d740 Make it clearer that TargetReceipt.Read can fail if the file doesn't exist or is formatted incorrectly.
[CL 2649965 by Ben Marsh in Main branch]
2015-08-10 16:07:05 -04:00
Mike Fricker
ff488db20f Fixed UHT compiled with older compiler when targeting Visual Studio 2015
#codereview jeff.campeau

[CL 2649768 by Mike Fricker in Main branch]
2015-08-10 14:28:15 -04:00
Ben Marsh
ddffc7e3dd Fix PCH environment changing when a module has an include path dependency, but the decision to compile that module is dependent on something else. Now always generates a consistent compile environment regardless of whether the other module binary is actually built.
#jira UE-19783

[CL 2649648 by Ben Marsh in Main branch]
2015-08-10 13:10:18 -04:00
Mike Fricker
0aadee3222 [INTEGRATE] Compile times: Fixed game plugin modules not able to use engine shared PCHs
- This change greatly improves compile times for game plugin modules
- Game modules never depend on the game itself, so there was no reason not to use shared PCHs by default

[CL 2649311 by Mike Fricker in Main branch]
2015-08-10 08:38:21 -04:00
Mike Fricker
659cb89e9c [INTEGRATE] UnrealBuildTool fixes for small modules
- Fixed small game-specific plugins always using non-unity and getting a unique PCH

- You can now override the default behavior of UBT which compiles small game modules for "fast iteration"
        - Many small game modules have a low frequency of iteration, and never need a unique PCH or non-unity enabled
        - You can use the following module-specific variables to override the default behavior:

                      MinSourceFilesForUnityBuildOverride = 1;
                      MinFilesUsingPrecompiledHeaderOverride = BuildConfiguration.MinFilesUsingPrecompiledHeader;

[CL 2648185 by Mike Fricker in Main branch]
2015-08-07 13:58:49 -04:00
James Moran
2a1ba3ccad Packaging HTML5 deploys double-click script for HTML5LaunchHelper to avoid using the command line.
Fixes UE-19637

[CL 2647934 by James Moran in Main branch]
2015-08-07 11:00:13 -04:00
Steve Robb
3ad72e0d88 UBT now rebuilds makefile when hotreloading a different module.
#codereview robert.manuszewski

[CL 2647884 by Steve Robb in Main branch]
2015-08-07 10:19:42 -04:00
James Moran
a892538094 Fix handling of spaces in emcc path.
Fix Optimizer path on Mac
fix jira-19532 part 2

[CL 2647762 by James Moran in Main branch]
2015-08-07 07:10:38 -04:00
Bob Tellez
5507cb9604 [AUTOMERGE]
Excluding the editor for a platform no longer excludes the Tools node, which includes tools used for non-editor targets

--------
Integrated using branch Ue4-To-UE4-Fortnite-Simple (reversed) of change#2647003 by Bob.Tellez on 2015/08/06 16:52:16.

[CL 2647005 by Bob Tellez in Main branch]
2015-08-06 16:52:45 -04:00
Marcus Wassmer
9f9a6ba80a Set up stagedir even in skipstage so the run command can find the proper executable
#codereview james.moran

[CL 2646930 by Marcus Wassmer in Main branch]
2015-08-06 16:19:18 -04:00
Wes Hunt
cefa87e4b7 Ionic.zip code import
* Moving Ionic.Zip source code into UE4 from UE4 source.
* Only one left should be in Binaries/DotNET.
* Moving TPS info to source location.
* Deleting several copies that were floating around.

Assembly Resolve Refactor
* Added AssemblyUtils.InstallAssemblyResolver to handle resolving of known assemblies that may not exist in the same folder as the referencing assembly.
* This is now installed by UAT and UBT, which should handle all needs to load Ionic.Zip and RPCUtility.exe from scripts that install into subfolders of Binaries/DotNET.
* Other assemblies can be added easily as necesary, centralizing the location where this is handled.
* Removed AssemblyResolver from RPCUtilHelper as UBT handles it automatically now.
* Removed Ionic.Zip references from projects that weren't really using it.
#codereview:ben.marsh

[CL 2646891 by Wes Hunt in Main branch]
2015-08-06 15:55:44 -04:00