Re: Review Request 116653: Create ECMFindModuleHelpers module for common find-module code

2014-03-08 Thread Alex Merry

---
This is an automatically generated e-mail. To reply, visit:
https://git.reviewboard.kde.org/r/116653/
---

(Updated March 8, 2014, 4:13 p.m.)


Review request for Build System, Extra Cmake Modules and KDE Frameworks.


Changes
---

Split the component-handling macros into two logical parts, so that one can be 
used without the other.

Also properly namespaced variables, since these are macros rather than 
functions (for good reason).


Summary (updated)
-

Create ECMFindModuleHelpers module for common find-module code


Repository: extra-cmake-modules


Description (updated)
---

Create ECMFindModuleHelpers module for common find-module code

This currently mostly contains macros for handling components;
FindWayland and FindXCB are ported to use this module, which comes with
various improvements for them.


Diffs (updated)
-

  find-modules/FindWayland.cmake a121de9f8adda1e035b0f8e8401be26a45b61af4 
  find-modules/FindXCB.cmake eb3075885bc408fc4c213516a387dfcd0e75cb8b 
  modules/ECMFindModuleHelpers.cmake PRE-CREATION 

Diff: https://git.reviewboard.kde.org/r/116653/diff/


Testing
---

Tested various configurations with a test CMakeLists.txt file, including with 
various include files missing.

Configured and built kwindowsystem and kde-workspace.


Thanks,

Alex Merry

___
Kde-frameworks-devel mailing list
Kde-frameworks-devel@kde.org
https://mail.kde.org/mailman/listinfo/kde-frameworks-devel


Build failed in Jenkins: kio_master_qt5 #94

2014-03-08 Thread KDE CI System
See http://build.kde.org/job/kio_master_qt5/94/changes

Changes:

[adawit] Forward port:

