install .destkop files for relevant applications

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>

diff --git a/mkspecs/mkspecs.cmake b/mkspecs/mkspecs.cmake
index f7cae4e..fe733d6 100644 (file)
--- a/mkspecs/mkspecs.cmake
+++ b/mkspecs/mkspecs.cmake
@@ -99,6 +99,8 @@ set(LDCONF_INSTALL_DIR "etc/ld.so.conf.d")
 set(PROFILE_INSTALL_DIR "etc/profile.d")
 set(MAN_INSTALL_DIR "share/man")
 set(CMAKE_INSTALL_DIR "cmake")
+set(APPLICATIONS_INSTALL_DIR "share/applications")
+set(PIXMAPS_INSTALL_DIR "share/pixmaps")
 
 if(NOT KATIE_KEY)
     set(KATIE_KEY "${KATIE_ARCHITECTURE} ${KATIE_PLATFORM} ${KATIE_COMPILER} full-config")

diff --git a/package/archlinux/PKGBUILD b/package/archlinux/PKGBUILD
index 68abd16..be6639f 100644 (file)
--- a/package/archlinux/PKGBUILD
+++ b/package/archlinux/PKGBUILD
@@ -36,6 +36,10 @@ prepare() {
         >> katie/mkspecs/linux/vendor.cmake
     echo 'set(CMAKE_INSTALL_DIR /usr/share/cmake)' \
         >> katie/mkspecs/linux/vendor.cmake
+    echo 'set(APPLICATIONS_INSTALL_DIR /usr/share/applications)' \
+        >> katie/mkspecs/linux/vendor.cmake
+    echo 'set(PIXMAPS_INSTALL_DIR /usr/share/pixmaps)' \
+        >> katie/mkspecs/linux/vendor.cmake
 }
 
 build() {
@@ -53,34 +57,4 @@ package() {
 
     install -vDm644 ../katie/LGPL_EXCEPTION.txt \
         "${pkgdir}/usr/share/licenses/katie-git/LGPL_EXCEPTION.txt"
-
-    # register applications
-    install -v -Dm644 ../katie/src/tools/designer/images/designer.png \
-        "${pkgdir}/usr/share/pixmaps/designer-katie.png"
-    install -v -Dm644 ../katie/src/tools/qdbusviewer/images/qdbusviewer.png \
-        "${pkgdir}/usr/share/pixmaps/qdbusviewer-katie.png"
-    mkdir -p "${pkgdir}/usr/share/applications"
-    cat > "${pkgdir}/usr/share/applications/designer-katie.desktop" << EOF
-[Desktop Entry]
-Name=Katie Designer
-Comment=Design GUIs for Katie applications
-Exec=designer-katie
-Icon=designer-katie.png
-MimeType=application/x-designer;
-Terminal=false
-Encoding=UTF-8
-Type=Application
-Categories=Qt;Development;
-EOF
-    cat > "${pkgdir}/usr/share/applications/qdbusviewer-katie.desktop" << EOF
-[Desktop Entry]
-Name=Katie D-Bus Viewer
-Comment=Debug D-Bus applications
-Exec=qdbusviewer-katie
-Icon=qdbusviewer-katie.png
-Terminal=false
-Encoding=UTF-8
-Type=Application
-Categories=Qt;Development;Debugger;
-EOF
 }

diff --git a/package/debian/rules b/package/debian/rules
index 3a178ba..414d040 100755 (executable)
--- a/package/debian/rules
+++ b/package/debian/rules
@@ -10,6 +10,10 @@ override_dh_auto_configure:
                >> mkspecs/linux/vendor.cmake
        echo 'set(CMAKE_INSTALL_DIR /usr/share/cmake)' \
                        >> mkspecs/linux/vendor.cmake
+       echo 'set(APPLICATIONS_INSTALL_DIR /usr/share/applications)' \
+               >> mkspecs/linux/vendor.cmake
+       echo 'set(PIXMAPS_INSTALL_DIR /usr/share/pixmaps)' \
+               >> mkspecs/linux/vendor.cmake
 
        echo "set(QT_LIBRARIES_PATH /usr/lib/${DEB_TARGET_MULTIARCH}/katie)" \
                >> mkspecs/linux/vendor.cmake

diff --git a/package/entropy/katie/SRCBUILD b/package/entropy/katie/SRCBUILD
index 2eb8d59..4913efd 100644 (file)
--- a/package/entropy/katie/SRCBUILD
+++ b/package/entropy/katie/SRCBUILD
@@ -17,6 +17,10 @@ src_prepare() {
         >> katie.git/mkspecs/linux/vendor.cmake
     echo 'set(CMAKE_INSTALL_DIR /usr/share/cmake)' \
         >> katie.git/mkspecs/linux/vendor.cmake
+    echo 'set(APPLICATIONS_INSTALL_DIR /usr/share/applications)' \
+        >> katie.git/mkspecs/linux/vendor.cmake
+    echo 'set(PIXMAPS_INSTALL_DIR /usr/share/pixmaps)' \
+        >> katie.git/mkspecs/linux/vendor.cmake
 }
 
 src_compile() {
@@ -40,39 +44,9 @@ src_install() {
 
     # create convenience symlinks
     install -vdm755 "$INSTALL_DIR/usr/bin"
-    for file in "$INSTALL_DIR/usr/lib/katie/bin/"*;do
-        # ln -sfv ../lib/katie/bin/$(basename "$file") "$INSTALL_DIR/usr/bin/$(basename $file)"
-        ln -sfv ../lib/katie/bin/$(basename "$file") "$INSTALL_DIR/usr/bin/$(basename $file)-katie"
+    for b in "$INSTALL_DIR/usr/lib/katie/bin/"*;do
+        # ln -sfv ../lib/katie/bin/$(basename "$b") "$INSTALL_DIR/usr/bin/$(basename $b)"
+        ln -sfv ../lib/katie/bin/$(basename "$b") "$INSTALL_DIR/usr/bin/$(basename $b)-katie"
     done
-
-    # register Designer as application
-    install -vDm644 ../katie.git/src/tools/designer/images/designer.png \
-        "$INSTALL_DIR/usr/share/pixmaps/designer-katie.png"
-    install -vDm644 ../katie.git/src/tools/qdbusviewer/images/qdbusviewer.png \
-        "$INSTALL_DIR/usr/share/pixmaps/qdbusviewer-katie.png"
-    mkdir -p "$INSTALL_DIR/usr/share/applications"
-    cat > "$INSTALL_DIR/usr/share/applications/designer-katie.desktop" << EOF
-[Desktop Entry]
-Name=Katie Designer
-Comment=Design GUIs for Katie applications
-Exec=designer-katie
-Icon=designer-katie.png
-MimeType=application/x-designer;
-Terminal=false
-Encoding=UTF-8
-Type=Application
-Categories=Qt;Development;
-EOF
-    cat > "$INSTALL_DIR/usr/share/applications/qdbusviewer-katie.desktop" << EOF
-[Desktop Entry]
-Name=Katie D-Bus Viewer
-Comment=Debug D-Bus applications
-Exec=qdbusviewer-katie
-Icon=qdbusviewer-katie.png
-Terminal=false
-Encoding=UTF-8
-Type=Application
-Categories=Qt;Development;Debugger;
-EOF
 }
 

diff --git a/src/tools/designer/CMakeLists.txt b/src/tools/designer/CMakeLists.txt
index 3818390..b5146e6 100644 (file)
--- a/src/tools/designer/CMakeLists.txt
+++ b/src/tools/designer/CMakeLists.txt
@@ -102,3 +102,21 @@ install(
     RUNTIME DESTINATION ${QT_BINARIES_PATH_INST}
     COMPONENT Devel
 )
+
+if(NOT KATIE_PLATFORM MATCHES "(win32|wince|mac)")
+    configure_file(
+        ${CMAKE_CURRENT_SOURCE_DIR}/designer.desktop.cmake
+        ${CMAKE_CURRENT_BINARY_DIR}/designer.desktop
+        @ONLY
+    )
+    install(
+        PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/designer.desktop
+        DESTINATION ${APPLICATIONS_INSTALL_DIR}
+        COMPONENT Devel
+    )
+    install(
+        FILES ${CMAKE_CURRENT_SOURCE_DIR}/images/designer.png
+        DESTINATION ${PIXMAPS_INSTALL_DIR}
+        COMPONENT Devel
+    )
+endif()

diff --git a/src/tools/designer/designer.desktop.cmake b/src/tools/designer/designer.desktop.cmake
new file mode 100644 (file)
index 0000000..3da3973
--- /dev/null
+++ b/src/tools/designer/designer.desktop.cmake
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Name=Katie Designer
+Comment=Design GUIs for Katie applications
+Exec=@QT_BINARIES_PATH_INST@/designer
+Icon=@PIXMAPS_INSTALL_DIR@/designer.png
+MimeType=application/x-designer;
+Terminal=false
+Encoding=UTF-8
+Type=Application
+Categories=Qt;Development; 

diff --git a/src/tools/qdbusviewer/CMakeLists.txt b/src/tools/qdbusviewer/CMakeLists.txt
index 8943141..e56e242 100644 (file)
--- a/src/tools/qdbusviewer/CMakeLists.txt
+++ b/src/tools/qdbusviewer/CMakeLists.txt
@@ -46,3 +46,21 @@ install(
     RUNTIME DESTINATION ${QT_BINARIES_PATH_INST}
     COMPONENT Devel
 )
+
+if(NOT KATIE_PLATFORM MATCHES "(win32|wince|mac)")
+    configure_file(
+        ${CMAKE_CURRENT_SOURCE_DIR}/qdbusviewer.desktop.cmake
+        ${CMAKE_CURRENT_BINARY_DIR}/qdbusviewer.desktop
+        @ONLY
+    )
+    install(
+        PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/qdbusviewer.desktop
+        DESTINATION ${APPLICATIONS_INSTALL_DIR}
+        COMPONENT Devel
+    )
+    install(
+        FILES ${CMAKE_CURRENT_SOURCE_DIR}/images/qdbusviewer.png
+        DESTINATION ${PIXMAPS_INSTALL_DIR}
+        COMPONENT Devel
+    )
+endif()

diff --git a/src/tools/qdbusviewer/images/qdbusviewer-128.png b/src/tools/qdbusviewer/images/qdbusviewer-128.png
deleted file mode 100644 (file)
index 0754912..0000000
Binary files a/src/tools/qdbusviewer/images/qdbusviewer-128.png and /dev/null differ

diff --git a/src/tools/qdbusviewer/images/qdbusviewer.png b/src/tools/qdbusviewer/images/qdbusviewer.png
index 5a8c5a3..0754912 100644 (file)
Binary files a/src/tools/qdbusviewer/images/qdbusviewer.png and b/src/tools/qdbusviewer/images/qdbusviewer.png differ

diff --git a/src/tools/qdbusviewer/qdbusviewer.cpp b/src/tools/qdbusviewer/qdbusviewer.cpp
index 5ee7371..ae704b4 100644 (file)
--- a/src/tools/qdbusviewer/qdbusviewer.cpp
+++ b/src/tools/qdbusviewer/qdbusviewer.cpp
@@ -487,7 +487,7 @@ void QDBusViewer::about()
 {
     QMessageBox box(this);
 
-    box.setText(QString::fromLatin1("<center><img src=\":/trolltech/qdbusviewer/images/qdbusviewer-128.png\">"
+    box.setText(QString::fromLatin1("<center><img src=\":/trolltech/qdbusviewer/images/qdbusviewer.png\">"
                 "<h3>%1</h3>"
                 "<p>Version %2</p></center>"
                 "<p>Copyright (C) 2015 The Qt Company Ltd.</p>")

diff --git a/src/tools/qdbusviewer/qdbusviewer.desktop.cmake b/src/tools/qdbusviewer/qdbusviewer.desktop.cmake
new file mode 100644 (file)
index 0000000..2686725
--- /dev/null
+++ b/src/tools/qdbusviewer/qdbusviewer.desktop.cmake
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=Katie D-Bus Viewer
+Comment=Debug D-Bus applications
+Exec=@QT_BINARIES_PATH_INST@/qdbusviewer
+Icon=@PIXMAPS_INSTALL_DIR@/qdbusviewer.png
+Terminal=false
+Encoding=UTF-8
+Type=Application
+Categories=Qt;Development;Debugger; 

diff --git a/src/tools/qdbusviewer/qdbusviewer.qrc b/src/tools/qdbusviewer/qdbusviewer.qrc
index 7d592f3..63f82fe 100644 (file)
--- a/src/tools/qdbusviewer/qdbusviewer.qrc
+++ b/src/tools/qdbusviewer/qdbusviewer.qrc
@@ -1,6 +1,5 @@
 <RCC>
     <qresource prefix="/trolltech/qdbusviewer" >
-        <file>images/qdbusviewer-128.png</file>
         <file>images/qdbusviewer.png</file>
     </qresource>
 </RCC>