Peter M. Groen / openhantek

Commit ac9e01eca8def9e14ffd02502004fdb7edc15088

Authored by David Gräff
1 parent e01e4b69

Travis: Also generate deb package on linux

Inline Side-by-side
Showing 2 changed files with 6 additions and 2 deletions
.travis.yml
  View file @ac9e01e
@@ -71,8 +71,9 @@ deploy: @@ -71,8 +71,9 @@ deploy:
71 api_key: 71 api_key:
72 secure: kIX221nPUe3OM5CNeEJ1iyRg2FFpmlL7c+uxJS11+HBRcFTGCIArHoxMIUb1u289+Co0jp42BVxhpo9PaKhHhzy3iVsKM1xOty3GAr9/1KzVnvJY0dOWqO2cYks4w24WF50ii3kUtYGVKpJrsHPT8UeI2z+taYr1jBmKkoYuoWDG+3CAZytLAsOVDRPylhzSD8B+OrCHIbN1npcitEpFUMJWgvDVi6ZKsz8o6obs/NhwFEc9TBDhS7CeIoAcNt7S0WdDM4ZyHyOeYShWxL0DlZBuhvS7SVZbxy/DS/cTAyoaWqgFLQokmhsKkVIytnq40kC9kGUZvoSpfwtfnA55eElFP5sNbnjQEUaDgq8Doi+aTTc7WRmhBCJbmz6RlqPAECQzx67JuTukV7F6Ds6B34+9naV3dAhj7dnMAoIvY1UK4NhvT+w3aQNR3B93TLZfYHvAmVoZcMGEY/EqLbHdMdJ7E9YGEQQUXW/753EmulCu9/O/gEs+8DlNc1ejFUGJhQmTyJBOLupJpFanC+6mTcbSGlJLwAHxL5yuJ0x5xLzZvJ9jTJI1QFu8ZztFw6gPCBpxPVle6E/Ht3CIByoK5RtKzhJBxgYDG+k0Yaqgbp1wh1ET56xEj8GxQlTKW43Mwbt4aXAarZ11C3erab5lCQyubIUXuq0TWxJLDTfOC6I= 72 secure: kIX221nPUe3OM5CNeEJ1iyRg2FFpmlL7c+uxJS11+HBRcFTGCIArHoxMIUb1u289+Co0jp42BVxhpo9PaKhHhzy3iVsKM1xOty3GAr9/1KzVnvJY0dOWqO2cYks4w24WF50ii3kUtYGVKpJrsHPT8UeI2z+taYr1jBmKkoYuoWDG+3CAZytLAsOVDRPylhzSD8B+OrCHIbN1npcitEpFUMJWgvDVi6ZKsz8o6obs/NhwFEc9TBDhS7CeIoAcNt7S0WdDM4ZyHyOeYShWxL0DlZBuhvS7SVZbxy/DS/cTAyoaWqgFLQokmhsKkVIytnq40kC9kGUZvoSpfwtfnA55eElFP5sNbnjQEUaDgq8Doi+aTTc7WRmhBCJbmz6RlqPAECQzx67JuTukV7F6Ds6B34+9naV3dAhj7dnMAoIvY1UK4NhvT+w3aQNR3B93TLZfYHvAmVoZcMGEY/EqLbHdMdJ7E9YGEQQUXW/753EmulCu9/O/gEs+8DlNc1ejFUGJhQmTyJBOLupJpFanC+6mTcbSGlJLwAHxL5yuJ0x5xLzZvJ9jTJI1QFu8ZztFw6gPCBpxPVle6E/Ht3CIByoK5RtKzhJBxgYDG+k0Yaqgbp1wh1ET56xEj8GxQlTKW43Mwbt4aXAarZ11C3erab5lCQyubIUXuq0TWxJLDTfOC6I=
73 file: 73 file:
74 - - packages/OpenHantek-Release.sh  
75 - - packages/OpenHantek-Release.zip 74 + - packages/OpenHantekProject-Linux.sh
  75 + - packages/OpenHantekProject-Linux.zip
  76 + - packages/OpenHantekProject-Linux.deb
76 on: 77 on:
77 repo: OpenHantek/openhantek 78 repo: OpenHantek/openhantek
78 branch: master 79 branch: master
cmake/CPackInfos.cmake
  View file @ac9e01e
@@ -45,6 +45,9 @@ string(TIMESTAMP CURRENT_TIME "%d.%m.%Y %H:%M") @@ -45,6 +45,9 @@ string(TIMESTAMP CURRENT_TIME "%d.%m.%Y %H:%M")
45 45
46 if (UNIX) 46 if (UNIX)
47 set(CPACK_GENERATOR ZIP STGZ) 47 set(CPACK_GENERATOR ZIP STGZ)
  48 + if (NOT APPLE)
  49 + set(CPACK_GENERATOR ${CPACK_GENERATOR} DEB)
  50 + endif()
48 elseif(WIN32) 51 elseif(WIN32)
49 set(CPACK_GENERATOR ZIP NSIS) 52 set(CPACK_GENERATOR ZIP NSIS)
50 endif() 53 endif()