CMake: Remove libtar, unneeded downloadertools progs

.travis.yml

@@ -64,7 +64,7 @@ before_install:
 install:
 - >
   if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
-    brew install python@3 eigen libtar libsquish zlib ffmpeg freetype \
+    brew install python@3 eigen libsquish zlib ffmpeg freetype \
     bullet opencv assimp libvorbis openssl ccache || true
     brew install ode --with-shared
 

cmake/modules/FindTar.cmake

@@ -1,39 +0,0 @@
-# Filename: FindTar.cmake
-# Author: kestred (29 Nov, 2013)
-#
-# Usage:
-#   find_package(Tar [REQUIRED] [QUIET])
-#
-# It sets the following variables:
-#   TAR_FOUND   - system has libtar
-#   TAR_INCLUDE_DIR   - the tar include directory
-#   TAR_LIBRARY_DIR   - the tar library directory
-#   TAR_LIBRARY - the path to the library binary
-#
-
-# Find the libtar include files
-find_path(TAR_INCLUDE_DIR
-  NAMES "libtar.h"
-  PATHS "/usr/include"
-        "/usr/local/include"
-  PATH_SUFFIXES "" "tar" "libtar"
-  DOC "The path to libtar's include directory."
-)
-
-# Find the libtar library (.a, .so)
-find_library(TAR_LIBRARY
-  NAMES "tar"
-        "libtar"
-  PATHS "/usr"
-        "/usr/local"
-  PATH_SUFFIXES "lib" "lib32" "lib64"
-)
-get_filename_component(TAR_LIBRARY_DIR "${TAR_LIBRARY}" PATH)
-set(TAR_LIBRARY_DIR "${TAR_LIBRARY_DIR}" CACHE PATH "The path to libtar's library directory.") # Library path
-
-mark_as_advanced(TAR_INCLUDE_DIR)
-mark_as_advanced(TAR_LIBRARY_DIR)
-mark_as_advanced(TAR_LIBRARY)
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(Tar DEFAULT_MSG TAR_LIBRARY TAR_INCLUDE_DIR TAR_LIBRARY_DIR)

dtool/Package.cmake

@@ -297,19 +297,6 @@ package_option(SQUISH
 package_status(SQUISH "libsquish")
 
 
-#
-# ------------ Archival formats ------------
-#
-
-# libtar
-find_package(Tar QUIET)
-
-package_option(TAR
-  "This is used to optimize patch generation against tar files.")
-
-package_status(TAR "libtar")
-
-
 #
 # ------------ Asset formats ------------
 #

dtool/dtool_config.h.in

@@ -62,9 +62,6 @@
 #cmakedefine HAVE_BMP
 #cmakedefine HAVE_PNM
 
-/* Define if we have libtar installed.  */
-#cmakedefine HAVE_TAR
-
 /* Define if we have CG installed.  */
 #cmakedefine HAVE_CG
 

panda/src/downloadertools/CMakeLists.txt

@@ -5,36 +5,18 @@ if(NOT BUILD_PANDATOOL)
 endif()
 
 if(HAVE_OPENSSL)
-  add_executable(apply_patch apply_patch.cxx)
-  target_link_libraries(apply_patch panda)
-
-  add_executable(build_patch build_patch.cxx)
-  target_link_libraries(build_patch panda)
-
-  add_executable(show_ddb show_ddb.cxx)
-  target_link_libraries(show_ddb panda)
-
-  add_executable(check_md5 check_md5.cxx)
-  target_link_libraries(check_md5 panda)
-
   add_executable(pencrypt pencrypt.cxx)
   target_link_libraries(pencrypt panda)
 
   add_executable(pdecrypt pdecrypt.cxx)
   target_link_libraries(pdecrypt panda)
 
-  install(TARGETS apply_patch build_patch show_ddb check_md5 pencrypt pdecrypt
+  install(TARGETS pencrypt pdecrypt
     EXPORT Tools COMPONENT Tools
     DESTINATION ${CMAKE_INSTALL_BINDIR})
 endif()
 
 if(HAVE_ZLIB)
-  add_executable(check_adler check_adler.cxx)
-  target_link_libraries(check_adler panda)
-
-  add_executable(check_crc check_crc.cxx)
-  target_link_libraries(check_crc panda)
-
   add_executable(pzip pzip.cxx)
   target_link_libraries(pzip panda)
 
@@ -45,7 +27,7 @@ if(HAVE_ZLIB)
   add_executable(punzip punzip.cxx)
   target_link_libraries(punzip panda)
 
-  install(TARGETS check_adler check_crc pzip punzip
+  install(TARGETS pzip punzip
     EXPORT Tools COMPONENT Tools
     DESTINATION ${CMAKE_INSTALL_BINDIR})
 endif()

panda/src/express/CMakeLists.txt

@@ -143,7 +143,7 @@ composite_sources(p3express P3EXPRESS_SOURCES)
 add_component_library(p3express SYMBOL BUILDING_PANDA_EXPRESS
   ${P3EXPRESS_SOURCES} ${P3EXPRESS_HEADERS})
 target_link_libraries(p3express p3pandabase p3dtoolconfig p3dtool
-  PKG::TAR PKG::ZLIB PKG::OPENSSL)
+  PKG::ZLIB PKG::OPENSSL)
 target_interrogate(p3express ALL EXTENSIONS ${P3EXPRESS_IGATEEXT})
 
 if(REPORT_OPENSSL_ERRORS)