Skip to content

Commit

Permalink
chore: improve build script for debian (#110)
Browse files Browse the repository at this point in the history
* standardize .deb package output file name

* add zip dependency in setup-debian.sh for build.sh
  • Loading branch information
AndySchroder authored Jun 15, 2024
1 parent 75cbfa1 commit 979ccc8
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ build
/src/version.h

# for package files
lpac-*.deb
lpac_*.deb
lpac-*.zip

# for clion ignores
Expand Down
2 changes: 2 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@ if(CPACK_GENERATOR)
set(CPACK_DEBIAN_PACKAGE_MAINTAINER "eSTK.me Group")
set(CPACK_DEBIAN_PACKAGE_DEPENDS "libc6")
set(CPACK_DEBIAN_PACKAGE_RECOMMENDS "libcurl, libpcsclite, pcscd")

set(CPACK_DEBIAN_FILE_NAME DEB-DEFAULT)

set(CPACK_RPM_PACKAGE_LICENSE "AGPL-3.0-only AND LGPL-2.0-only")
set(CPACK_RPM_PACKAGE_AUTOREQ "yes")
Expand Down
2 changes: 1 addition & 1 deletion scripts/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ make)
debian)
cmake "$WORKSPACE" -DCPACK_GENERATOR=DEB
make -j package
cp lpac-*.deb "$WORKSPACE"
cp lpac_*.deb "$WORKSPACE"
;;
mingw)
cmake "$WORKSPACE" -DCMAKE_TOOLCHAIN_FILE=./cmake/linux-mingw64.cmake
Expand Down
2 changes: 1 addition & 1 deletion scripts/setup-debian.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/bash
set -xeuo pipefail
sudo apt-get update
sudo apt-get install -y build-essential libpcsclite-dev libcurl4-openssl-dev gcc-mingw-w64 g++-mingw-w64
sudo apt-get install -y build-essential libpcsclite-dev libcurl4-openssl-dev gcc-mingw-w64 g++-mingw-w64 zip

0 comments on commit 979ccc8

Please sign in to comment.