Commit Graph

359 Commits

Author SHA1 Message Date
Gil Gribb
881d367fe9 build script, reenable automated testing
[CL 2070705 by Gil Gribb in Main branch]
2014-05-12 15:55:18 -04:00
Dmitry Rekman
1041c8a2df Set Ctrl-C handler in SlateViewer.
[CL 2070655 by Dmitry Rekman in Main branch]
2014-05-12 15:25:10 -04:00
John Pollard
eae6e5056b Mac support for staging intermediate framework assets folder
[CL 2070637 by John Pollard in Main branch]
2014-05-12 15:05:08 -04:00
Gil Gribb
a5af59f469 build script, preparation for deleting old builds
[CL 2070482 by Gil Gribb in Main branch]
2014-05-12 12:59:47 -04:00
Eric Newman
33b37aa9f0 Removed my null-guarding in TempStorage
[CL 2070331 by Eric Newman in Main branch]
2014-05-12 10:38:57 -04:00
Mikolaj Sieluzycki
0709899876 Fix for build break caused by CL#2070165.
[CL 2070247 by Mikolaj Sieluzycki in Main branch]
2014-05-12 08:42:47 -04:00
Mikolaj Sieluzycki
61f04f9580 Fix for build break caused by CL#2070165.
[CL 2070228 by Mikolaj Sieluzycki in Main branch]
2014-05-12 08:42:01 -04:00
Mikolaj Sieluzycki
f906fb27b2 Fix for build break caused by CL#2070165
[CL 2070212 by Mikolaj Sieluzycki in Main branch]
2014-05-12 08:41:17 -04:00
Dmitry Rekman
d1a6ccf77d Cleaned up UBT from compiler warnings.
Removed code that was unused (or not yet fully in?).

#codereview Marcus.Wassmer, Peter.Sauerbrei

[CL 2069359 by Dmitry Rekman in Main branch]
2014-05-10 17:49:49 -04:00
Dmitry Rekman
f3f01545e8 Nuked dead code in UBT that caused Mono warnings.
Seems like these have been merged over from Pretest and never saw any use in Main.

#codereview Steve.Robb

[CL 2069355 by Dmitry Rekman in Main branch]
2014-05-10 17:44:47 -04:00
Dmitry Rekman
29c1a53469 Cleaned up UBT's CMake generator.
- Removed leftover attempts at better CMake support (caused Mono warnings).
- Fixed formatting (tabs->spaces in C# files).

#codereview Michael.Liebenow

[CL 2069317 by Dmitry Rekman in Main branch]
2014-05-10 16:34:29 -04:00
Eric Newman
8e05a584bf Second try at fixing null object in TempStorage.
[CL 2069208 by Eric Newman in Main branch]
2014-05-10 10:33:07 -04:00
Eric Newman
483abb68c5 Attempting to fix null object reference error. CombinePaths args appear to have been swapped, although this code itself hasn't been touched in some time.
[CL 2069193 by Eric Newman in Main branch]
2014-05-10 09:47:57 -04:00
Dmitry Rekman
f3647ea715 Linux native compilation improvements (incorporates PR 116 by Hydrael).
- detect Gentoo (and in generally distros without lsb_release installed)
- explicitly disable inlining in Debug

[CL 2069002 by Dmitry Rekman in Main branch]
2014-05-09 22:24:58 -04:00
Steve Robb
0dac41b1df Removed some bHackHeaderGenerator usage.
#codereview robert.manuszewski

[CL 2068999 by Steve Robb in Main branch]
2014-05-09 22:20:08 -04:00
John Pollard
b499a7ddf0 Mac support for copying bundled iOS framework assets
#Codereview Josh.Adams, Peter.Sauerbrei, Michael.Noland, Gil.Gribb, Robert.Manuszewski

[CL 2068721 by John Pollard in Main branch]
2014-05-09 17:38:40 -04:00
Dmitry Rekman
cfc680744b Add localization and splash files to packaged Linux builds.
[CL 2068637 by Dmitry Rekman in Main branch]
2014-05-09 16:58:27 -04:00
John Pollard
d99028f75e Support for third party iOS framework bundled assets
* Work in progress, works with RPC utility, local mac support incoming
* Changed AdditionalPublicFrameworks from storing just string, to storing the frame work name, zip name, and bundled asset name that needs to be copied
* We also now store the module that added this framework, so we can derive the module project path, etc when we need it for when we create intermediate directories

#Codereview Josh.Adams, Peter.Sauerbrei, Michael.Noland, Gil.Gribb, Robert.Manuszewski

[CL 2068603 by John Pollard in Main branch]
2014-05-09 16:38:26 -04:00
Steve Robb
2a0aca7a62 Back out changelist 2068336
[CL 2068514 by Steve Robb in Main branch]
2014-05-09 15:12:56 -04:00
Robert Manuszewski
4f64ccc430 Fix for 'Runuat -help' crash on exit
[CL 2068459 by Robert Manuszewski in Main branch]
2014-05-09 14:32:42 -04:00
Ben Marsh
ca47fadda0 Put UnrealBuildTool.Utils.DisplayProgress back in; it's still called from UAT. Will fixup properly later.
[CL 2068365 by Ben Marsh in Main branch]
2014-05-09 13:37:36 -04:00
Steve Robb
1478c2cdc7 #ttp 333737: UHT should not output anything differently for Rocket
#change Root module path added to include paths.
#change Plugins now write intermediates to the project folder.
#change All generated #includes are now relative.
#change Updated UHTDebugging.manifest to new format.
#remove Rocket-specific UHT execution removed.
#remove Some bHackHeaderGenerator usage removed.
#remove iOS header hack removed.

#codereview robert.manuszewski,ben.marsh

[CL 2068336 by Steve Robb in Main branch]
2014-05-09 13:02:49 -04:00
Ben Marsh
1eabc9130a Add markup language which can be used to report high-level user feedback from external tools. Change UBT to output the correct syntax when generating project files.
[CL 2068314 by Ben Marsh in Main branch]
2014-05-09 12:32:38 -04:00
Peter Sauerbrei
97935ec013 Merged Github pull request #64 - DotNET security warnings when using iPhonePackager on Windows 8
#ue4
#ios

[CL 2068216 by Peter Sauerbrei in Main branch]
2014-05-09 11:27:53 -04:00
Terence Burns
d889df5ff7 UDKRemote compile error fixes.
Missing resource and updated the deprecated usage of UUID

[CL 2068207 by Terence Burns in Main branch]
2014-05-09 11:22:17 -04:00