--
[...truncated 610 lines...]
Scanning dependencies of target kurlrequestertest_gui_automoc
[ 21%] Automatic moc for target kurlrequestertest_gui
Generating moc_httpfilter.cpp
Generating moc_httpobjecttest.cpp
Generating moc_http.cpp
[ 21%] [ 21%] [ 21%] Built target kioslave-httpobjecttest_automoc
Built target ksycocaupdatetest_automoc
Built target kurlrequestertest_gui_automoc
Generating kdirmodeltest_gui.moc
[ 21%] Scanning dependencies of target listjobtest_automoc
Built target kdirmodeltest_gui_automoc
Scanning dependencies of target previewtest_automoc
Scanning dependencies of target listrecursivetest_automoc
[ 22%] [ 22%] Automatic moc for target listjobtest
[ 22%] Scanning dependencies of target udsentrybenchmark_automoc
Automatic moc for target listrecursivetest
Automatic moc for target previewtest
[ 23%] Automatic moc for target udsentrybenchmark
Generating moc_kioslavetest.cpp
[ 23%] Built target kioslavetest_automoc
Generating moc_kruntest.cpp
Scanning dependencies of target KF5KIONTLM
[ 23%] [ 23%] Building CXX object 
src/kntlm/CMakeFiles/KF5KIONTLM.dir/kntlm.cpp.o
Built target kruntest_automoc
[ 23%] Generating listjobtest.moc
Building CXX object src/kntlm/CMakeFiles/KF5KIONTLM.dir/des.cpp.o
[ 23%] Built target listjobtest_automoc
Generating listrecursivetest.moc
[ 23%] [ 23%] Built target listrecursivetest_automoc
Building CXX object src/kntlm/CMakeFiles/KF5KIONTLM.dir/KF5KIONTLM_automoc.cpp.o
Generating udsentrybenchmark.moc
Generating moc_previewtest.cpp
[ 23%] [ 23%] [ 24%] Built target previewtest_automoc
Generating org.kde.KCookieServer.xml
Built target udsentrybenchmark_automoc
[ 24%] [ 24%] Generating kcookieserverinterface.cpp, kcookieserverinterface.h
[ 24%] Scanning dependencies of target kmailservice5
Generating kcookieserverinterface.moc
[ 24%] Generating org.kde.KCookieServer.xml
[ 25%] Building CXX object 
src/ioslaves/mailto/CMakeFiles/kmailservice5.dir/kmailservice.cpp.o
Scanning dependencies of target ktelnetservice5
Generating kcookieserveradaptor.cpp, kcookieserveradaptor.h
[ 25%] Generating kcookieserveradaptor.moc
[ 25%] Scanning dependencies of target kcookiejar5
Building CXX object 
src/ioslaves/telnet/CMakeFiles/ktelnetservice5.dir/ktelnetservice.cpp.o
[ 25%] Generating kcookieserverinterface.cpp, kcookieserverinterface.h
[ 25%] Building CXX object 
src/ioslaves/http/kcookiejar/CMakeFiles/kcookiejar5.dir/kcookiejar5_automoc.cpp.o
Scanning dependencies of target kded_kcookiejar
[ 25%] Building CXX object 
src/ioslaves/http/kcookiejar/CMakeFiles/kded_kcookiejar.dir/kcookiejar.cpp.o
[ 25%] Building CXX object 
src/ioslaves/http/kcookiejar/CMakeFiles/kcookiejar5.dir/kcookieserverinterface.cpp.o
[ 25%] Building CXX object 
src/ioslaves/http/kcookiejar/CMakeFiles/kcookiejar5.dir/main.cpp.o
Linking CXX shared library libKF5KIONTLM.so
[ 25%] Building CXX object 
src/ioslaves/mailto/CMakeFiles/kmailservice5.dir/kmailservice5_automoc.cpp.o
[ 25%] Built target KF5KIONTLM
Scanning dependencies of target kpac_dhcp_helper
Linking CXX executable kmailservice5
[ 25%] Building C object 
src/kpac/CMakeFiles/kpac_dhcp_helper.dir/kpac_dhcp_helper.c.o
[ 25%] Generating moc_kdiroperator.cpp
Generating moc_kdirsortfilterproxymodel.cpp
Generating moc_kencodingfiledialog.cpp
Generating moc_kfilebookmarkhandler_p.cpp
Generating moc_kfilefiltercombo.cpp
Generating moc_kfileplacesitem_p.cpp
Generating moc_kfileplacesmodel.cpp
Generating moc_kfileplacessharedbookmarks_p.cpp
Generating moc_kfileplacesview.cpp
Generating moc_kfileplacesview_p.cpp
Generating moc_kfilepreviewgenerator.cpp
Generating moc_kfilewidget.cpp
Generating moc_kimagefilepreview.cpp
Generating moc_knameandurlinputdialog.cpp
Generating moc_knewfilemenu.cpp
Generating moc_kpreviewwidgetbase.cpp
Generating moc_kstatusbarofflineindicator.cpp
Generating moc_kurlnavigator.cpp
Generating moc_kurlnavigatorbutton_p.cpp
Generating moc_kurlnavigatorbuttonbase_p.cpp
Generating moc_kurlnavigatordropdownbutton_p.cpp
Generating moc_kurlnavigatormenu_p.cpp
Generating moc_kurlnavigatorplacesselector_p.cpp
Generating moc_kurlnavigatorprotocolcombo_p.cpp
Generating moc_kurlnavigatortogglebutton_p.cpp
Generating moc_kdiroperatordetailview_p.cpp
Generating moc_kfilemetapreview_p.cpp
Generating moc_kfileplaceeditdialog.cpp
Building CXX object 
src/kpac/CMakeFiles/kpac_dhcp_helper.dir/kpac_dhcp_helper_automoc.cpp.o
[ 25%] Built target KF5KIOFileWidgets_automoc
Linking CXX executable kpac_dhcp_helper
[ 25%] Scanning dependencies of target httpfiltertest
Built target kmailservice5
[ 26%] Building CXX object 
src/ioslaves/telnet/CMakeFiles/ktelnetservice5.dir/ktelnetservice5_automoc.cpp.o
[ 26%] [ 26%] Built target kpac_dhcp_helper
Building CXX object 
autotests/http/CMakeFiles/httpfiltertest.dir/httpfiltertest.cpp.o
[ 26%] Building CXX object 
src/ioslaves/http/kcookiejar/CMakeFiles/kded_kcookiejar.dir/kcookieserver.cpp.o

Re: Review Request 116604: Allow directories with . as output for meinproc

2014-03-08 Thread Luigi Toscano

---
This is an automatically generated e-mail. To reply, visit:
https://git.reviewboard.kde.org/r/116604/
---

