Commit Graph

60 Commits

Author SHA1 Message Date
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
Ben Marsh
9be95b3c51 Add a function to IDesktopPlatform to query the version of an engine (either from the new JSON build.version file, or from Version.h if that fails). Make UE4Build.cs update it during builds.
[CL 2617067 by Ben Marsh in Main branch]
2015-07-10 15:21:32 -04:00
Ben Marsh
b4e25c6613 Fix hot reload not working correctly with UnrealGameSync; having a build changelist does not necessarily mean that the build is promoted any more. Renamed FEngineVersionBase::IsPromotedBuild() to FEngineVersionBase::HasChangelist(), and use FApp::GetEngineIsPromotedBuild() instead.
#codereview Robert.Manuszewski, Bob.Tellez

[CL 2602096 by Ben Marsh in Main branch]
2015-06-26 09:25:56 -04:00
Justin Sargent
39950a8c41 Merging using UE4-To-UE4-LauncherDev
[CL 2593947 by Justin Sargent in Main branch]
2015-06-19 14:22:08 -04:00
Justin Sargent
e9377b4f03 Merging using UE4-To-UE4-LauncherDev
[CL 2593804 by Justin Sargent in Main branch]
2015-06-19 13:26:10 -04:00
Justin Sargent
3facd1a709 Fixed missing logic from bad integrate.
[CL 2593452 by Justin Sargent in Main branch]
2015-06-19 10:12:02 -04:00
Justin Sargent
b6b6ce97c9 Fixing backwards compatibility issues with project and engine handling in DasktopPlatformBase
Merging using UE4-To-UE4-LauncherDev

#codereview Ben.Marsh

[CL 2593420 by Justin Sargent in Main branch]
2015-06-19 09:54:12 -04:00
Bob Tellez
5d2fd8b7fb [AUTOMERGE]
#UE4 Reducing dependencies on Version.h

#platformnotify Josh.Adams

--------
Integrated using branch Ue4-To-UE4-Fortnite-Simple (reversed) of change#2585810 by Bob.Tellez on 2015/06/12 11:30:33.

[CL 2585846 by Bob Tellez in Main branch]
2015-06-12 12:01:23 -04:00
Andrew Brown
59c10c5f50 [INTEGRATE] merge ue4<-ue4-launcherDev cl 2582631
#change Rollback of accidental merge 2581810. Discussed alternate solution with Ben.Marsh

#platformnotify Josh.Adams

[CL 2582768 by Andrew Brown in Main branch]
2015-06-10 11:14:19 -04:00
Justin Sargent
273cde1704 Merging using UE4-To-UE4-LauncherDev
#platformnotify Josh.Adams

[CL 2581810 by Justin Sargent in Main branch]
2015-06-09 16:41:53 -04:00
Ben Marsh
570c0df105 Disable UBT makefiles when compiling projects from the editor. It's more important to be robust than fast, since we're automating something for the user.
[CL 2547042 by Ben Marsh in Main branch]
2015-05-12 08:01:00 -04:00
salamanderrake
27ccfbd723 PR #806: KDevelop Project Generation (UE-9427).
- Contributed by salamanderrake.
- Cosmetic differences from the PR.
- Also removed filtering out Windows/Mac/etc directories when generating a qmake project since it makes code navigation worse.

[CL 2532165 by Dmitry Rekman in Main branch]
2015-04-30 13:15:34 -04:00
Justin Sargent
75f4981862 Merging using UE4-To-UE4-LauncherDev
[CL 2517983 by Justin Sargent in Main branch]
2015-04-20 14:30:09 -04:00
Andrew Rodham
8ff0d8b98b Added config migration path for newer versions of the engine.
Newly installed versions of the engine will now attempt to copy the project-agnostic config settings from a previous engine installation. This happens by way of a versioned manifest that copies old versions when the manifest does not exist, or is a different version. This code path is benign for non-installed versions of the engine (or FPaths::ShouldSaveToUserDir() is false).

EditorGameAgnosticSettings and EditorUserSettings ini paths have been renamed to EditorSettings and EditorPerProjectUserSettings respectively to better convey their purpose. In general, most settings should be saved in EditorSettings (project-agnostic) so that they apply regardless of which project is open. We have some way to go migrating existing settings for this to be the case, however.

Some previously per-project configuration files are now project-agnostic (such as Editor.ini, EditorKeyBindings.ini, and EditorLayout.ini)

GEditor->Access...Settings and GEditor->Get...Settings have been removed in favor of direct access of the CDO through GetMutableDefault<> and GetDefault<> respectively. Global config ini filenames that are not set up are now neither loaded nor saved on build machines, to handle the problem of indeterminate state more generically.

This addresses UETOOL-270 (Most editor preferences should be project-agnostic)

