uonedb-qt team mailing list archive

[Christian Dywan <christian.dywan@xxxxxxxxxxxxx>]

Christian Dywan has proposed merging lp:~kalikiana/u1db-qt/docg into lp:u1db-qt.

Commit message:
Stricter approach to installing HTML docs

Requested reviews:
  U1DB Qt developers (uonedb-qt)

For more details, see:
https://code.launchpad.net/~kalikiana/u1db-qt/docg/+merge/160129

Stricter approach to installing HTML docs
-- 
https://code.launchpad.net/~kalikiana/u1db-qt/docg/+merge/160129
Your team U1DB Qt developers is requested to review the proposed merge of lp:~kalikiana/u1db-qt/docg into lp:u1db-qt.

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2013-04-22 09:27:48 +0000
+++ CMakeLists.txt	2013-04-22 14:38:58 +0000
@@ -100,16 +100,17 @@
     install(FILES "${U1DB_DOCS}/u1dbqt.qch"
         DESTINATION "${CMAKE_INSTALL_PREFIX}/share/qt5/phrasebooks/"
         )
-    file(GLOB ALL_HTML ${U1DB_DOCS}/*.html)
-    install(FILES ${ALL_HTML}
-        DESTINATION ${CMAKE_INSTALL_PREFIX}/share/u1db-qt/doc/html
-        )
-    install(DIRECTORY "${U1DB_DOCS}/style"
+    install(DIRECTORY "${U1DB_DOCS}/"
         DESTINATION "${CMAKE_INSTALL_PREFIX}/share/u1db-qt/doc/html"
-        )
-    file(GLOB ALL_EXAMPLES ${U1DB_DOCS}/*example-*.html)
-    install(FILES ${ALL_EXAMPLES}
+        FILES_MATCHING PATTERN "*.html"
+        )
+    install(DIRECTORY "${U1DB_DOCS}/style/"
+        DESTINATION "${CMAKE_INSTALL_PREFIX}/share/u1db-qt/doc/html/style"
+        FILES_MATCHING PATTERN "*.css"
+        )
+    install(DIRECTORY
         DESTINATION ${CMAKE_INSTALL_PREFIX}/share/u1db-qt/examples
+        FILES_MATCHING PATTERN "*example-*.html"
         )
 endif ()
 

=== modified file 'debian/libu1db-qt5-doc.install'
--- debian/libu1db-qt5-doc.install	2013-04-22 09:27:48 +0000
+++ debian/libu1db-qt5-doc.install	2013-04-22 14:38:58 +0000
@@ -1,2 +1,3 @@
 usr/share/qt5/phrasebooks/*
-usr/share/u1db-qt/doc/html/*
+usr/share/u1db-qt/doc/html/*.html
+usr/share/u1db-qt/doc/html/style/*.css