Commit Graph

37 Commits

Author SHA1 Message Date
Josh Adams
9fd07ce722 - Made some changes to allow receipt based packaging to work with the Desktop platform. One hacky bit remains that I have entered a JIRA for [UE-14120]
#codereview ben.marsh

[CL 2519643 by Josh Adams in Main branch]
2015-04-21 14:25:42 -04:00
Eric Newman
b136bcabca Looking into alternate solutions for mac packaging
Back out changelist 2514643

[CL 2514693 by Eric Newman in Main branch]
2015-04-16 14:27:20 -04:00
Eric Newman
052a09e093 Mac packaging no longer moves and renames the primary .app to the top level
OPP-2548
Merging //depot/UE4-Fortnite/Engine/Source/Programs/AutomationTool/Mac/MacPlatform.Automation.cs to //depot/UE4/Engine/Source/Programs/AutomationTool/Mac/MacPlatform.Automation.cs
#codereview michael.trepka,josh.adams

[CL 2514643 by Eric Newman in Main branch]
2015-04-16 14:03:54 -04:00
Josh Adams
86f2e08a55 - Added support for DesktopPlatform to package content and executables together (editor's File | Package)
- This is a first pass
  - Mac uses data outside the .app so that there's only one copy of the content. This should get a bootstrap executable like Windows has
  - Only tested on Mac so far, although it doesn't handle D3D11 shaders, or some of the icon updating for the bootstrap working
- Added Desktop platform icons

[CL 2505866 by Josh Adams in Main branch]
2015-04-08 16:59:20 -04:00
Peter Knepley
341828cb71 Merging 2501807 mac staging fixes
//depot/UE4-UT/...

to //depot/UE4/...

[CL 2501817 by Peter Knepley in Main branch]
2015-04-03 18:35:07 -04:00
Peter Knepley
3df60455a8 Merging
//depot/UE4-UT/...

to //depot/UE4/...

[CL 2501519 by Peter Knepley in Main branch]
2015-04-03 15:34:59 -04:00
Peter Knepley
d83e3a2129 Merging CL 2495959
//depot/UE4-UT/...

to //depot/UE4/...

[CL 2495967 by Peter Knepley in Main branch]
2015-03-30 14:45:04 -04:00
Todd Eckert
79e183780f Merging Dev->Main up to CL#2479653 using UE4-Fortnite-To-UE4.
*because of tons of changes, I will supply the changelists in the email because it was too large for this checkin*

[CL 2483008 by Todd Eckert in Main branch]
2015-03-18 10:12:32 -04:00
Michael Trepka
693bdb1b6a Stage Mac Steam lib when packaging a game that uses it
[CL 2480268 by Michael Trepka in Main branch]
2015-03-16 12:46:31 -04:00
Matthew Griffin
d44418207a [INTEGRATE] Change 2449448 by Ben.Marsh@Ben.Marsh_T3245_Clean on 2015/02/17 19:00:41
Conditionally stage CEF3 for Mac too. (UE-9983)

[CL 2450042 by Matthew Griffin in Main branch]
2015-02-18 09:19:43 -05:00
Terence Burns
6f98decbcd UE-8433
Added an error code for missing ue4game binaries when packaging a non code project.
Added a check in main frame actions to determine whether we display a dialog with the error message in it.

Fix for incorrect IOS stub path being logged
Fix for incorrect Android apk path being generated for non ue4game renames in ::GetFinalApkName

[CL 2427458 by Terence Burns in Main branch]
2015-02-01 12:33:30 -05:00
Michael Trepka
6554b3b486 Support for using CEF framwork in packaged games (changed CEF3 target to use framework in Binaries/ThirdParty, removed extra copy in Source/ThirdParty, switched the framework and libs to use rpaths instead of hardcoded path). Re-enabled UE4Game dependency on WebBroswer module in Rocket on Mac.
#codereview Ben.Marsh, Matthew.Griffin

[CL 2415823 by Michael Trepka in Main branch]
2015-01-22 16:20:44 -05:00
Matthew Griffin
69e5147031 Missed files from CEF3 Win32 checkin
[CL 2408751 by Matthew Griffin in Main branch]
2015-01-16 09:04:57 -05:00
John Abercrombie
4e9ac6444a Merging using UE4-Fortnite-To-UE4 @ CL 2382284
[CL 2388856 by John Abercrombie in Main branch]
2014-12-15 15:29:48 -05:00
Michael Trepka
98dc0aa5fe Removed conditional inclusion of most platform files in UBT project so the same project can be used in Visual Studio and Mono Develop/Xamarin Studio, removed _Mono UBT and UAT projects, updated automation scripts to be compatible with Mono 3.10
[CL 2388812 by Michael Trepka in Main branch]
2014-12-15 15:28:22 -05:00
Ben Marsh
149375b14b Update copyright notices to 2015.
[CL 2379638 by Ben Marsh in Main branch]
2014-12-07 19:09:38 -05:00
Ben Marsh
959cfa782d Add missing copyright notices to source files.
[CL 2379212 by Ben Marsh in Main branch]
2014-12-06 19:14:20 -05:00
Michael Trepka
715ac08f35 Initial Mac-specific project settings (splash screen and icon for now), including minimal implementation of ImageWrapper for .icns files
[CL 2345090 by Michael Trepka in Main branch]
2014-10-30 12:36:31 -04:00
Saul Abreu
44baed0ff7 Added settings for staging internationalization presets. Updated staging logic to stage ICU internationalization data presets from commandline arguments or settings. Added default settings for internationalization presets.
[CL 2341735 by Saul Abreu in Main branch]
2014-10-27 19:33:51 -04:00
Saul Abreu
a05e2d523e Corrected platform-specific ICU data staging logic that was using the old paths.
[CL 2339348 by Saul Abreu in Main branch]
2014-10-23 19:42:28 -04:00
Peter Sauerbrei
bcaa096da8 fix for Tappy Chicken not launching past splash screen on iOS
fix for Android unable to launch projects via UFE
fix for Project Launcher default roles settings not being used
TTP347511, TTP347613, TTP347768
#ue4

[CL 2311418 by Peter Sauerbrei in Main branch]
2014-09-26 15:27:39 -04:00
Ben Zeigler
67566bb0f2 Merging changes to UAT from UE4-Fortnite branch, up to CL #2256868:
Add BuildOnlyPlatforms_MonolithicOnly to the RulesCompiler, to specify platforms that we want to compile but not cook
Add concept of "Dependent platform" to UAT, where the cooked data comes from a source platform, and is duplicated at stage time
Updated brutal submit to handle the same changes already being submitted during a build.
Brutal submit now considers it as success when it attempts to reconcile with latest in P4 and finds no files are different in its workspace.
Fix formatting on automation.cs files to avoid future integration issues, unify as tabs-as-tabs instead of spaces

#codereview kellan.carr

[CL 2261070 by Ben Zeigler in Main branch]
2014-08-18 13:29:39 -04:00
Robert Manuszewski
e6072fb050 UnrealBuildTool: Added UnrealHeaderTool version checking when checking if it's up to date.
#change UBT will check for API version of all UnrealHeaderTool binaries to detect partial syncs
#change Added BuildHostPlatform class for runtime platform abstraction

[CL 2245408 by Robert Manuszewski in Main branch]
2014-08-06 07:05:15 -04:00
Saul Abreu
bd93ea7dfd Swapped ICU 51.2 for 53.1 when using the ICU module. Updated preprocessor definitions when using the ICU module to match updated ICU build without transliteration functionality. Implemented common data file open/close callbacks in UE4 and hooked into ICU. Added memory stats for ICU data files. Updated number formatting tests to validate new CLDR data. Updated checks to ensure the new ICU common data directory is present and fallback appropriately where possible.
[CL 2109697 by Saul Abreu in Main branch]
2014-06-18 16:27:48 -04:00
Saul Abreu
7db7405411 Backed out ICU changes temporarily. To be resolved not-during-the-weekend.
[CL 2105281 by Saul Abreu in Main branch]
2014-06-13 20:13:34 -04:00