Commit Graph

138 Commits

Author SHA1 Message Date
Nick Penwarden
9475617aeb Merging using UE4-Fortnite-To-UE4
#lockdown Ben.Marsh

[CL 2718258 by Nick Penwarden in Main branch]
2015-10-06 16:10:22 -04:00
Michael Trepka
dd49628ba9 Support for p4 tool installed in /usr/local/bin on Mac
[CL 2713170 by Michael Trepka in Main branch]
2015-10-01 13:48:01 -04:00
cpyarger
cf95ba231d PR #1577: add tanglu to install script (Contributed by cpyarger)
[CL 2710515 by Dmitry Rekman in Main branch]
2015-09-29 20:45:29 -04:00
Jeff Campeau
1388452b5b VS2015 now the default toolchain for Windows
Fallback to 2013 is automatic if 2015 is not installed or a platform SDK is detected that doesn't support the new IDE
Manual override is available via -2013
#platformnotify Josh.Adams

[CL 2709701 by Jeff Campeau in Main branch]
2015-09-29 13:17:32 -04:00
Ben Marsh
a72054ebd1 Remove the "ERROR: Automation Tool was unable to run succesfully" message. It's redundant, and gets picked up unnecessarily by the EC postp.
[CL 2707183 by Ben Marsh in Main branch]
2015-09-26 14:44:06 -04:00
Dmitry Rekman
41f110f4f2 UBT: Remove unused compiler arguments in Linux builds.
- Also fix a shell script for incremental rebuilds.

[CL 2692663 by Dmitry Rekman in Main branch]
2015-09-15 19:02:34 -04:00
Peter Sauerbrei
ca43123259 set the MSBUILD_EXE environment variable a little earlier so it works from a VC command prompt
#codereview ben.marsh

[CL 2687735 by Peter Sauerbrei in Main branch]
2015-09-11 08:50:00 -04:00
Ben Marsh
7830ea949d Propagate the correct exit code from UAT out of RunUAT.bat
[CL 2686665 by Ben Marsh in Main branch]
2015-09-10 13:50:18 -04:00
Dmitry Rekman
6659066dd5 Bump up Mono target to 4.5 due to IReadOnlyList usage.
#codereview Ben.Marsh

[CL 2685093 by Dmitry Rekman in Main branch]
2015-09-09 14:40:18 -04:00
Ben Marsh
e2e36c3603 Try to get the MSBuild path directly, without setting up the Visual Studio compile environment. Saves ~1-2 seconds per invocation.
[CL 2684728 by Ben Marsh in Main branch]
2015-09-09 11:07:16 -04:00
Ben Marsh
ea8db83294 Only clean the UBT target if the list of .cs files in the source directory has changed. The project conditionally includes platform-specific files if they exist, but MSBuild doesn't check for new files when dependency checking. Previous fix was just to clean all the time, but comparing the file list is faster.
[CL 2682889 by Ben Marsh in Main branch]
2015-09-08 08:01:15 -04:00
Bob Tellez
e9f5fa882d Dev->Main Merging CL#2668915 using UE4-Fortnite-To-UE4
[CL 2675065 by Bob Tellez in Main branch]
2015-08-31 22:22:58 -04:00
Ben Marsh
db93204811 Reduce the amount of boilerplate log output when running UAT.
[CL 2662515 by Ben Marsh in Main branch]
2015-08-20 09:06:43 -04:00
Dmitry Rekman
93e06d33c4 Linux cross-toolchain: re-arranged the files and added missing configs.
[CL 2656230 by Dmitry Rekman in Main branch]
2015-08-14 11:59:19 -04:00
Dmitry Rekman
e4886d01d7 Linux: Moved the script that builds (parts of) cross-toolchain to main.
[CL 2656139 by Dmitry Rekman in Main branch]
2015-08-14 10:51:54 -04:00
Dmitry Rekman
f8e226b36f Linux/Mac: fix packaging from the editor in the absence of UAT binary.
#codereview Michael.Trepka, Ben.Marsh

[CL 2653413 by Dmitry Rekman in Main branch]
2015-08-12 16:08:14 -04:00
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
Dmitry Rekman
83f74512b5 Linux: do not build LND as part of the setup.
- Not using LinuxNativeDialogs anymore.

[CL 2637661 by Dmitry Rekman in Main branch]
2015-07-29 16:59:51 -04:00
buildmachine
ce42430211 Code documentation from CL#2636592
[CL 2636758 by buildmachine in Main branch]
2015-07-29 07:47:34 -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
Wes Hunt
afd7e1f195 Build.bat now properly sets the ERRORLEVEL upon exiting.
#codereview:ben.marsh

[CL 2624853 by Wes Hunt in Main branch]
2015-07-17 16:35:40 -04:00
yaakuro
1c630d59b1 Add CodeLite support (on Linux) - UE-18561, UE-18564.
- Includes PR #1378 and #1379 (both contributed by yaakuro)
  * Adds CodeLite project generator to UBT (can be invoked on all platforms).
  * Adds CodeLite source accessor plugin (whitelisted for Linux only).
  * Desktop platform/game project generation switched to use .workspace on Linux.
- Minor cleanup (do not recompile UAT and its modules when generating Linux projects).

#codereview Josh.Adams, Robert.Manuszewski, Mike.Fricker

[CL 2621060 by Dmitry Rekman in Main branch]
2015-07-14 18:17:55 -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
Wes Hunt
7fa290bb33 Summary: running UAT from VS is simpler and faster.
UEB-261 - Ensure that compiling AutomationTool in VS will compile all other Automation Projects
* Just set AutomationTool as your startup project and pass the command to execute.
* VS will build the script modules at build time, instead of every time at runtime.
* To make this happen, "UBT.exe -ProjectFiles" now generates a companion AutomationTool.csproj.References that make AutomationTool depend on all Automation modules.
* AutomationTool.exe defaults to not building script modules at runtime. Pass -compile if you want to dynamically build them.
* Without the .references file, AutomationTool will only build itself and you will need to pass -compile.
* RunUAT.bat still works that same, defaulting to runtime compilation and supporting -nocompile flag. It then passes -compile (or nothing) to AutomationTool.

Other
* All Automation projects target .Net 4.5. Some already were and had hard dependencies on them (Rocket and SyncGithub -> Octokit). Now that AutomationTool directly depends on them, everything had to use .Net 4.5.
* Decoupled logic for -NoCompile and -NoCompileEditor. The flags are still confusing, but -NoCompile is no longer linked to -NoCompileEditor.
* Had to leave in stub support in UAT for -NoCompile else RunUAT.bat passes it along and UAT complains that it doesn't understand it.
* Added a CommandUtils.Run option to support run command, but still output the run duration.
* Reduced the verbosity when UAT.proj is run from dozens of lines per module to a single Module -> Output line. It was looking like there were problems, but it was just msbuild spew.
#codereview:ben.marsh

[CL 2615060 by Wes Hunt in Main branch]
2015-07-09 10:15:37 -04:00
Wes Hunt
9138084a82 UEB-120 - GenerateProjectFiles.bat will now exit with a non-zero exit code (1) when any failure happens. This should allow UGS to properly detect an error when, say, VS is not installed. Tested on a machine without VS installed and seems to work.
#codereview:ben.marsh

[CL 2599349 by Wes Hunt in Main branch]
2015-06-24 14:53:52 -04:00