Merge branch 'master' of https://github.com/Microsoft/vcpkg into openssl-version-bump

2 files changed, 4 insertions, 24 deletions

diff --git a/ports/angelscript/CONTROL b/ports/angelscript/CONTROL
index 7c12ea845..7315b1a90 100644
--- a/ports/angelscript/CONTROL
+++ b/ports/angelscript/CONTROL
@@ -1,3 +1,3 @@
 Source: angelscript

-Version: 2.33.0

-Description: The AngelCode Scripting Library, or AngelScript as it is also known, is an extremely flexible cross-platform scripting library designed to allow applications to extend their functionality through external scripts. It has been designed from the beginning to be an easy to use component, both for the application programmer and the script writer. 

+Version: 2.33.0-1

+Description: The AngelCode Scripting Library, or AngelScript as it is also known, is an extremely flexible cross-platform scripting library designed to allow applications to extend their functionality through external scripts. It has been designed from the beginning to be an easy to use component, both for the application programmer and the script writer.

diff --git a/ports/angelscript/portfile.cmake b/ports/angelscript/portfile.cmake
index 18128d220..f6521df29 100644
--- a/ports/angelscript/portfile.cmake
+++ b/ports/angelscript/portfile.cmake
@@ -1,15 +1,3 @@
-# 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            = <C:\path\to\current\vcpkg>

-#   VCPKG_TARGET_ARCHITECTURE = target architecture (x64, x86, arm)

-#

-

 include(vcpkg_common_functions)

 

 vcpkg_download_distfile(ARCHIVE

@@ -20,14 +8,9 @@ vcpkg_download_distfile(ARCHIVE
 

 vcpkg_extract_source_archive_ex(

     OUT_SOURCE_PATH SOURCE_PATH

-    ARCHIVE ${ARCHIVE} 

-    # (Optional) A friendly name to use instead of the filename of the archive (e.g.: a version number or tag).

-    # REF 1.0.0

-    # (Optional) Read the docs for how to generate patches at: 

-    # https://github.com/Microsoft/vcpkg/blob/master/docs/examples/patching.md

+    ARCHIVE ${ARCHIVE}

     PATCHES

        mark-threads-private.patch

-    #   002_more_port_fixes.patch

 )

 

 vcpkg_configure_cmake(

@@ -41,10 +24,7 @@ vcpkg_configure_cmake(
 vcpkg_install_cmake()

 

 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)

-vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/Angelscript")

+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/Angelscript)

 

 # Handle copyright

 file(INSTALL ${CURRENT_PORT_DIR}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/angelscript RENAME copyright)

-

-# Post-build test for cmake libraries

-# vcpkg_test_cmake(PACKAGE_NAME angelscript)