Commit Graph

3410 Commits

Author SHA1 Message Date
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
Steve Robb
e446302541 Fix to module name comparison when checking files to rebuild.
#codereview robert.manuszewski

[CL 2646563 by Steve Robb in Main branch]
2015-08-06 12:14:25 -04:00
Steve Robb
7d32c57c73 Support for regular C++ int types in casts.
#codereview robert.manuszewski

[CL 2646554 by Steve Robb in Main branch]
2015-08-06 12:09:44 -04:00
Wes Hunt
e2783d981e Add additional telemetry to TempStorage. Moved TelemetryStopwatch out of CommandUtils. Added DateTimeStopwatch to make timing things easier.
[CL 2646031 by Wes Hunt in Main branch]
2015-08-05 22:16:45 -04:00
Josh Markiewicz
57eb560a93 #Integration FN->Main from CL#2644336
actual vetted build from QA

[CL 2646006 by Josh Markiewicz in Main branch]
2015-08-05 21:54:43 -04:00
Wes Hunt
6a80229042 Turn off all automation tests by default. This will need to get propagated to all branches, so I will just update the branch hacker in the two remaining branches that weren't already turning it off: LauncherDev and Fortnite.
#codereview:ben.marsh,adric.worley,bob.ferreira

[CL 2645709 by Wes Hunt in Main branch]
2015-08-05 18:31:03 -04:00
Chris Babcock
9c6add976a Keep the last export of each path from .bash_profile instead of the first one if not set in ini
#jira UE-19619
#ue4
#android
#codereview Michael.Trepka,Mark.Satterthwaite

[CL 2645674 by Chris Babcock in Main branch]
2015-08-05 18:10:38 -04:00
Josh Markiewicz
f8d83447e1 #Integration FN->Main from CL#2642868
Engine Source changes

[CL 2645403 by Josh Markiewicz in Main branch]
2015-08-05 15:54:57 -04:00
Wes Hunt
8a216453ea SetUATLocation uses the EntryAssembly instead of the executing assembly.
[CL 2645374 by Wes Hunt in Main branch]
2015-08-05 15:31:36 -04:00