more on installer

2018-08-07 12:52:24 +02:00 · 2018-08-07 12:52:24 +02:00 · 8cd4b58b53
commit 8cd4b58b53
parent d784a26872
6 changed files with 174 additions and 1 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -1,12 +1,14 @@
 cmake_minimum_required(VERSION 3.8)

-project(KIMA2 VERSION 0.9.0)
+project(kima2 VERSION 0.9.0)

 set(CMAKE_MODULE_PATH "${CMAKE_HOME_DIRECTORY}/cmake" ${CMAKE_MODULE_PATH})

 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)

+#include(InstallRequiredSystemLibraries)
+
 if(MSVC)
  add_compile_options(/W4 /WX)
 else()
@ -27,3 +29,29 @@ if(NOT CMAKE_BUILD_TYPE OR CMAKE_BUILD_TYPE MATCHES Debug)
  add_subdirectory(test)
 endif()

+
+# CPack
+INCLUDE(InstallRequiredSystemLibraries)
+
+set(CPACK_PACKAGE_EXECUTABLES "kima2" "KIMA2")
+set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Ein kleines Kassenprogramm für Kindersachenmärkte")
+set(CPACK_PACKAGE_ICON "${CMake_SOURCE_DIR}/misc\\\\kima2.png")
+set(CPACK_PACKAGE_VERSION_MAJOR ${PROJECT_VERSION_MAJOR})
+set(CPACK_PACKAGE_VERSION_MINOR ${PROJECT_VERSION_MINOR})
+set(CPACK_PACKAGE_VERSION_PATCH ${PROJECT_VERSION_PATCH})
+set(CPACK_PACKAGE_VENDOR "Martin Brodbeck")
+set(CPACK_PACKAGE_CONTACT "Martin Brodbeck <info@rustysoft.de>")
+set(CPACK_SOURCE_IGNORE_FILES "/.git/;/.vscode")
+set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE")
+
+if (WIN32 AND NOT UNIX)
+  set(CPACK_GENERATOR "NSIS;ZIP")
+else(WIN32 AND NOT UNIX)
+  set(CPACK_SOURCE_GENERATOR "TBZ2")
+  set(CPACK_GENERATOR "RPM;DEB")
+  set(CPACK_STRIP_FILES "bin/kima2")
+  set(CPACK_SOURCE_STRIP_FILES "")
+endif (WIN32 AND NOT UNIX)
+
+
+include(CPack)
--- a/misc/convert2ico.sh
+++ b/misc/convert2ico.sh
@ -0,0 +1,4 @@
+#!/bin/env bash
+
+#convert -density 384 -background transparent kima2.svg -define icon:auto-resize -colors 256 kima2.ico
+convert -density 384 -background white kima2.svg -define icon:auto-resize -colors 256 kima2.ico
--- a/misc/kima2.desktop
+++ b/misc/kima2.desktop
@ -0,0 +1,11 @@
+[Desktop Entry]
+Type=Application
+Name=KIMA2
+GenericName=POS Program
+GenericName[de]=Kassenprogramm
+Comment=A small POS program
+Comment[de]=Ein kleines Kassenprogramm
+Exec=kima2
+Icon=kima2
+Categories=Office;
+
--- a/misc/kima2.ico
+++ b/misc/kima2.ico
--- a/misc/kima2.svg
+++ b/misc/kima2.svg
@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="1024"
+   height="1024"
+   viewBox="0 0 270.93333 270.93334"
+   version="1.1"
+   id="svg8"
+   inkscape:version="0.92.1 r"
+   sodipodi:docname="kima2.svg"
+   inkscape:export-filename="/home/brodbemn/nextCloud/Computer/Kima2_Windows/kima2.png"
+   inkscape:export-xdpi="89"
+   inkscape:export-ydpi="89">
+  <defs
+     id="defs2">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4557">
+      <stop
+         style="stop-color:#ff0000;stop-opacity:1;"
+         offset="0"
+         id="stop4553" />
+      <stop
+         style="stop-color:#ff0000;stop-opacity:0;"
+         offset="1"
+         id="stop4555" />
+    </linearGradient>
+    <filter
+       inkscape:collect="always"
+       style="color-interpolation-filters:sRGB"
+       id="filter4539"
+       x="-0.012000001"
+       width="1.024"
+       y="-0.011999999"
+       height="1.024">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="1.3526139"
+         id="feGaussianBlur4541" />
+    </filter>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4557"
+       id="linearGradient4559"
+       x1="136.82738"
+       y1="27.124983"
+       x2="136.4494"
+       y2="295.86606"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.7"
+     inkscape:cx="396.96162"
+     inkscape:cy="571.43924"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     units="px"
+     inkscape:window-width="1920"
+     inkscape:window-height="1136"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Ebene 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-26.06665)">
+    <rect
+       style="opacity:1;fill:url(#linearGradient4559);fill-opacity:1;stroke:#ff0100;stroke-width:0.4105497;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter4539)"
+       id="rect10"
+       width="270.52277"
+       height="270.5228"
+       x="0.20527485"
+       y="26.271914"
+       ry="11.90625" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:91.26605225px;line-height:11.88360023px;font-family:'Comic Sans MS';-inkscape-font-specification:'Comic Sans MS';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.475344px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="7.4357271"
+       y="124.94152"
+       id="text4563"><tspan
+         sodipodi:role="line"
+         id="tspan4561"
+         x="7.4357271"
+         y="124.94152"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:91.26605225px;font-family:'Comic Sans MS';-inkscape-font-specification:'Comic Sans MS';stroke-width:0.475344px">KIMA</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:134.65290833px;line-height:17.53293037px;font-family:'Comic Sans MS';-inkscape-font-specification:'Comic Sans MS';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.70131725px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="86.477333"
+       y="257.46463"
+       id="text4563-1"><tspan
+         sodipodi:role="line"
+         id="tspan4561-7"
+         x="86.477333"
+         y="257.46463"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:134.65290833px;font-family:'Comic Sans MS';-inkscape-font-specification:'Comic Sans MS';stroke-width:0.70131725px">2</tspan></text>
+  </g>
+</svg>
--- a/src/gui/CMakeLists.txt
+++ b/src/gui/CMakeLists.txt
@ -34,3 +34,6 @@ if(WIN32)
    set_target_properties(kima2 PROPERTIES LINK_FLAGS "-mwindows")
 endif(WIN32)

+# CPack
+install(TARGETS kima2 RUNTIME DESTINATION bin)
+