(Updated March 8, 2014, 11:55 p.m.)


Status
--

This change has been marked as submitted.


Review request for Documentation, KDE Frameworks, kdelibs, and Aleix Pol 
Gonzalez.


Bugs: 246755
https://bugs.kde.org/show_bug.cgi?id=246755


Repository: kdoctools


Description
---

The outputFile parameter is not used by the stylesheets, so don't pass it. If a 
directory starts with ., it is interpreted in a wrong way by libxslt with an 
error like:
---
XPath error : Invalid expression
/home/kde-devel/.cache5/khelpcenter/help/__home__kde-
devel__kde__share__doc__HTML__en__kioslave__file__index.docbook
 ^
runtime error
Evaluating user parameter outputFile failed
---
This is an old issue, it was solved on windows by not compiling that code, 
but I suspect that the issue has been in UNIX systems too for a long time.

Another way to solve the bug is quoting the value of the parameter with '...', 
replacing:
params.append(qstrdup(parser.value(QStringLiteral(output)).toLocal8Bit().constData()));

with something like
QString quotedOutput = ' + parser.value(QStringLiteral(output)) + ';
params.append(qstrdup(quotedOutput.toLocal8Bit().constData()));

but anyway in this case the name of output file is not used, or I can't find 
any occurrence in the stylesheets. 
The stylesheet is applied and the name of the file is used only after to write 
the generated XML (see tranform() function).

A similar patch can be applied to kdelibs/kdoctools too (same codepath).


Diffs
-

  src/meinproc.cpp 95adcea 

Diff: https://git.reviewboard.kde.org/r/116604/diff/


Testing
---

Run meinproc5 (and 4) with -o /something/with/a/.dotdir/myfile.txt (the 
directory must exist), no error anymore and the file is generated.


Thanks,

Luigi Toscano

___
Kde-frameworks-devel mailing list
Kde-frameworks-devel@kde.org
https://mail.kde.org/mailman/listinfo/kde-frameworks-devel


Re: Review Request 116604: Allow directories with . as output for meinproc

2014-03-08 Thread Commit Hook

---
This is an automatically generated e-mail. To reply, visit:
https://git.reviewboard.kde.org/r/116604/#review52419
---


This review has been submitted with commit 
4406199290ab5192c178929fbc56a272e2fa8d7b by Luigi Toscano to branch master.

- Commit Hook


On March 5, 2014, 1:06 a.m., Luigi Toscano wrote:
 
 ---
 This is an automatically generated e-mail. To reply, visit:
 https://git.reviewboard.kde.org/r/116604/
 ---
 
 (Updated March 5, 2014, 1:06 a.m.)
 
 
 Review request for Documentation, KDE Frameworks, kdelibs, and Aleix Pol 
 Gonzalez.
 
 
 Bugs: 246755
 https://bugs.kde.org/show_bug.cgi?id=246755
 
 
 Repository: kdoctools
 
 
 Description
 ---
 
 The outputFile parameter is not used by the stylesheets, so don't pass it. If 
 a directory starts with ., it is interpreted in a wrong way by libxslt with 
 an error like:
 ---
 XPath error : Invalid expression
 /home/kde-devel/.cache5/khelpcenter/help/__home__kde-
 devel__kde__share__doc__HTML__en__kioslave__file__index.docbook
  ^
 runtime error
 Evaluating user parameter outputFile failed
 ---
 This is an old issue, it was solved on windows by not compiling that code, 
 but I suspect that the issue has been in UNIX systems too for a long time.
 
 Another way to solve the bug is quoting the value of the parameter with 
 '...', replacing:
 params.append(qstrdup(parser.value(QStringLiteral(output)).toLocal8Bit().constData()));
 
 with something like
 QString quotedOutput = ' + parser.value(QStringLiteral(output)) + ';
 params.append(qstrdup(quotedOutput.toLocal8Bit().constData()));
 
 but anyway in this case the name of output file is not used, or I can't find 
 any occurrence in the stylesheets. 
 The stylesheet is applied and the name of the file is used only after to 
 write the generated XML (see tranform() function).
 
 A similar patch can be applied to kdelibs/kdoctools too (same codepath).
 
 
 Diffs
 -
 
   src/meinproc.cpp 95adcea 
 
 Diff: https://git.reviewboard.kde.org/r/116604/diff/
 
 
 Testing
 ---
 
 Run meinproc5 (and 4) with -o /something/with/a/.dotdir/myfile.txt (the 
 directory must exist), no error anymore and the file is generated.
 
 
 Thanks,
 
 Luigi Toscano
 


