[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kdesrc-build] /: Move KRunner to after plasma-framework in kf5 build includes
From:       Alex Merry <kde () randomguy3 ! me ! uk>
Date:       2014-02-19 15:37:46
Message-ID: E1WG9DW-0002QX-0t () scm ! kde ! org
[Download RAW message or body]

Git commit f6cb31ebba14d2fcc327c4932441a687b5da2206 by Alex Merry.
Committed on 19/02/2014 at 11:49.
Pushed by alexmerry into branch 'master'.

Move KRunner to after plasma-framework in kf5 build includes

KRunner depends on Plasma-framework, but (because kdesrc-build
apparently assumes config file order is more reliable than dependency
info in kde-build-metadata) it gets built first, which is an issue when
you are doing a completely clean build.

This includes moving plasma-framework to kf5-frameworks-build-include
where it belongs.

REVIEW: 115893

M  +9    -0    kf5-frameworks-build-include
M  +0    -4    kf5-workspace-build-include

http://commits.kde.org/kdesrc-build/f6cb31ebba14d2fcc327c4932441a687b5da2206

diff --git a/kf5-frameworks-build-include b/kf5-frameworks-build-include
index 937d182..cd59286 100644
--- a/kf5-frameworks-build-include
+++ b/kf5-frameworks-build-include
@@ -43,6 +43,7 @@ end module-set
 module-set frameworks
     repository kde-projects
     use-modules frameworks
+    ignore-modules krunner # depends on Plasma
     branch master
     # The CodeBlocks generator allows usage in QtCreator, while still generating Makefiles
     cmake-options -DBUILD_TESTING=TRUE -DCMAKE_BUILD_TYPE:STRING=debug -G "CodeBlocks - Unix Makefiles"
@@ -54,3 +55,11 @@ module kde-kactivities
     branch frameworks
 end module
 
+module plasma-framework
+    repository kde:plasma-framework
+end module
+
+module krunner
+    repository kde:krunner
+end module
+
diff --git a/kf5-workspace-build-include b/kf5-workspace-build-include
index 56b5013..a307919 100644
--- a/kf5-workspace-build-include
+++ b/kf5-workspace-build-include
@@ -10,10 +10,6 @@
 #
 # You can then add additional modules if desired.
 
-module plasma-framework
-    repository kde:plasma-framework
-end module
-
 # This module is temporary (parts of it depend on plasma, so it's here)
 module kde-runtime
     repository kde:kde-runtime
[prev in list] [next in list] [prev in thread] [next in thread]