= Diff of branches mp-osx-ci and production for repository mp-osx-ci =

The mp-osx-ci branch of the [http://quickgit.kde.org/?p=clones%2Fwebsites%2Fbuild-kde-org%2Fkaning%2Fmp-osx-ci.git mp-osx-ci git repository] contains all settings needed for an OSX/CI system.

{{{
$ date; git diff production config
Sat Feb 14 21:50:51 CET 2015
diff --git a/config/base/kf5-qt5 b/config/base/kf5-qt5
index 4ec4661..28c3d97 100644
--- a/config/base/kf5-qt5
+++ b/config/base/kf5-qt5
@@ -20,7 +20,7 @@ general/vc: -qt5
 general/shared-desktop-ontologies: -qt5
 
 # KDE Frameworks
-frameworks/kauth: kdesupport/polkit-qt-1
+#frameworks/kauth: kdesupport/polkit-qt-1
 frameworks/ktexteditor: general/libgit2
 
 # KDE Workspaces
@@ -29,11 +29,12 @@ kde/applications/kate: general/libgit2
 kde/applications/rocs: general/grantlee
 kde/workspace/plasma-workspace: general/libdbusmenu-qt
 kde/workspace/kio-extras: general/libssh
-kde/workspace/kfilemetadata: general/poppler
+#kde/workspace/kfilemetadata: general/poppler
 
 # Extragear
 extragear/kdevelop/kdevplatform: general/grantlee
-extragear/multimedia/plasma-mediacenter: general/mockcpp
+#extragear/multimedia/plasma-mediacenter: general/mockcpp
+extragear/multimedia/plasma-mediacenter: -kde/workspace/baloo
 extragear/network/telepathy/*: general/telepathy-qt5
 
 # Playground/Network
@@ -41,5 +42,14 @@ playground/network/sflphone-kde[master]: -kde/kdelibs
 playground/network/sflphone-kde[master]: -kde/kdepimlibs
 playground/network/sflphone-kde[master]: kde/kdelibs[frameworks]
 
+# Extragear Office
+# Do not depend on kdepimlibs on OSX/CI for now because of akonadi
+extragear/office/kmymoney: -kde/kdepimlibs
+
+# KDE/Applications
+kde/applications/kde-baseapps: -kde/workspace/baloo
+kde/applications/kde-baseapps: -kde/kdelibs/baloo-widgets
+kde/applications/kde-baseapps: -general/poppler
+
 # Books
 books/kf5book: general/snippetextractor
diff --git a/config/base/stable-kf5-qt5 b/config/base/stable-kf5-qt5
index daf8160..dd17158 100644
--- a/config/base/stable-kf5-qt5
+++ b/config/base/stable-kf5-qt5
@@ -20,7 +20,7 @@ general/vc: -qt5
 general/shared-desktop-ontologies: -qt5
 
 # KDE Frameworks
-frameworks/kauth: kdesupport/polkit-qt-1
+#frameworks/kauth: kdesupport/polkit-qt-1
 frameworks/ktexteditor: general/libgit2
 
 # KDE Workspaces
@@ -39,3 +39,8 @@ extragear/network/telepathy/*: general/telepathy-qt5
 playground/network/sflphone-kde[master]: -kde/kdelibs
 playground/network/sflphone-kde[master]: -kde/kdepimlibs
 playground/network/sflphone-kde[master]: kde/kdelibs[frameworks]
+
+# KDE/Applications
+kde/applications/kde-baseapps: -kde/kdelibs/baloo
+kde/applications/kde-baseapps: -kde/kdelibs/baloo-widgets
+kde/applications/kde-baseapps: -general/poppler
diff --git a/config/build/00-verbose-make-template/darwin-mavericks.cfg b/config/build/00-verbose-make-template/darwin-mavericks.cfg
new file mode 100644
index 0000000..0b123b0
--- /dev/null
+++ b/config/build/00-verbose-make-template/darwin-mavericks.cfg
@@ -0,0 +1,2 @@
+[Build]
+#makeCommand=%(makeExecutable)s -l {loadLevel} -j {jobCount} VERBOSE=1
diff --git a/config/build/alkimia/darwin-mavericks.cfg b/config/build/alkimia/darwin-mavericks.cfg
new file mode 100644
index 0000000..05215cd
--- /dev/null
+++ b/config/build/alkimia/darwin-mavericks.cfg
@@ -0,0 +1,2 @@
+[DEFAULT]
+configureExtraArgs=-I/opt/local/include -L/opt/local/lib
diff --git a/config/build/ark/darwin-mavericks.cfg b/config/build/ark/darwin-mavericks.cfg
new file mode 100644
index 0000000..6f2b22b
--- /dev/null
+++ b/config/build/ark/darwin-mavericks.cfg
@@ -0,0 +1,2 @@
+[DEFAULT]
+configureExtraArgs=-DCMAKE_PREFIX_PATH=/opt/local
diff --git a/config/build/darwin-mavericks.cfg b/config/build/darwin-mavericks.cfg
index cb62c49..e3042b9 100644
--- a/config/build/darwin-mavericks.cfg
+++ b/config/build/darwin-mavericks.cfg
@@ -1,7 +1,12 @@
 [DEFAULT]
+scriptsLocation=/Users/marko/scripts
 opSys=darwin
 architecture=mavericks
 compiler=clang
+configurePlatformArgs=-DCMAKE_INSTALL_BUNDLEDIR="Applications/KF5" -DCMAKE_DISABLE_FIND_PACKAGE_X11=ON
 
 [General]
-installPrefix=/opt/kde/install/%(opSys)s/%(architecture)s/%(compiler)s/
\ No newline at end of file
+installPrefix=/opt/kde/install/%(opSys)s/%(architecture)s/%(compiler)s/
+
+[Test]
+testsEnabled=False
diff --git a/config/build/global.cfg b/config/build/global.cfg
index b69a7b8..b3066e3 100644
--- a/config/build/global.cfg
+++ b/config/build/global.cfg
@@ -89,4 +89,4 @@ extractionCommand=%(python3Executable)s %(scriptsLocation)s/kde-dev-scripts/cmak
 metadataFilename={project}-{branchGroup}.json
 localPrefix=/srv/jenkins/cmake-dependency-metadata/
 remotePrefix=/srv/jenkins/cmake-dependency-metadata/
-remoteHostPrefix=jenkins@build.kde.org:%(remotePrefix)s
\ No newline at end of file
+remoteHostPrefix=jenkins@build.kde.org:%(remotePrefix)s
diff --git a/config/build/kactivities/darwin-mavericks.cfg b/config/build/kactivities/darwin-mavericks.cfg
new file mode 100644
index 0000000..5512f48
--- /dev/null
+++ b/config/build/kactivities/darwin-mavericks.cfg
@@ -0,0 +1,2 @@
+[DEFAULT]
+configureExtraArgs=-DKACTIVITIES_ENABLE_EXCEPTIONS:BOOL=TRUE
diff --git a/config/build/kconfig/darwin-mavericks.cfg b/config/build/kconfig/darwin-mavericks.cfg
new file mode 100644
index 0000000..28e02d7
--- /dev/null
+++ b/config/build/kconfig/darwin-mavericks.cfg
@@ -0,0 +1,2 @@
+[DEFAULT]
+configureExtraArgs=-DCMAKE_INSTALL_BUNDLEDIR="lib/libexec/kf5"
diff --git a/config/build/kdecoration/kf5-qt5-darwin-mavericks.cfg b/config/build/kdecoration/kf5-qt5-darwin-mavericks.cfg
new file mode 100644
index 0000000..db0b774
--- /dev/null
+++ b/config/build/kdecoration/kf5-qt5-darwin-mavericks.cfg
@@ -0,0 +1,2 @@
+[DEFAULT]
+configureExtraArgs=-DBUILD_COVERAGE=OFF
diff --git a/config/build/kdevelop/kf5-qt5-darwin-mavericks.cfg b/config/build/kdevelop/kf5-qt5-darwin-mavericks.cfg
new file mode 100644
index 0000000..db0b774
--- /dev/null
+++ b/config/build/kdevelop/kf5-qt5-darwin-mavericks.cfg
@@ -0,0 +1,2 @@
+[DEFAULT]
+configureExtraArgs=-DBUILD_COVERAGE=OFF
diff --git a/config/build/kdevplatform/kf5-qt5-darwin-mavericks.cfg b/config/build/kdevplatform/kf5-qt5-darwin-mavericks.cfg
new file mode 100644
index 0000000..db0b774
--- /dev/null
+++ b/config/build/kdevplatform/kf5-qt5-darwin-mavericks.cfg
@@ -0,0 +1,2 @@
+[DEFAULT]
+configureExtraArgs=-DBUILD_COVERAGE=OFF
diff --git a/config/build/plasma-framework/darwin-mavericks.cfg b/config/build/plasma-framework/darwin-mavericks.cfg
new file mode 100644
index 0000000..db0b774
--- /dev/null
+++ b/config/build/plasma-framework/darwin-mavericks.cfg
@@ -0,0 +1,2 @@
+[DEFAULT]
+configureExtraArgs=-DBUILD_COVERAGE=OFF
diff --git a/config/build/plasma-mediacenter/kf5-qt5-darwin-mavericks.cfg b/config/build/plasma-mediacenter/kf5-qt5-darwin-mavericks.cfg
new file mode 100644
index 0000000..db0b774
--- /dev/null
+++ b/config/build/plasma-mediacenter/kf5-qt5-darwin-mavericks.cfg
@@ -0,0 +1,2 @@
+[DEFAULT]
+configureExtraArgs=-DBUILD_COVERAGE=OFF
diff --git a/config/build/qt5/darwin-mavericks.cfg b/config/build/qt5/darwin-mavericks.cfg
new file mode 100644
index 0000000..663ca0a
--- /dev/null
+++ b/config/build/qt5/darwin-mavericks.cfg
@@ -0,0 +1,2 @@
+[Build]
+configureCommand=%(configureExecutable)s -debug -separate-debug-info -system-zlib -system-libpng -system-libjpeg -system-sqlite -dbus-linked -plugin-sql-mysql -nomake examples -confirm-license -opensource -prefix {instPrefix} -no-framework -v -I/opt/local/include -L/opt/local/lib -no-glib -I/opt/local/lib/dbus-1.0/include -I/opt/local/include/dbus-1.0
diff --git a/config/build/qtcurve/kf5-qt5-darwin-mavericks.cfg b/config/build/qtcurve/kf5-qt5-darwin-mavericks.cfg
new file mode 100644
index 0000000..ab97507
--- /dev/null
+++ b/config/build/qtcurve/kf5-qt5-darwin-mavericks.cfg
@@ -0,0 +1,2 @@
+[DEFAULT]
+configureExtraArgs=-DQTC_ENABLE_X11=false -DENABLE_QT4:BOOL=OFF -DENABLE_QT5:BOOL=ON -DENABLE_GTK2:BOOL=OFF
diff --git a/config/build/trojita/kf5-qt5-darwin-mavericks.cfg b/config/build/trojita/kf5-qt5-darwin-mavericks.cfg
new file mode 100644
index 0000000..7671d5c
--- /dev/null
+++ b/config/build/trojita/kf5-qt5-darwin-mavericks.cfg
@@ -0,0 +1,5 @@
+[DEFAULT]
+configureExtraArgs=-DWITH_RAGEL=OFF -DWITH_ZLIB=ON -DWITH_QT5=1
+
+[Build]
+#deployInstallation=False
}}}