___
Kde-frameworks-devel mailing list
Kde-frameworks-devel@kde.org
https://mail.kde.org/mailman/listinfo/kde-frameworks-devel


Re: Review Request 116650: Remove unused targets from KDocToolsMacros.cmake

2014-03-08 Thread Luigi Toscano

---
This is an automatically generated e-mail. To reply, visit:
https://git.reviewboard.kde.org/r/116650/#review52420
---


 I would have fixed that, but then I realised it was not running any command 
 and nothing depended on it. Am I missing something?

It is added to the all target; without this new target, docbooks (and 
manpages) are not generated at all. Could you please send me the log of the 
successfull compilation of kde-runtime?  

In fact, when I apply the patch to kdoctools I get:
[...]
[ 61%] Automoc for target meinproc5
[ 61%] Built target meinproc5_automoc
[100%] Built target meinproc5
Install the project...
-- Install configuration: debug
-- Installing: 
/opt/kf5/lib/x86_64-linux-gnu/cmake/KF5DocTools/KF5DocToolsTargets.cmake
-- Installing: 
/opt/kf5/lib/x86_64-linux-gnu/cmake/KF5DocTools/KF5DocToolsTargets-debug.cmake
-- Installing: 
/opt/kf5/lib/x86_64-linux-gnu/cmake/KF5DocTools/KF5DocToolsConfig.cmake
-- Installing: 
/opt/kf5/lib/x86_64-linux-gnu/cmake/KF5DocTools/KF5DocToolsConfigVersion.cmake
-- Installing: /opt/kf5/bin/checkXML5
-- Up-to-date: 
/opt/kf5/lib/x86_64-linux-gnu/cmake/KF5DocTools/KF5DocToolsMacros.cmake
CMake Error at docs/checkXML5/cmake_install.cmake:36 (FILE):
  file INSTALL cannot find
  /opt/build-kf5/frameworks/kdoctools/docs/checkXML5/checkXML5.1.
Call Stack (most recent call first):
  docs/cmake_install.cmake:37 (INCLUDE)
  cmake_install.cmake:71 (INCLUDE)


make: *** [install] Error 1

It seems that in the past multiple targets were allowed (thanks Pino for the 
hint). 
If this analysis is true, I guess ${_targ} should be fixed by adding the parent 
directory too.


KF5DocToolsMacros.cmake
https://git.reviewboard.kde.org/r/116650/#comment37094

It is needed indeed...


- Luigi Toscano


On March 7, 2014, 3:05 p.m., Aleix Pol Gonzalez wrote:
 
 ---
 This is an automatically generated e-mail. To reply, visit:
 https://git.reviewboard.kde.org/r/116650/
 ---
 
 (Updated March 7, 2014, 3:05 p.m.)
 
 
 Review request for Build System and KDE Frameworks.
 
 
 Repository: kdoctools
 
 
 Description
 ---
 
 While porting the documentation in kde-runtime I realized there was an error 
 because when running cmake it would try to create different targets and some 
 of them would have the same name (e.g. there is kcm/bookmarks and 
 kio/bookmarks, and it uses the directory name to figure out the filename).
 
 I would have fixed that, but then I realised it was not running any command 
 and nothing depended on it. Am I missing something?
 
 
 Diffs
 -
 
   KF5DocToolsMacros.cmake 6567b67 
 
 Diff: https://git.reviewboard.kde.org/r/116650/diff/
 
 
 Testing
 ---
 
 Now kde-runtime documentation builds.
 
 
 Thanks,
 
 Aleix Pol Gonzalez
 


___
Kde-frameworks-devel mailing list
Kde-frameworks-devel@kde.org
https://mail.kde.org/mailman/listinfo/kde-frameworks-devel


Jenkins build is back to normal : kio_master_qt5 #95

2014-03-08 Thread KDE CI System
See http://build.kde.org/job/kio_master_qt5/95/changes

___
Kde-frameworks-devel mailing list
Kde-frameworks-devel@kde.org
https://mail.kde.org/mailman/listinfo/kde-frameworks-devel