Updated package & install configuration

- Added package changelog files for deb & rpm - Added license file for deb pkg - Added rules file for deb pkg - Changed install subdirectory
jairus-crabb · May 18, 2020 · 97d3173 · 97d3173
1 parent e3aa887
commit 97d3173
Show file tree

Hide file tree

Showing 9 changed files with 85 additions and 247 deletions.
diff --git a/.travis.sh b/.travis.sh
@@ -12,17 +12,17 @@ if [ "$TRAVIS_JOB_NAME" == "linux-mingw" ]; then
     echo "--> Building Release for Windows (x86-64) ..."
     mkdir -p build-mingw && cd build-mingw
     echo "-DCMAKE_SYSTEM_NAME=Windows -DTOOLCHAIN_PREFIX=x86_64-w64-mingw32 \
-          -DCMAKE_TOOLCHAIN_FILE=$PWD/../cmake/modules/set_toolchain.cmake -DCMAKE_INSTALL_PREFIX=$PWD/_install $DIR"
+          -DCMAKE_TOOLCHAIN_FILE=$PWD/../cmake/modules/set_toolchain.cmake -DCMAKE_INSTALL_PREFIX=$PWD/install $DIR"
     cmake -DCMAKE_SYSTEM_NAME=Windows -DTOOLCHAIN_PREFIX=x86_64-w64-mingw32 \
-          -DCMAKE_TOOLCHAIN_FILE=$PWD/../cmake/modules/set_toolchain.cmake -DCMAKE_INSTALL_PREFIX=$PWD/_install $DIR
+          -DCMAKE_TOOLCHAIN_FILE=$PWD/../cmake/modules/set_toolchain.cmake -DCMAKE_INSTALL_PREFIX=$PWD/install $DIR
     make && rm -rf build-mingw && cd -
 
     echo "--> Building Release for Windows (i686) ..."
     mkdir -p build-mingw && cd build-mingw
     echo "-DCMAKE_SYSTEM_NAME=Windows -DTOOLCHAIN_PREFIX=i686-w64-mingw32 \
-          -DCMAKE_TOOLCHAIN_FILE=$PWD/../cmake/modules/set_toolchain.cmake -DCMAKE_INSTALL_PREFIX=$PWD/_install $DIR"
+          -DCMAKE_TOOLCHAIN_FILE=$PWD/../cmake/modules/set_toolchain.cmake -DCMAKE_INSTALL_PREFIX=$PWD/install $DIR"
     cmake -DCMAKE_SYSTEM_NAME=Windows -DTOOLCHAIN_PREFIX=i686-w64-mingw32 \
-          -DCMAKE_TOOLCHAIN_FILE=$PWD/../cmake/modules/set_toolchain.cmake -DCMAKE_INSTALL_PREFIX=$PWD/_install $DIR
+          -DCMAKE_TOOLCHAIN_FILE=$PWD/../cmake/modules/set_toolchain.cmake -DCMAKE_INSTALL_PREFIX=$PWD/install $DIR
     make && rm -rf build-mingw && cd -
 
 elif [ "$TRAVIS_OS_NAME" == "linux" ]; then
@@ -31,41 +31,41 @@ elif [ "$TRAVIS_OS_NAME" == "linux" ]; then
 
     echo "--> Building Debug..."
     mkdir -p build/Debug && cd build/Debug
-    echo "-DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=$PWD/_install"
-    cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=$PWD/_install $DIR
+    echo "-DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=$PWD/install"
+    cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=$PWD/install $DIR
     make && make package && cd -
 
     echo "--> Building Release..."
     mkdir -p build/Release && cd build/Release
-    echo "-DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$PWD/_install"
-    cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$PWD/_install $DIR
+    echo "-DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$PWD/install"
+    cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$PWD/install $DIR
     make && make package && cd -
 
 elif [ "$TRAVIS_OS_NAME" == "osx" ]; then
     brew install libusb
 
     echo "--> Building Debug..."
     mkdir -p build/Debug && cd build/Debug
-    echo "-DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=$PWD/_install"
-    cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=$PWD/_install $DIR
+    echo "-DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=$PWD/install"
+    cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=$PWD/install $DIR
     make && make package && cd -
 
     echo "--> Building Release..."
     mkdir -p build/Release && cd build/Release
