Commit Graph

114 Commits

Author SHA1 Message Date
Dmitry Rekman
b385e8a8b7 Moved wrapper script for GitDependencies to a better location.
- Suggested by BenM.

[CL 2418842 by Dmitry Rekman in Main branch]
2015-01-26 13:22:53 -05:00
Dmitry Rekman
b9acb93cac Linux readme updates (UEPLAT-480).
[CL 2415696 by Dmitry Rekman in Main branch]
2015-01-22 14:57:40 -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
Dmitry Rekman
03abf32964 Fix HLSLCC Linux build.
#codereview Rolando.Caloca

[CL 2370125 by Dmitry Rekman in Main branch]
2014-11-25 17:55:17 -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
Dmitry Rekman
58cb89f637 Minor change in Linux readme.
[CL 2361185 by Dmitry Rekman in Main branch]
2014-11-15 00:50:13 -05:00
Dmitry Rekman
1fd7bf8e29 Updated Linux README.
[CL 2361125 by Dmitry Rekman in Main branch]
2014-11-14 23:05:13 -05:00
Dmitry Rekman
cae142b414 Added fixes for case sensitivity issues.
(missed in previous commit).

[CL 2360970 by Dmitry Rekman in Main branch]
2014-11-14 18:53:39 -05:00
Dmitry Rekman
65d4f0940e Changes to build process.
- One time setup moved to Setup.sh, with GenerateProjectFiles.sh attempting to detect whether this was ever run previously.
- Checking git/perforce build differently, turned off updating deps.
- Updated smoke test appropriately.
- Closes UEPLAT-231.

#codereview Adric.Worley, Ben.Marsh

[CL 2360733 by Dmitry Rekman in Main branch]
2014-11-14 16:58:40 -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
Dmitry Rekman
6cba53e7c8 Add GitDependencies as a post-merge hook.
- Also add it to GenerateProjectFiles.sh so the flow is not too different between 4.5 and 4.6
- Remove unpacking zips and older solution.

#codereview Ben.Marsh

[CL 2352604 by Dmitry Rekman in Main branch]
2014-11-07 09:47:50 -05:00