Changes between Version 1 and Version 2 of KDEProblems/KDEMacPortsCI/Status/Diff_mp-osx-ci

Timestamp:

Aug 24, 2014, 8:40:35 PM (10 years ago)

Author:

mkae (Marko Käning)

Comment:

update diff and add a timestamp

KDEProblems/KDEMacPortsCI/Status/Diff_mp-osx-ci

@@ -1 +1 @@
 = 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.
+
 {{{
-$ git diff production config
+$ date; git diff production config
+Sun Aug 24 22:39:07 CEST 2014
 diff --git a/config/base/kf5-qt5 b/config/base/kf5-qt5
 index 2260aa6..573bc24 100644
@@ -16 +19 @@
  kde/workspace/plasma-workspace: general/libdbusmenu-qt
  
+@@ -31,3 +31,7 @@ extragear/multimedia/plasma-mediacenter: general/mockcpp
+ 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
+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/darwin-mavericks.cfg b/config/build/darwin-mavericks.cfg
 index cb62c49..64f14f6 100644
@@ -22 +41 @@
 @@ -1,7 +1,9 @@
  [DEFAULT]
-+scriptsLocation=/Users/kdeci/scripts
++scriptsLocation=/Users/marko/scripts
  opSys=darwin
  architecture=mavericks
@@ -72 +91 @@
 +[QualityCheck]
 +runCppcheck=True
+diff --git a/config/build/plasma-framework/project.cfg b/config/build/plasma-framework/project.cfg
+index 036a862..b1551be 100644
+--- a/config/build/plasma-framework/project.cfg
++++ b/config/build/plasma-framework/project.cfg
+@@ -1,3 +1,6 @@
++[DEFAULT]
++configureExtraArgs=-DBUILD_COVERAGE=ON
++
+ [Build]
+ cmakeBuildType=Profile
+ 
+diff --git a/config/build/qt5/darwin-mavericks.cfg b/config/build/qt5/darwin-mavericks.cfg
+new file mode 100644
+index 0000000..31d3c16
+--- /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 -confi
 }}}