-    echo "-DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$PWD/_install"
-    cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$PWD/_install $DIR
+    echo "-DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$PWD/install"
+    cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$PWD/install $DIR
     make && make package && cd -
 
 else # local test-build
     echo "--> Building Debug..."
     mkdir -p build/Debug && cd build/Debug
-    echo "-DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=$PWD/_install"
-    cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=$PWD/_install ../../
+    echo "-DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=$PWD/install"
+    cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=$PWD/install ../../
     make && make package && cd -
 
     echo "--> Building Release..."
     mkdir -p build/Release && cd build/Release
-    echo "-DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$PWD/_install"
-    cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$PWD/_install ../../
+    echo "-DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$PWD/install"
+    cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$PWD/install ../../
     make && make package && cd -
 fi
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -67,7 +67,7 @@ find_package(libusb REQUIRED)
 
 ## Package configuration (pkg-config) on unix-based systems
 if (NOT WIN32 AND NOT CMAKE_CROSSCOMPILING)
-    add_subdirectory(cmake/pkgconfig)
+    #add_subdirectory(cmake/pkgconfig)
     find_package(PkgConfig)
     pkg_check_modules(GTK3 gtk+-3.0)
 endif ()
@@ -187,7 +187,7 @@ set_target_properties(
         )
 
 # Link shared library
-if (APPLE)      # ... with Apple macOS libraries
+if (APPLE)     # ... with Apple macOS libraries
     find_library(ObjC objc)
     find_library(CoreFoundation CoreFoundation)
     find_library(IOKit IOKit)
@@ -230,7 +230,7 @@ set_target_properties(
         )
 
 # Link static library
-if (APPLE)      # ... with Apple macOS libraries
+if (APPLE)     # ... with Apple macOS libraries
     find_library(ObjC objc)
     find_library(CoreFoundation CoreFoundation)
     find_library(IOKit IOKit)

diff --git a/cmake/packaging/cpack_config.cmake b/cmake/packaging/cpack_config.cmake
@@ -62,20 +62,23 @@ elseif (EXISTS "/etc/debian_version" AND NOT EXISTS WIN32) # Package-build is av
     # CPACK_DEBIAN_PACKAGE_HOMEPAGE      --> Default: CMAKE_PROJECT_HOMEPAGE_URL
     set(CPACK_DEBIAN_PACKAGE_SUGGESTS "libgtk-3-dev, pandoc")
 
-    ## Add CHANGELOG in Debian-specific format
-                                                                                ### TODO
-
-    ## Add license file
-                                                                                ### TODO
-
-    # Include a postinst-script
-    set(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA "${CMAKE_SOURCE_DIR}/cmake/packaging/debian/postinst")
+    ## Additional package files in Debian-specific format:
+    # * changelog (package changelog)
+    # * copyright (license file)
+    # * rules
+    # * postinst-script
+    set(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA
+        "${CMAKE_SOURCE_DIR}/cmake/packaging/deb/changelog"
+        "${CMAKE_SOURCE_DIR}/cmake/packaging/deb/copyright"
+        "${CMAKE_SOURCE_DIR}/cmake/packaging/deb/rules"
+        "${CMAKE_SOURCE_DIR}/cmake/packaging/deb/postinst"
+        )
 
     ###
     # Slackware & Redhat (RPM)
     ###
 
-    set(CPACK_SET_DESTDIR "OFF")
+    set(CPACK_SET_DESTDIR "OFF") # Required for relocatable package
 
     # CPACK_RPM_PACKAGE_SUMMARY          --> Default: CPACK_PACKAGE_DESCRIPTION_SUMMARY
     # CPACK_RPM_PACKAGE_NAME             --> Default: CPACK_PACKAGE_NAME
@@ -97,8 +100,9 @@ elseif (EXISTS "/etc/debian_version" AND NOT EXISTS WIN32) # Package-build is av
     # CPACK_RPM_PACKAGE_URL              --> Default: CMAKE_PROJECT_HOMEPAGE_URL
     set(CPACK_RPM_PACKAGE_DESCRIPTION CPACK_DEBIAN_PACKAGE_DESCRIPTION)
 
-    ## Add CHANGELOG in rpm-specific format
-                                                                                ### TODO
+    ## Add package changelog in rpm-specific format
+    set(CPACK_RPM_CHANGELOG_FILE "${CMAKE_SOURCE_DIR}/cmake/packaging/rpm/changelog")
+
 else ()
     # No package configuration on other platforms ...
 endif ()