Remove support for CPack.

It's very incomplete and we already have installation makers for supported OSes.

Change-Id: Ide6332b9b6d69b66e7262662d781b548526ab752
Reviewed-on: https://code.wireshark.org/review/22226
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 82c77d3c245335cf42bc7323ed29b4bf9fad0fa5..986ebe587ba0e5e7e5f5dbb0a077e4cd95432229 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1076,8 +1076,34 @@ endforeach()
 # Provide Windows system lib names
 include( UseWinLibs )
 
-#packaging
-include(CPackConfig.txt)
+#packaging information
+# 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)
+else()
+        set(CPACK_PACKAGE_NAME wireshark)
+endif()
+
+set(CPACK_PACKAGE_VERSION "${PROJECT_VERSION}")
+
+# dist target that prepares source dir
+add_custom_target(dist
+    COMMAND "${CMAKE_COMMAND}"
+        -DPROJECT_SOURCE_DIR="${PROJECT_SOURCE_DIR}"
+        -DGIT_EXECUTABLE="${GIT_EXECUTABLE}"
+        -DWS_SOURCE_DIR="${WS_SOURCE_DIR}"
+        -P "${CMAKE_SOURCE_DIR}/cmake/modules/Dist.cmake"
+    COMMAND "${CMAKE_MAKE_PROGRAM}" package_source
+)
+
 
 if(HAVE_LIBAIRPCAP)
        set(HAVE_AIRPCAP 1)

diff --git a/CPackConfig.txt b/CPackConfig.txt
deleted file mode 100644 (file)
index b32d5e0..0000000
--- a/CPackConfig.txt
+++ /dev/null
@@ -1,129 +0,0 @@
-# CPackConfig.txt
-#
-# Wireshark - Network traffic analyzer
-# By Gerald Combs <gerald@wireshark.org>
-# Copyright 1998 Gerald Combs
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-
-# 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)
-else()
-        set(CPACK_PACKAGE_NAME wireshark)
-endif()
-
-# Directory to copy sources to
-set(WS_SOURCE_DIR "${CMAKE_BINARY_DIR}/source_dir")
-set(CPACK_SOURCE_INSTALLED_DIRECTORIES "${WS_SOURCE_DIR}/;/")
-# dist target that prepares source dir
-add_custom_target(dist
-    COMMAND "${CMAKE_COMMAND}"
-        -DPROJECT_SOURCE_DIR="${PROJECT_SOURCE_DIR}"
-        -DGIT_EXECUTABLE="${GIT_EXECUTABLE}"
-        -DWS_SOURCE_DIR="${WS_SOURCE_DIR}"
-        -P "${CMAKE_SOURCE_DIR}/cmake/modules/Dist.cmake"
-    COMMAND "${CMAKE_MAKE_PROGRAM}" package_source
-)
-
-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_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README.md")
-set(CPACK_PACKAGE_VERSION_MAJOR "${PROJECT_MAJOR_VERSION}")
-set(CPACK_PACKAGE_VERSION_MINOR "${PROJECT_MINOR_VERSION}")
-set(CPACK_PACKAGE_VERSION_PATCH "${PROJECT_PATCH_VERSION}${PROJECT_VERSION_EXTENSION}")
-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_SOURCE_DIR}/COPYING")
-set(CPACK_STRIP_FILES true)
-
-set(CPACK_SOURCE_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}")
-if(NOT WIN32)
-        set(CPACK_PACKAGE_FILE_NAME ${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION})
-        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")
-
-if(WIN32)
-        set(CPACK_GENERATOR "WIX")
-else()
-        # XXX Currently unused and untested.
-        # 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"
-        if(NOT CMAKE_VERSION VERSION_LESS "3.1.0")
-                # TXZ generator supported since CMake 3.1.0
-                set(CPACK_GENERATOR "TXZ")
-                set(CPACK_SOURCE_GENERATOR "TXZ")
-        else()
-                set(CPACK_GENERATOR "TBZ2")
-                set(CPACK_SOURCE_GENERATOR "TBZ2")
-        endif()
-endif()
-
-#===============================================
-IF(APPLE)
-        SET(CPACK_GENERATOR "${CPACK_GENERATOR};DragNDrop")
-        SET(CPACK_BUNDLE_ICON "${CMAKE_SOURCE_DIR}/packaging/macosx/Resources/Wireshark.icns")
-        SET(CPACK_BUNDLE_NAME "Wireshark")
-        SET(CPACK_BUNDLE_PLIST "${CMAKE_BINARY_DIR}/packaging/macosx/Info.plist")
-#        SET(CPACK_BUNDLE_STARTUP_COMMAND "${OBDGPSLogger_SOURCE_DIR}/osx/StartupCommand")
-ENDIF(APPLE)
-# ELSE(APPLE)
-#
-#         # If we can find rpmbuild, then go for it
-#         FIND_PROGRAM(RPMBUILD_TEST rpmbuild INTERNAL)
-#         IF(RPMBUILD_TEST)
-#                 SET(CPACK_GENERATOR "${CPACK_GENERATOR};RPM")
-#                 SET(CPACK_RPM_PACKAGE_REQUIRES "gpsd >= 2.0")
-#                 SET(CPACK_RPM_PACKAGE_LICENSE "GPLv2+")
-#         ENDIF(RPMBUILD_TEST)
-#
-#         # If we can find dpkg, build a .deb
-#         #FIND_PROGRAM(DPKG_TEST dpkg INTERNAL)
-#         #IF(DPKG_TEST)
-#                 SET(CPACK_GENERATOR "${CPACK_GENERATOR};DEB")
-#                 SET(CPACK_DEBIAN_PACKAGE_DEPENDS "gpsd (>=2.0)")
-#                 SET(CPACK_DEBIAN_PACKAGE_DESCRIPTION ${CPACK_PACKAGE_DESCRIPTION})
-#         #ENDIF(DPKG_TEST)
-#
-# ENDIF(APPLE)
-#
-#
-#
-#===============================================
-
-include(CPack)

diff --git a/Makefile.am b/Makefile.am
index 76003b8ff5a9371f618f93af94731908734f7df8..5b9e4311e9bffafaeebfdd4dacc4a714183c6b23 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -874,8 +874,7 @@ EXTRA_DIST = \
        cmakeconfig.h.in        \
        CMakeOptions.txt        \
        ConfigureChecks.cmake   \
-       cmake                   \
-       CPackConfig.txt
+       cmake
 
 install-exec-hook:
 if HAVE_DUMPCAP_GROUP