aboutsummaryrefslogtreecommitdiffstats
path: root/CPackConfig.txt
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2015-12-31 14:56:45 -0800
committerGerald Combs <gerald@wireshark.org>2016-01-01 01:00:08 +0000
commit44eda0c64e7365196aed5f2166b33baaac16a45f (patch)
tree68915b3ef9b809cf2973c54656f842d8d9c18cdd /CPackConfig.txt
parent146c4b701696cb54e9e5ad4668e3ad88743c546e (diff)
CPack: WiX updates.
WiX prefers rich text license files. Add an RTF version of the GPLv2. It was created by converting the "standalone HTML" version of the license at http://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html to RTF using Pandoc 1.11. Start splitting CPackConfig.txt into Win32 and non-Win32 sections. Add a WiX section. Change-Id: Ifcb233053c8a2158f087b69c69de7df869af65aa Reviewed-on: https://code.wireshark.org/review/12980 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'CPackConfig.txt')
-rw-r--r--CPackConfig.txt47
1 files changed, 36 insertions, 11 deletions
diff --git a/CPackConfig.txt b/CPackConfig.txt
index cec48646d1..2028864508 100644
--- a/CPackConfig.txt
+++ b/CPackConfig.txt
@@ -19,11 +19,44 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
#
-set(CPACK_PACKAGE_NAME wireshark)
+# XXX The CMake documentation recommends setting CPACK_PROJECT_CONFIG_FILE
+# instead.
+if(WIN32)
+ # To do:
+ # - Add WinPCap
+ # - Add USBPcap
+ # - Add CLI DLLs
+ # - Add common (Glib, etc) DLLs
+ # - Add Qt DLLs
+ # - Add
+ set(CPACK_PACKAGE_NAME Wireshark)
+ set(CPACK_GENERATOR "WIX")
+else()
+ # XXX Currently unused and untested.
+ set(CPACK_PACKAGE_NAME wireshark)
+ set(CPACK_PACKAGE_FILE_NAME ${CPACK_PACKAGE_NAME}-${CPACK_SYSTEM_NAME}-${CPACK_PACKAGE_VERSION})
+ # Win: WIX, NSIS, ZIP, SOURCE_ZIP, CYGWIN_BINARY, SOURCE_CYGWIN,
+ # Linux/Unix: DEB, RPM, STGZ, TBZ2, TZ, SOURCE_TZ, SOURCE_TGZ
+ # OSX: PACKAGEMAKER, OSXX11
+ # Syntax: "Type1;Type2;Type3"
+ set(CPACK_GENERATOR "TBZ2")
+ set(CPACK_SOURCE_GENERATOR "TBZ2")
+ set(CPACK_PACKAGE_INSTALL_DIRECTORY "/usr")
+endif()
+
+# WiX
+
+# WiX wants RTF. CPack+WiX wants a file extension.
+set(CPACK_WIX_LICENSE_RTF "${CMAKE_SOURCE_DIR}/packaging/wix/gpl-2.0.rtf")
+set(CPACK_WIX_PRODUCT_ICON "${CMAKE_SOURCE_DIR}/image/wireshark.ico")
+#set(CPACK_WIX_UI_BANNER "${CMAKE_SOURCE_DIR}/image/wix-ui-banner.png")
+#set(CPACK_WIX_UI_DIALOG "${CMAKE_SOURCE_DIR}/image/wix-ui-dialog.png")
+
+set(CPACK_WIX_UPGRADE_GUID "5809F81A-587D-470D-8016-DA480DAE379F")
+
set(CPACK_PACKAGE_DESCRIPTION "A set of command line and gui tools to capture and decode traffic")
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Packet capturing and decoding")
set(CPACK_PACKAGE_VENDOR "Wireshark developers")
-set(CPACK_PACKAGE_NAME "wireshark")
set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README")
set(CPACK_PACKAGE_VERSION_MAJOR "${PROJECT_MAJOR_VERSION}")
set(CPACK_PACKAGE_VERSION_MINOR "${PROJECT_MINOR_VERSION}")
@@ -31,17 +64,10 @@ set(CPACK_PACKAGE_VERSION_PATCH "${PROJECT_PATCH_VERSION}${PROJECT_VERSION_EXTEN
set(CPACK_PACKAGE_VERSION "${PROJECT_VERSION}")
set(CPACK_PACKAGE_CONTACT "wireshark-users@wireshark.org")
# set(CPACK_PACKAGE_EXECUTABLES "wireshark")
-set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/COPYING")
+set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/COPYING")
set(CPACK_STRIP_FILES true)
set(CPACK_SOURCE_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}")
-set(CPACK_PACKAGE_INSTALL_DIRECTORY "/usr")
-# Win: NSIS, ZIP, SOURCE_ZIP, CYGWIN_BINARY, SOURCE_CYGWIN,
-# Linux/Unix: DEB, RPM, STGZ, TBZ2, TZ, SOURCE_TZ, SOURCE_TGZ
-# OSX: PACKAGEMAKER, OSXX11
-# Syntax: "Type1;Type2;Type3"
-set(CPACK_GENERATOR "TBZ2")
-set(CPACK_SOURCE_GENERATOR "TBZ2")
#===============================================
IF(APPLE)
@@ -76,4 +102,3 @@ ENDIF(APPLE)
#===============================================
include(CPack)
-