From 3130272edc5a11e4c69b7c3aa162a91840e4997b Mon Sep 17 00:00:00 2001 From: Sebastien Vincent Date: Thu, 20 Dec 2018 08:06:08 +0100 Subject: [PATCH] [build] Removes miniupnpc vcpkg port as it is available upstream. --- BUILD.md | 1 - appveyor.yml | 1 - third-party/vcpkg/ports/miniupnpc/CONTROL | 3 -- .../vcpkg/ports/miniupnpc/portfile.cmake | 45 ------------------- 4 files changed, 50 deletions(-) delete mode 100644 third-party/vcpkg/ports/miniupnpc/CONTROL delete mode 100644 third-party/vcpkg/ports/miniupnpc/portfile.cmake diff --git a/BUILD.md b/BUILD.md index 51a0d51d..2ed3529e 100644 --- a/BUILD.md +++ b/BUILD.md @@ -29,7 +29,6 @@ git clone https://github.com/Microsoft/vcpkg.git cd vcpkg .\bootstrap-vcpkg.bat vcpkg integrate install -xcopy /I ..\freelan\third-party\vcpkg\ports\miniupnpc .\ports\miniupnpc vcpkg install boost miniupnpc libiconv openssl curl --triplet x64-windows-static vcpkg install boost miniupnpc libiconv openssl curl --triplet x86-windows-static ``` diff --git a/appveyor.yml b/appveyor.yml index 881a5935..8f6982a0 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -23,7 +23,6 @@ init: install: - cinst cmake - - xcopy /I third-party\vcpkg\ports\miniupnpc c:\tools\vcpkg\ports\miniupnpc # Install python wheels, necessary to install SCons via pip - python -m pip install wheel # Install SCons diff --git a/third-party/vcpkg/ports/miniupnpc/CONTROL b/third-party/vcpkg/ports/miniupnpc/CONTROL deleted file mode 100644 index 2760de96..00000000 --- a/third-party/vcpkg/ports/miniupnpc/CONTROL +++ /dev/null @@ -1,3 +0,0 @@ -Source: miniupnpc -Version: 2.0 -Description: The MiniUPnP project offers software which supports the UPnP Internet Gateway Device (IGD) specifications. NAT-PMP and PCP support was added to MiniUPnPd. For client side NAT-PMP support, use libnatpmp. diff --git a/third-party/vcpkg/ports/miniupnpc/portfile.cmake b/third-party/vcpkg/ports/miniupnpc/portfile.cmake deleted file mode 100644 index 2dd9a53c..00000000 --- a/third-party/vcpkg/ports/miniupnpc/portfile.cmake +++ /dev/null @@ -1,45 +0,0 @@ -# Common Ambient Variables: -# CURRENT_BUILDTREES_DIR = ${VCPKG_ROOT_DIR}\buildtrees\${PORT} -# CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET} -# CURRENT_PORT_DIR = ${VCPKG_ROOT_DIR}\ports\${PORT} -# PORT = current port name (zlib, etc) -# TARGET_TRIPLET = current triplet (x86-windows, x64-windows-static, etc) -# VCPKG_CRT_LINKAGE = C runtime linkage type (static, dynamic) -# VCPKG_LIBRARY_LINKAGE = target library linkage type (static, dynamic) -# VCPKG_ROOT_DIR = -# VCPKG_TARGET_ARCHITECTURE = target architecture (x64, x86, arm) -# - -include(vcpkg_common_functions) -set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/miniupnp-miniupnpd_2_0/miniupnpc) -vcpkg_download_distfile(ARCHIVE - URLS "https://github.com/miniupnp/miniupnp/archive/miniupnpd_2_0.zip" - FILENAME "miniupnpc-2.0.zip" - SHA512 cbab65f2aee299c710342fdb52c9f3c13d204ff51e73cd7dcb18a445e3255656c12d36a022d2510b15cc9280f6fb41c533a43dc2946fa44c78a6a75f04a506e1 -) -vcpkg_extract_source_archive(${ARCHIVE}) - -if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - OPTIONS -DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=TRUE - PREFER_NINJA # Disable this option if project cannot be built with Ninja -) -elseif (VCPKG_LIBRARY_LINKAGE STREQUAL static) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - OPTIONS -DUPNPC_BUILD_SHARED=OFF - PREFER_NINJA # Disable this option if project cannot be built with Ninja -) -endif() - -vcpkg_install_cmake() - -# Remove duplicate directories -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) - -# Copy PDB file -vcpkg_copy_pdbs() - -# Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/miniupnpc RENAME copyright)