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


Ignore:
Timestamp:
Feb 14, 2015, 12:50:29 PM (9 years ago)
Author:
mkae (Marko Käning)
Comment:

Update

Legend:

Unmodified
Added
Removed
Modified

  • KDEProblems/KDEMacPortsCI/Status/Diff_mp-osx-ci

    v2 v3  
    55{{{
    66$ date; git diff production config
    7 Sun Aug 24 22:39:07 CEST 2014
     7Sat Feb 14 13:49:27 CET 2015
    88diff --git a/config/base/kf5-qt5 b/config/base/kf5-qt5
    9 index 2260aa6..573bc24 100644
     9index 1f7cd4f..20c03f3 100644
    1010--- a/config/base/kf5-qt5
    1111+++ b/config/base/kf5-qt5
    … …  
    1616-frameworks/kauth: kdesupport/polkit-qt-1
    1717+#frameworks/kauth: kdesupport/polkit-qt-1
    18  kde/*: general/kdesupport-svn
     18 frameworks/ktexteditor: general/libgit2
     19 
     20 # KDE Workspaces
     21@@ -29,6 +29,7 @@ kde/applications/kate: general/libgit2
     22 kde/applications/rocs: general/grantlee
    1923 kde/workspace/plasma-workspace: general/libdbusmenu-qt
    20  
    21 @@ -31,3 +31,7 @@ extragear/multimedia/plasma-mediacenter: general/mockcpp
     24 kde/workspace/kio-extras: general/libssh
     25+#kde/workspace/kfilemetadata: general/poppler
     26 
     27 # Extragear
     28 extragear/kdevelop/kdevplatform: general/grantlee
     29@@ -40,5 +41,14 @@ playground/network/sflphone-kde[master]: -kde/kdelibs
     30 playground/network/sflphone-kde[master]: -kde/kdepimlibs
     31 playground/network/sflphone-kde[master]: kde/kdelibs[frameworks]
     32 
     33+# Extragear Office
     34+# Do not depend on kdepimlibs on OSX/CI for now because of akonadi
     35+extragear/office/kmymoney: -kde/kdepimlibs
     36+
     37+# KDE/Applications
     38+kde/applications/kde-baseapps: -kde/kdelibs/baloo
     39+kde/applications/kde-baseapps: -kde/kdelibs/baloo-widgets
     40+kde/applications/kde-baseapps: -general/poppler
     41+
     42 # Books
     43 books/kf5book: general/snippetextractor
     44diff --git a/config/base/latest-qt4 b/config/base/latest-qt4
     45index 5712107..674835e 100644
     46--- a/config/base/latest-qt4
     47+++ b/config/base/latest-qt4
     48@@ -33,7 +33,6 @@ kde/*: general/kdesupport-svn
     49 kde/kdelibs: general/shared-desktop-ontologies
     50 kde/kdelibs: general/grantlee
     51 kde/kdelibs: general/libdbusmenu-qt
     52-kde/kdelibs/kfilemetadata: general/poppler
     53 kde/kdelibs/nepomuk-core: general/poppler
     54 kde/kdepimlibs: general/qjson
     55 kde/kde-runtime: general/libssh
     56@@ -44,6 +43,8 @@ kde/kdegraphics/okular: general/poppler
     57 kde/kdebindings/pykde4: general/pyqt4
     58 kde/applications/kate: general/qjson
     59 kde/kdeedu/kstars: general/qjson
     60+kde/workspace/baloo: general/qjson
     61+kde/workspace/kfilemetadata: general/poppler
     62 
     63 # Calligra
     64 calligra: general/vc
     65diff --git a/config/base/oldstable-qt4 b/config/base/oldstable-qt4
     66index 19ae46d..b1c9577 100644
     67--- a/config/base/oldstable-qt4
     68+++ b/config/base/oldstable-qt4
     69@@ -30,7 +30,6 @@ kde/*: general/kdesupport-svn
     70 kde/kdelibs: general/shared-desktop-ontologies
     71 kde/kdelibs: general/grantlee
     72 kde/kdelibs: general/libdbusmenu-qt
     73-kde/kdelibs/kfilemetadata: general/poppler
     74 kde/kdelibs/nepomuk-core: general/poppler
     75 kde/kdepimlibs: general/qjson
     76 kde/kde-runtime: general/libssh
     77@@ -40,6 +39,7 @@ kde/kdepim-runtime: general/libkolab
     78 kde/kdegraphics/okular: general/poppler
     79 kde/kdebindings/pykde4: general/pyqt4
     80 kde/applications/kate: general/qjson
     81+kde/workspace/kfilemetadata: general/poppler
     82 
     83 # Calligra
     84 calligra: general/vc
     85diff --git a/config/base/stable-kf5-qt5 b/config/base/stable-kf5-qt5
     86index daf8160..dd17158 100644
     87--- a/config/base/stable-kf5-qt5
     88+++ b/config/base/stable-kf5-qt5
     89@@ -20,7 +20,7 @@ general/vc: -qt5
     90 general/shared-desktop-ontologies: -qt5
     91 
     92 # KDE Frameworks
     93-frameworks/kauth: kdesupport/polkit-qt-1
     94+#frameworks/kauth: kdesupport/polkit-qt-1
     95 frameworks/ktexteditor: general/libgit2
     96 
     97 # KDE Workspaces
     98@@ -39,3 +39,8 @@ extragear/network/telepathy/*: general/telepathy-qt5
    2299 playground/network/sflphone-kde[master]: -kde/kdelibs
    23100 playground/network/sflphone-kde[master]: -kde/kdepimlibs
    24101 playground/network/sflphone-kde[master]: kde/kdelibs[frameworks]
    25102+
    26 +# Extragear Office
    27 +# Do not depend on kdepimlibs on OSX/CI for now because of akonadi
    28 +extragear/office/kmymoney: -kde/kdepimlibs
     103+# KDE/Applications
     104+kde/applications/kde-baseapps: -kde/kdelibs/baloo
     105+kde/applications/kde-baseapps: -kde/kdelibs/baloo-widgets
     106+kde/applications/kde-baseapps: -general/poppler
     107diff --git a/config/base/stable-qt4 b/config/base/stable-qt4
     108index c2a094a..96ded65 100644
     109--- a/config/base/stable-qt4
     110+++ b/config/base/stable-qt4
     111@@ -31,7 +31,6 @@ kde/*: general/kdesupport-svn
     112 kde/kdelibs: general/shared-desktop-ontologies
     113 kde/kdelibs: general/grantlee
     114 kde/kdelibs: general/libdbusmenu-qt
     115-kde/kdelibs/kfilemetadata: general/poppler
     116 kde/kdelibs/nepomuk-core: general/poppler
     117 kde/kdepimlibs: general/qjson
     118 kde/kde-runtime: general/libssh
     119@@ -42,6 +41,8 @@ kde/kdegraphics/okular: general/poppler
     120 kde/kdebindings/pykde4: general/pyqt4
     121 kde/applications/kate: general/qjson
     122 kde/kdeedu/kstars: general/qjson
     123+kde/workspace/baloo: general/qjson
     124+kde/workspace/kfilemetadata: general/poppler
     125 
     126 # Calligra
     127 calligra: general/vc
     128diff --git a/config/build/00-verbose-make-template/darwin-mavericks.cfg b/config/build/00-verbose-make-template/darwin-mavericks.cfg
     129new file mode 100644
     130index 0000000..0b123b0
     131--- /dev/null
     132+++ b/config/build/00-verbose-make-template/darwin-mavericks.cfg
     133@@ -0,0 +1,2 @@
     134+[Build]
     135+#makeCommand=%(makeExecutable)s -l {loadLevel} -j {jobCount} VERBOSE=1
    29136diff --git a/config/build/alkimia/darwin-mavericks.cfg b/config/build/alkimia/darwin-mavericks.cfg
    30137new file mode 100644
    … …  
    35142+[DEFAULT]
    36143+configureExtraArgs=-I/opt/local/include -L/opt/local/lib
     144diff --git a/config/build/ark/darwin-mavericks.cfg b/config/build/ark/darwin-mavericks.cfg
     145new file mode 100644
     146index 0000000..6f2b22b
     147--- /dev/null
     148+++ b/config/build/ark/darwin-mavericks.cfg
     149@@ -0,0 +1,2 @@
     150+[DEFAULT]
     151+configureExtraArgs=-DCMAKE_PREFIX_PATH=/opt/local
     152diff --git a/config/build/bovo/darwin-mavericks.cfg b/config/build/bovo/darwin-mavericks.cfg
     153new file mode 100644
     154index 0000000..15ad40f
     155--- /dev/null
     156+++ b/config/build/bovo/darwin-mavericks.cfg
     157@@ -0,0 +1,2 @@
     158+[DEFAULT]
     159+configurePlatformArgs=-DCMAKE_INSTALL_BUNDLEDIR="Applications/KF5"
    37160diff --git a/config/build/darwin-mavericks.cfg b/config/build/darwin-mavericks.cfg
    38 index cb62c49..64f14f6 100644
     161index cb62c49..e3042b9 100644
    39162--- a/config/build/darwin-mavericks.cfg
    40163+++ b/config/build/darwin-mavericks.cfg
    41 @@ -1,7 +1,9 @@
     164@@ -1,7 +1,12 @@
    42165 [DEFAULT]
    43166+scriptsLocation=/Users/marko/scripts
    … …  
    45168 architecture=mavericks
    46169 compiler=clang
    47 +configurePlatformArgs=-DCMAKE_INSTALL_BUNDLEDIR="Applications/KF5" -DDATA_INSTALL_DIR="Library/Application Support" -DCMAKE_DISABLE_FIND_PACKAGE_X11=ON
     170+configurePlatformArgs=-DCMAKE_INSTALL_BUNDLEDIR="Applications/KF5" -DCMAKE_DISABLE_FIND_PACKAGE_X11=ON
    48171 
    49172 [General]
    … …  
    51174\ No newline at end of file
    52175+installPrefix=/opt/kde/install/%(opSys)s/%(architecture)s/%(compiler)s/
     176+
     177+[Test]
     178+testsEnabled=False
    53179diff --git a/config/build/global.cfg b/config/build/global.cfg
    54 index 4052215..9dbe1e1 100644
     180index b69a7b8..b3066e3 100644
    55181--- a/config/build/global.cfg
    56182+++ b/config/build/global.cfg
    57 @@ -55,7 +55,7 @@ updateMimeDatabaseCommand=%(updateMimeDatabaseExecutable)s share/mime
    58  deployInstallation=True
    59  
    60  [Test]
    61 -testsEnabled=True
    62 +testsEnabled=False
    63  ctestCountTestsCommand=%(ctestExecutable)s -N
    64  xvfbDisplayName=:99
    65  xvfbCommand=%(xvfbExecutable)s %(xvfbDisplayName)s -ac -screen 0 1600x1200x24+32
     183@@ -89,4 +89,4 @@ extractionCommand=%(python3Executable)s %(scriptsLocation)s/kde-dev-scripts/cmak
     184 metadataFilename={project}-{branchGroup}.json
     185 localPrefix=/srv/jenkins/cmake-dependency-metadata/
     186 remotePrefix=/srv/jenkins/cmake-dependency-metadata/
     187-remoteHostPrefix=jenkins@build.kde.org:%(remotePrefix)s
     188\ No newline at end of file
     189+remoteHostPrefix=jenkins@build.kde.org:%(remotePrefix)s
     190diff --git a/config/build/kactivities/darwin-mavericks.cfg b/config/build/kactivities/darwin-mavericks.cfg
     191new file mode 100644
     192index 0000000..5512f48
     193--- /dev/null
     194+++ b/config/build/kactivities/darwin-mavericks.cfg
     195@@ -0,0 +1,2 @@
     196+[DEFAULT]
     197+configureExtraArgs=-DKACTIVITIES_ENABLE_EXCEPTIONS:BOOL=TRUE
    66198diff --git a/config/build/kconfig/darwin-mavericks.cfg b/config/build/kconfig/darwin-mavericks.cfg
    67199new file mode 100644
    … …  
    72204+[DEFAULT]
    73205+configureExtraArgs=-DCMAKE_INSTALL_BUNDLEDIR="lib/libexec/kf5"
    74 diff --git a/config/build/kconfigwidgets/darwin-mavericks.cfg b/config/build/kconfigwidgets/darwin-mavericks.cfg
    75 new file mode 100644
    76 index 0000000..e44ae1c
    77 --- /dev/null
    78 +++ b/config/build/kconfigwidgets/darwin-mavericks.cfg
    79 @@ -0,0 +1,2 @@
    80 +[DEFAULT]
    81 +configureExtraArgs=-DDATA_INSTALL_DIR="{instPrefix}/Library/Application Support"
    82 diff --git a/config/build/plasma-framework/darwin-mavericks.cfg b/config/build/plasma-framework/darwin-mavericks.cfg
    83 new file mode 100644
    84 index 0000000..3d76592
    85 --- /dev/null
    86 +++ b/config/build/plasma-framework/darwin-mavericks.cfg
    87 @@ -0,0 +1,5 @@
     206diff --git a/config/build/kdecoration/kf5-qt5-darwin-mavericks.cfg b/config/build/kdecoration/kf5-qt5-darwin-mavericks.cfg
     207new file mode 100644
     208index 0000000..11ad154
     209--- /dev/null
     210+++ b/config/build/kdecoration/kf5-qt5-darwin-mavericks.cfg
     211@@ -0,0 +1,2 @@
    88212+[DEFAULT]
    89213+configureExtraArgs=
     214diff --git a/config/build/kdevelop/kf5-qt5-darwin-mavericks.cfg b/config/build/kdevelop/kf5-qt5-darwin-mavericks.cfg
     215new file mode 100644
     216index 0000000..11ad154
     217--- /dev/null
     218+++ b/config/build/kdevelop/kf5-qt5-darwin-mavericks.cfg
     219@@ -0,0 +1,2 @@
     220+[DEFAULT]
     221+configureExtraArgs=
     222diff --git a/config/build/kdevplatform/kf5-qt5-darwin-mavericks.cfg b/config/build/kdevplatform/kf5-qt5-darwin-mavericks.cfg
     223new file mode 100644
     224index 0000000..db0b774
     225--- /dev/null
     226+++ b/config/build/kdevplatform/kf5-qt5-darwin-mavericks.cfg
     227@@ -0,0 +1,2 @@
     228+[DEFAULT]
     229+configureExtraArgs=-DBUILD_COVERAGE=OFF
     230diff --git a/config/build/kdiagram/project.cfg b/config/build/kdiagram/project.cfg
     231new file mode 100644
     232index 0000000..07f7749
     233--- /dev/null
     234+++ b/config/build/kdiagram/project.cfg
     235@@ -0,0 +1,2 @@
     236+[Test]
     237+testTimePermitted=600
     238diff --git a/config/build/konsole/kf5-qt5.cfg b/config/build/konsole/kf5-qt5.cfg
     239index 82e7cb3..ae0d211 100644
     240--- a/config/build/konsole/kf5-qt5.cfg
     241+++ b/config/build/konsole/kf5-qt5.cfg
     242@@ -1,2 +1,5 @@
     243 [DEFAULT]
     244 configureExtraArgs=-DKONSOLE_BUILD_FONTEMBEDDER=TRUE
    90245+
    91246+[QualityCheck]
    92247+runCppcheck=True
    93 diff --git a/config/build/plasma-framework/project.cfg b/config/build/plasma-framework/project.cfg
    94 index 036a862..b1551be 100644
    95 --- a/config/build/plasma-framework/project.cfg
    96 +++ b/config/build/plasma-framework/project.cfg
    97 @@ -1,3 +1,6 @@
    98 +[DEFAULT]
    99 +configureExtraArgs=-DBUILD_COVERAGE=ON
    100 +
    101  [Build]
    102  cmakeBuildType=Profile
    103  
     248diff --git a/config/build/plasma-framework/darwin-mavericks.cfg b/config/build/plasma-framework/darwin-mavericks.cfg
     249new file mode 100644
     250index 0000000..11ad154
     251--- /dev/null
     252+++ b/config/build/plasma-framework/darwin-mavericks.cfg
     253@@ -0,0 +1,2 @@
     254+[DEFAULT]
     255+configureExtraArgs=
    104256diff --git a/config/build/qt5/darwin-mavericks.cfg b/config/build/qt5/darwin-mavericks.cfg
    105257new file mode 100644
    106 index 0000000..31d3c16
     258index 0000000..663ca0a
    107259--- /dev/null
    108260+++ b/config/build/qt5/darwin-mavericks.cfg
    109261@@ -0,0 +1,2 @@
    110262+[Build]
    111 +configureCommand=%(configureExecutable)s -debug -separate-debug-info -system-zlib -system-libpng -system-libjpeg -system-sqlite -dbus-linked -plugin-sql-mysql -nomake examples -confi
     263+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
     264diff --git a/config/build/qtcurve/kf5-qt5-darwin-mavericks.cfg b/config/build/qtcurve/kf5-qt5-darwin-mavericks.cfg
     265new file mode 100644
     266index 0000000..ab97507
     267--- /dev/null
     268+++ b/config/build/qtcurve/kf5-qt5-darwin-mavericks.cfg
     269@@ -0,0 +1,2 @@
     270+[DEFAULT]
     271+configureExtraArgs=-DQTC_ENABLE_X11=false -DENABLE_QT4:BOOL=OFF -DENABLE_QT5:BOOL=ON -DENABLE_GTK2:BOOL=OFF
     272diff --git a/config/build/trojita/kf5-qt5-darwin-mavericks.cfg b/config/build/trojita/kf5-qt5-darwin-mavericks.cfg
     273new file mode 100644
     274index 0000000..7671d5c
     275--- /dev/null
     276+++ b/config/build/trojita/kf5-qt5-darwin-mavericks.cfg
     277@@ -0,0 +1,5 @@
     278+[DEFAULT]
     279+configureExtraArgs=-DWITH_RAGEL=OFF -DWITH_ZLIB=ON -DWITH_QT5=1
     280+
     281+[Build]
     282+#deployInstallation=False
    112283}}}