[CL 2517558 by Andrew Rodham in Main branch]
2015-04-20 10:12:55 -04:00
Richard TalbotWatkin
0eac4346bf Added code to abort opening a project if the project's PackageFileUE4Version is higher than the current engine's.
#jira UE-8407 - Trying to open project from Newer version to older version of the Editor
#reviewedby Ben.Marsh

[CL 2515634 by Richard TalbotWatkin in Main branch]
2015-04-17 06:35:39 -04:00
Ben Marsh
fee619181a Make sure initial compile forwards -Rocket flag to UBT when running from source with the -Rocket argument.
#codereview Matthew.Griffin

[CL 2498804 by Ben Marsh in Main branch]
2015-04-01 13:23:00 -04:00
Dmitry Rekman
f3953ad462 Changes to building the UBT.
- Incorporates PR #934 (fix a broken path to RunXBuild.sh when building UBT for Linux) contributed by amigo (3dluvr).
- Moved more code out of #ifdef-s to make compiler see it when compiling on all platforms.

#codereview Ben.Marsh, Jaroslaw.Palczynski

[CL 2482335 by Dmitry Rekman in Main branch]
2015-03-17 18:47:43 -04:00
Jaroslaw Palczynski
6c305898e0 UE-8578: Slate Widget fails to compile once added to a new project
Slate Widget was failing, because of missing Slate dependencies. Testing introduced a couple of problems which all was fixed by this CL:
1. I introduced AdditionalDependencies in .uproject file and change "Add Code To Project..." procedure to fill this array if needed. UBT reads this field and builds the project with required modules. Needed for Slate classes.
2. Changed UHT to #include missing headers in generated.h files if it was missing an include for it's super class. It was causing problems if we were trying to add a subclass of BrushShape -- BrushShape.h didn't have #include "Brush.h" and UBrushShape was inheriting from UBrush.
3. Above problems also occured for Slate classes, but not all of them was UCLASSes, so I had to fixed that manually.
4. "Add Code To Project..." functionality was not invalidating UBT makefiles, which lead to omitting new source files during hot-reloading (even thought it was reporting a success). This change also should improve a bit performance, cause right now there is no "gathering" step -- there is only invalidate step which is a lot quicker.
5. Fixed "Selected Class Source" link to source class in Slate Widget and Slate Widget Style class.

#codereview Robert.Manuszewski

[CL 2481488 by Jaroslaw Palczynski in Main branch]
2015-03-17 09:34:18 -04:00
Dmitry Rekman
e7d1e64ee3 Changed calls to FProcHandle.Close() to FPlatformProcess::CloseProc().
We already had FPlatformProcess::CreateProc/CloseProc pair (which is part of larger set with WaitForProc(), TerminateProc(), GetProcReturnCode(), etc). FProcHandle::Close() made the API more confusing (and actually introduced bugs, because it did not call CloseProc() until recently).

#codereview Josh.Adams, Robert.Manuszewski, Jaroslaw.Surowiec

[CL 2476322 by Dmitry Rekman in Main branch]
2015-03-12 00:06:15 -04:00
Dmitry Rekman
de842c0fda Fix for double pipe calls in DesktopPlatform/GitSCC.
- PR #873 contributed by yaakuro

https://github.com/EpicGames/UnrealEngine/pull/873

[CL 2472497 by Dmitry Rekman in Main branch]
2015-03-09 11:45:35 -04:00
Jamie Dale
7a631aa939 Added support for "gathering" project files via the editor
This is needed for UBT to update its makefiles when we add new code via the editor.

Updating UBT makefiles is more typically handled by re-generating project files, however on Windows we use DTE to inject new files directly into Visual Studio in an attempt to avoid re-generating project files (as it produces modal popups that block operations), so we need to perform a gather instead so that UBT knows things have changed.

ReviewedBy Mike.Fricker

[CL 2446903 by Jamie Dale in Main branch]
2015-02-16 07:53:59 -05:00
Matthew Griffin
b8ff0ef0f9 [INTEGRATE] Change 2431733 by Mike.Fricker@MFRICKER_G3686_Alpha on 2015/02/04 10:34:16
Fix non-Rocket projects generated even with "-Rocket" passed

[CL 2438158 by Matthew Griffin in Main branch]
2015-02-09 11:18:22 -05:00
Ben Marsh
0c9614b56a Fixes for UnrealVersionSelector:
* Only try to build UBT if it's not present in the *target* engine directory (as opposed to the running engine directory). Fixes problems with running from launcher installation.
* Fix building UBT from paths that contain spaces.
* Better logging of what's going on when trying to build UBT (and possible failure points)
* Remove duplicate entries in installation list, and make sure that every path is stored in the same way. Was allowing a number of paths to contain relative portions.

#codereview Carlos.Cuello

[CL 2424385 by Ben Marsh in Main branch]
2015-01-29 16:15:16 -05:00
Ben Marsh
97a04f6def Allow parsing a relative path as a project's engine identifier.
[CL 2401856 by Ben Marsh in Main branch]
2015-01-09 08:11:29 -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