Changes between Version 195 and Version 196 of KDEProblems/KDEMacPortsCI/Status

Timestamp:

Aug 24, 2014, 8:36:51 PM (10 years ago)

Author:

mkae (Marko Käning)

Comment:

move "mp-osx-ci" repo's diff between branches 'mp-osx-ci' and 'production' to separate page

KDEProblems/KDEMacPortsCI/Status

@@ -200 +200 @@
 == Setting up the build environment ==
 
-The branch 'mp-osx-ci' contains all required configuration settings for OSX. The most important shall be pointed out here:
+The branch 'mp-osx-ci' contains all required configuration settings for OSX. The most important shall be pointed out [wiki:/KDEProblems/KDEMacPortsCI/Status/Diff_mp-osx-ci here]:
 
  - For KF5 on OSX one has to modify the configuration settings by commenting out the kauth dependency on polkit-qt-1, since that dependency is only needed on Linux.
@@ -216 +216 @@
  - Disable coverage for plasma-framework for now until a coverage tool for clang is integrated.
 
-{{{
-$ git diff production config
-diff --git a/config/base/kf5-qt5 b/config/base/kf5-qt5
-index 2260aa6..573bc24 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
- kde/*: general/kdesupport-svn
- kde/workspace/plasma-workspace: general/libdbusmenu-qt
- 
-diff --git a/config/build/darwin-mavericks.cfg b/config/build/darwin-mavericks.cfg
-index cb62c49..64f14f6 100644
---- a/config/build/darwin-mavericks.cfg
-+++ b/config/build/darwin-mavericks.cfg
-@@ -1,7 +1,9 @@
- [DEFAULT]
-+scriptsLocation=/Users/kdeci/scripts
- opSys=darwin
- architecture=mavericks
- compiler=clang
-+configurePlatformArgs=-DCMAKE_INSTALL_BUNDLEDIR="Applications/KF5" -DDATA_INSTALL_DIR="Library/Application Support" -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/
-diff --git a/config/build/global.cfg b/config/build/global.cfg
-index 4052215..9dbe1e1 100644
---- a/config/build/global.cfg
-+++ b/config/build/global.cfg
-@@ -55,7 +55,7 @@ updateMimeDatabaseCommand=%(updateMimeDatabaseExecutable)s share/mime
- deployInstallation=True
- 
- [Test]
--testsEnabled=True
-+testsEnabled=False
- ctestCountTestsCommand=%(ctestExecutable)s -N
- xvfbDisplayName=:99
- xvfbCommand=%(xvfbExecutable)s %(xvfbDisplayName)s -ac -screen 0 1600x1200x24+32
-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/kconfigwidgets/darwin-mavericks.cfg b/config/build/kconfigwidgets/darwin-mavericks.cfg
-new file mode 100644
-index 0000000..e44ae1c
---- /dev/null
-+++ b/config/build/kconfigwidgets/darwin-mavericks.cfg
-@@ -0,0 +1,2 @@
-+[DEFAULT]
-+configureExtraArgs=-DDATA_INSTALL_DIR="{instPrefix}/Library/Application Support"
-diff --git a/config/build/plasma-framework/darwin-mavericks.cfg b/config/build/plasma-framework/darwin-mavericks.cfg
-new file mode 100644
-index 0000000..3d76592
---- /dev/null
-+++ b/config/build/plasma-framework/darwin-mavericks.cfg
-@@ -0,0 +1,5 @@
-+[DEFAULT]
-+configureExtraArgs=
-+
-+[QualityCheck]
-+runCppcheck=True
-}}}