Commit Graph

37 Commits

Author SHA1 Message Date
Justin Sargent
a059c44845 Insert delays after mounting the DMG and before trying to write to it. Also remove code to suppress log output.
Merging using UE4-To-UE4-LauncherDev

[CL 2644813 by Justin Sargent in Main branch]
2015-08-05 10:02:11 -04:00
Michael Trepka
4c947f528b Bundled Mono for Mac updated to 4.0.2
#codereview Ben.Marsh

[CL 2626587 by Michael Trepka in Main branch]
2015-07-20 16:33:03 -04:00
Keli Hlodversson
feb69e8745 [INTEGRATE] Merging CL#2612583 using UE4-To-UE4-LauncherDev:
Let CreateDMG.sh fail on error instead of continuing blindly
rb: Wes.Fudala

[CL 2618306 by Keli Hlodversson in Main branch]
2015-07-13 11:48:23 -04:00
FTPiano
5f9393f3dd PR #1231: Fixed dependency script for Mac. (Contributed by FTPiano)
[CL 2595325 by Michael Trepka in Main branch]
2015-06-22 09:55:00 -04:00
Michael Trepka
3027ca6fa6 - Xcode unlock
[CL 2505720 by Michael Trepka in Main branch]
2015-04-08 15:48:54 -04:00
Carlos Cuello
6f1ac76399 [INTEGRATE] UE4-LauncherDev->UE4 integrate all up to cl 2475889
[CL 2478426 by Carlos Cuello in Main branch]
2015-03-13 08:26:18 -04:00
Michael Trepka
7cb65c0880 PR #872: Move UE4EditorServices.app service installing code to run after it is built. (Contributed by AlexanderOMara)
https://github.com/EpicGames/UnrealEngine/pull/872

[CL 2471310 by Michael Trepka in Main branch]
2015-03-06 11:59:25 -05:00
Ben Marsh
a68b387a51 Fix for early exit when running Git setup script if mono is not installed. "set -e" from setup.sh causes failure when capturing "where mono".
#codereview Michael.Trepka

[CL 2424428 by Ben Marsh in Main branch]
2015-01-29 16:37:28 -05:00
Josh Adams
9cf8c67c77 - Generate AndroidManifest.xml from ProjectSettings
- Moved some Android settings to ProjectSettings, re-enabled SDK settings
- Removed SigningConfig.xml, and moved those settings into project settings
- Added concept of NotForLicensees and NoRedist engine and project config settings
- Removed BaseInternalGame.ini, replaced with NotForLicensees/BaseGame.ini
- Moved User*.ini to end of .ini hierarchy
- Added support for CLASS_GlobalUserConfig, so their settings will be saved to <AppData>/.../User*.ini (useful for SDK paths, etc)
- Enabled AndroidPlatformEditor module on Mac
- Changed Mac Build.sh to allow for Android on the commandline (just pass through if it's not an Xcode platform name)
- Iterative Android packaging now looks at just the important .ini sections, NOT entire .ini files

#codereview jamie.dale,james.moran,michael.trepka,robert.jones,chris.babcock

[CL 2413870 by Josh Adams in Main branch]
2015-01-21 11:17:55 -05:00
Michael Trepka
a4079bf052 Reverting CL #2398916. It's not needed any more.
[CL 2404802 by Michael Trepka in Main branch]
2015-01-13 11:55:51 -05:00
Michael Trepka
eebc6eed35 Fixed Mono detection using which tool for a case when Mono is not installed
#codereview Mark.Satterthwaite

[CL 2401989 by Michael Trepka in Main branch]
2015-01-09 10:45:47 -05:00
Mark Satterthwaite
2dc20b49a6 When setting up mono on the Mac use 'which mono' to determine the location of the system version of Mono. This fixes [UE-7341] "Use 'which mono' in SetupMono.sh to determine path to system mono".
#codereview michael.trepka

[CL 2401935 by Mark Satterthwaite in Main branch]
2015-01-09 10:02:27 -05:00
Michael Trepka
71af74ace1 Create libmsvcrt.dylib symlink in bundled Mono's lib folder to temporarily workaround some issues with Mono not being able to find it
[CL 2398916 by Michael Trepka in Main branch]
2015-01-06 13:59:58 -05:00
Josh Adams
3c9d0fe928 - Tweaked Mac/Build.sh to handle IOS as well as iphoneos
[CL 2391777 by Josh Adams in Main branch]
2014-12-17 17:02:40 -05:00
Ben Marsh
b2e28930f4 Fix error running GitDependencies with new version of mono. Add a symlink to libc.dylib.
#codereview Michael.Trepka

[CL 2389180 by Ben Marsh in Main branch]
2014-12-15 17:21:28 -05:00
Michael Trepka
d9af15c646 Updated Mac FixMonoFiles.sh script for Mono 3.10
#codereview Ben.Marsh

[CL 2389041 by Michael Trepka in Main branch]
2014-12-15 15:46:27 -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
Michael Trepka
b4b15ab51d Added handling of negative UBT exit codes to Mac RocketBuild.sh
[CL 2362364 by Michael Trepka in Main branch]
2014-11-17 14:34:44 -05:00
Ben Marsh
22a8bd5bf4 Don't try to copy UE4EditorServices.app if it doesn't already exist. Fix for me sourcing SetupMono.sh with 'set -e' when bootstrapping the engine from GitHub.
#codereview Michael.Trepka

[CL 2358011 by Ben Marsh in Main branch]
2014-11-12 22:41:52 -05:00
Ben Marsh
e22c12e1fa Remove hard-coded list of executables on Mac. GitDependencies will set the executable bit correctly.
[CL 2356080 by Ben Marsh in Main branch]
2014-11-11 13:47:08 -05:00
Ben Marsh
523e288bb6 Change git hook to a symlink to Engine/Build/BatchFiles/Mac/GitDependenciesHook.sh (which calls GitDependencies.sh), and allow GitDependencies.sh to be run as a link from elsewhere.
#codereview Dmitry.Rekman

[CL 2356053 by Ben Marsh in Main branch]
2014-11-11 13:00:43 -05:00
Ben Marsh
9a55b892f5 Add shell script for Mac batch file which sets up Mono and runs GitDependencies
[CL 2355994 by Ben Marsh in Main branch]
2014-11-11 11:55:43 -05:00
Ben Marsh
b6620abbbe Add missing symlink for mono
[CL 2355986 by Ben Marsh in Main branch]
2014-11-11 11:45:43 -05:00
Ben Marsh
219b992e12 Always fixup symlinks and executable permissions for whichever mono files are available
#codereview Michael.Trepka

[CL 2355955 by Ben Marsh in Main branch]
2014-11-11 11:30:44 -05:00