From 47d206e149e88201333b5ca8fe55c30e2b1a8177 Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Fri, 21 Jun 2019 04:11:54 +0200 Subject: [many ports] improvements for linux/wsl (#6730) * [many ports] improve compatibility with WSL and mixed case filesystems * [treehopper] express dependency on libusb, which was not working on non-win32 platforms and is still broken there * [libharu] add compatibility with non-win32 platforms * [geogram] fix openblas on linux [clapack] better integration with linux environment [visit-struct] put cmake config file in the expected folder [geogram] remove trailing underscore to enable compatibility with OpenBLAS * [openblas] playing with underscore, without success * [openblas/lapack] fix library integration * [clapack] improve target handling in cmake module * [openblas] promote self-generated config to default cmake module, otherwise internal ones thinks wrongly that openblas can also solve lapack libs * [clapack,openblas] improve libraries integration * [many ports] fix cmake unnecessary target paths, wrong config paths, empty default dependencies, unnecessary [core] tags * [suitesparse] improve integration with new lapack/openblas mechanism * [suitesparse] add no underscore postfix also for linux * [ceres] fix integration with newer openblas/lapack configs * [aws-c-event-stream] fix regression * [systemc] fix regression * [libwebp,geogram] trigger rebuild * [libwebp,pthread4w] fix regressions * [glbinding] fix cmake module installation * [globjects] disentangle unnecessary dependency from qt5 * [jasper] remove broken and unnecessary patches * [libwebp] fix regression * [many ports] avoid using BUILD_SHARED_LIBS which is uninitialized in port files * [clapack] correctly find dlls * [clapack] use a generic blas as dependency * [fizz,g2o] restore expected version * fix mistake * [many ports] remove WIN32, APPLE and UNIX (again, they keep creeping in) from ports since they are broken and usually break non-win32 ports * [libressl,openssl] do not try to build one if the other is already installed * [itk] update ref and patch to avoid regression * [libressl,openssl] implement full strategy to fix CI * [libwebp] disable components that are broken on macOS * [ogre] enable macOS build * [freeimage,jxrlib,ogre,openexr,protobuf] port patches from #5169 * [ogre] add missing install command * [ffmpeg] enable wrapper for cmake module * [ffmpeg] add avresample module finder * [ffmpeg] improve module detection and exported symbols * [ffmpeg] add variables to cache * [thrift] remove unnecessary build option * [allegro5] fix shared/static inversion * [protobuf] cleanup * [libressl] cleanup * [moos-core] cleanup * commented features must not be separated from other features, otherwise vcpkg complains * [itk] fix regression * [shogun,itk] fix regressions * [ogre] fix regression * [opusfile] add compatibility with non-win32 * [itk] fix regression * [sndfile,libsndfile] remove duplicate, redirect sndfile to libsndfile * add missing dependencies * [ismrmrd] fix regression * [ffmpeg] trigger rebuild * [clapack,openblas,libogg] fix regressions on macOS * [libtins] fix regression * force rebuild windows regressions, unable to reproduce locally * [mosquitto] enable non-win32 builds * [json-dto] force rebuild, unable to reproduce regression locally * [many ports] uniform naming and path length requests * fix regression * fix regression * [ffmpeg] fixes for downstream projects * clean up - thanks to reviewers * trigger rebuild of regressions on macOS * trigger rebuild of regressions on macOS - part2 * Add core back * Use VCPKG_CONCURRENCY * Add core back to suitesparse * Add core back to curl * Add core back to magnum * Add core back to magnum * Add core back to magnum * Add core back to cgal --- ports/angelscript/CONTROL | 4 ++-- ports/angelscript/portfile.cmake | 24 ++---------------------- 2 files changed, 4 insertions(+), 24 deletions(-) (limited to 'ports/angelscript') 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 = -# 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) -- cgit v1.2.3 From 0a033250c7dd3f4013248216e259548693b8cc8c Mon Sep 17 00:00:00 2001 From: Adam Martin Date: Fri, 16 Aug 2019 00:47:14 -0500 Subject: Added feature to optionally install all Angelscript standard addons (#7650) --- ports/angelscript/CONTROL | 5 ++++- ports/angelscript/portfile.cmake | 8 ++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) (limited to 'ports/angelscript') diff --git a/ports/angelscript/CONTROL b/ports/angelscript/CONTROL index 7315b1a90..103dda42e 100644 --- a/ports/angelscript/CONTROL +++ b/ports/angelscript/CONTROL @@ -1,3 +1,6 @@ Source: angelscript -Version: 2.33.0-1 +Version: 2.33.1-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. + +Feature: addons +Description: Installs all addons for use in compiling scripts addons diff --git a/ports/angelscript/portfile.cmake b/ports/angelscript/portfile.cmake index f6521df29..3aea242b5 100644 --- a/ports/angelscript/portfile.cmake +++ b/ports/angelscript/portfile.cmake @@ -28,3 +28,11 @@ 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) + +# Copy the addon files +if("addons" IN_LIST FEATURES) + file(INSTALL ${SOURCE_PATH}/add_on/ DESTINATION ${CURRENT_PACKAGES_DIR}/include/angelscript FILES_MATCHING PATTERN "*.h" PATTERN "*.cpp") +endif() + +# Post-build test for cmake libraries +# vcpkg_test_cmake(PACKAGE_NAME angelscript) -- cgit v1.2.3 From 726c11148105a97aef39bec024fdb7c140b1b154 Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Mon, 7 Oct 2019 19:35:13 +0200 Subject: [vcpkg] fatal_error when patch fails to apply (#8087) vcpkg will now fail on failure to apply patches except when using `--head`. --- ports/angelscript/CONTROL | 12 ++--- ports/angelscript/LICENSE | 26 +++++------ ports/angelscript/mark-threads-private.patch | 26 +++++------ ports/angelscript/portfile.cmake | 69 +++++++++++++--------------- 4 files changed, 63 insertions(+), 70 deletions(-) (limited to 'ports/angelscript') diff --git a/ports/angelscript/CONTROL b/ports/angelscript/CONTROL index 103dda42e..9a8ab2440 100644 --- a/ports/angelscript/CONTROL +++ b/ports/angelscript/CONTROL @@ -1,6 +1,6 @@ -Source: angelscript -Version: 2.33.1-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. - -Feature: addons -Description: Installs all addons for use in compiling scripts addons +Source: angelscript +Version: 2.33.1-2 +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. + +Feature: addons +Description: Installs all addons for use in compiling scripts addons diff --git a/ports/angelscript/LICENSE b/ports/angelscript/LICENSE index 27105b90d..ea549c6e6 100644 --- a/ports/angelscript/LICENSE +++ b/ports/angelscript/LICENSE @@ -1,13 +1,13 @@ -AngelCode Scripting Library - -Copyright © 2003-2018 Andreas Jönsson - -This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software. - -Permission is granted to anyone to use this software for any purpose, including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions: - - The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. - - Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. - - This notice may not be removed or altered from any source distribution. +AngelCode Scripting Library + +Copyright © 2003-2018 Andreas Jönsson + +This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software. + +Permission is granted to anyone to use this software for any purpose, including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions: + + The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. + + Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. + + This notice may not be removed or altered from any source distribution. diff --git a/ports/angelscript/mark-threads-private.patch b/ports/angelscript/mark-threads-private.patch index 567c19aa1..aaf28b437 100644 --- a/ports/angelscript/mark-threads-private.patch +++ b/ports/angelscript/mark-threads-private.patch @@ -1,13 +1,13 @@ -diff --git a/angelscript/projects/cmake/CMakeLists.txt b/angelscript/projects/cmake/CMakeLists.txt -index 7c800c5..982ad8b 100644 ---- a/angelscript/projects/cmake/CMakeLists.txt -+++ b/angelscript/projects/cmake/CMakeLists.txt -@@ -145,7 +145,7 @@ endif() - - # Don't override the default library output path to avoid conflicts when building for multiple target platforms - #set(LIBRARY_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/../../lib) --target_link_libraries(${ANGELSCRIPT_LIBRARY_NAME} Threads::Threads) -+target_link_libraries(${ANGELSCRIPT_LIBRARY_NAME} PRIVATE Threads::Threads) - - set_target_properties(${ANGELSCRIPT_LIBRARY_NAME} PROPERTIES VERSION ${PROJECT_VERSION}) - +diff --git a/angelscript/projects/cmake/CMakeLists.txt b/angelscript/projects/cmake/CMakeLists.txt +index 7c800c5..982ad8b 100644 +--- a/angelscript/projects/cmake/CMakeLists.txt ++++ b/angelscript/projects/cmake/CMakeLists.txt +@@ -145,7 +145,7 @@ endif() + + # Don't override the default library output path to avoid conflicts when building for multiple target platforms + #set(LIBRARY_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/../../lib) +-target_link_libraries(${ANGELSCRIPT_LIBRARY_NAME} Threads::Threads) ++target_link_libraries(${ANGELSCRIPT_LIBRARY_NAME} PRIVATE Threads::Threads) + + set_target_properties(${ANGELSCRIPT_LIBRARY_NAME} PROPERTIES VERSION ${PROJECT_VERSION}) + diff --git a/ports/angelscript/portfile.cmake b/ports/angelscript/portfile.cmake index 3aea242b5..416b3b408 100644 --- a/ports/angelscript/portfile.cmake +++ b/ports/angelscript/portfile.cmake @@ -1,38 +1,31 @@ -include(vcpkg_common_functions) - -vcpkg_download_distfile(ARCHIVE - URLS "https://www.angelcode.com/angelscript/sdk/files/angelscript_2.33.0.zip" - FILENAME "angelscript_2.33.0.zip" - SHA512 eaf972ecf965fe4f72e55755f5e796499018e918f93cfd835b1ca20f9338e299e8dbd707240341eef81ae920f07d2280646151f515f5990a62550689445c86f0 -) - -vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH SOURCE_PATH - ARCHIVE ${ARCHIVE} - PATCHES - mark-threads-private.patch -) - -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH}/angelscript/projects/cmake - PREFER_NINJA # Disable this option if project cannot be built with Ninja - # OPTIONS -DUSE_THIS_IN_ALL_BUILDS=1 -DUSE_THIS_TOO=2 - # OPTIONS_RELEASE -DOPTIMIZE=1 - # OPTIONS_DEBUG -DDEBUGGABLE=1 -) - -vcpkg_install_cmake() - -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -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) - -# Copy the addon files -if("addons" IN_LIST FEATURES) - file(INSTALL ${SOURCE_PATH}/add_on/ DESTINATION ${CURRENT_PACKAGES_DIR}/include/angelscript FILES_MATCHING PATTERN "*.h" PATTERN "*.cpp") -endif() - -# Post-build test for cmake libraries -# vcpkg_test_cmake(PACKAGE_NAME angelscript) +include(vcpkg_common_functions) + +vcpkg_download_distfile(ARCHIVE + URLS "https://www.angelcode.com/angelscript/sdk/files/angelscript_2.33.0.zip" + FILENAME "angelscript_2.33.0.zip" + SHA512 eaf972ecf965fe4f72e55755f5e796499018e918f93cfd835b1ca20f9338e299e8dbd707240341eef81ae920f07d2280646151f515f5990a62550689445c86f0 +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + PATCHES + mark-threads-private.patch +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH}/angelscript/projects/cmake + PREFER_NINJA +) + +vcpkg_install_cmake() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/Angelscript) + +# Copy the addon files +if("addons" IN_LIST FEATURES) + file(INSTALL ${SOURCE_PATH}/add_on/ DESTINATION ${CURRENT_PACKAGES_DIR}/include/angelscript FILES_MATCHING PATTERN "*.h" PATTERN "*.cpp") +endif() + +file(INSTALL ${CURRENT_PORT_DIR}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) -- cgit v1.2.3 From a295883387a6079659d4f324e19fba9bfb4ae2a7 Mon Sep 17 00:00:00 2001 From: wangli28 Date: Wed, 9 Oct 2019 05:45:02 +0000 Subject: [angelscript] Upgrade to version 2.34.0 --- ports/angelscript/CONTROL | 2 +- ports/angelscript/portfile.cmake | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'ports/angelscript') diff --git a/ports/angelscript/CONTROL b/ports/angelscript/CONTROL index 9a8ab2440..4ec91f2bb 100644 --- a/ports/angelscript/CONTROL +++ b/ports/angelscript/CONTROL @@ -1,5 +1,5 @@ Source: angelscript -Version: 2.33.1-2 +Version: 2.34.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. Feature: addons diff --git a/ports/angelscript/portfile.cmake b/ports/angelscript/portfile.cmake index 416b3b408..c5b2e2ecb 100644 --- a/ports/angelscript/portfile.cmake +++ b/ports/angelscript/portfile.cmake @@ -1,9 +1,9 @@ include(vcpkg_common_functions) vcpkg_download_distfile(ARCHIVE - URLS "https://www.angelcode.com/angelscript/sdk/files/angelscript_2.33.0.zip" - FILENAME "angelscript_2.33.0.zip" - SHA512 eaf972ecf965fe4f72e55755f5e796499018e918f93cfd835b1ca20f9338e299e8dbd707240341eef81ae920f07d2280646151f515f5990a62550689445c86f0 + URLS "http://angelcode.com/angelscript/sdk/files/angelscript_2.34.0.zip" + FILENAME "angelscript_2.34.0.zip" + SHA512 c26dba452ab52c300da9c95fde8398acf4840cbc0e653ededf978d4a3e942cfe5b77292c74c49dc0279250a27cfd324c696c49d139a97c844b2a1eead9aae2f4 ) vcpkg_extract_source_archive_ex( -- cgit v1.2.3 From 523ae16f3912aa1fe8367a5bbf81da33dc4a8a04 Mon Sep 17 00:00:00 2001 From: wangli28 Date: Thu, 10 Oct 2019 02:45:43 +0000 Subject: [angelscript] Upgrade to version 2.34.0 --- ports/angelscript/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ports/angelscript') diff --git a/ports/angelscript/portfile.cmake b/ports/angelscript/portfile.cmake index c5b2e2ecb..c0d41d948 100644 --- a/ports/angelscript/portfile.cmake +++ b/ports/angelscript/portfile.cmake @@ -1,7 +1,7 @@ include(vcpkg_common_functions) vcpkg_download_distfile(ARCHIVE - URLS "http://angelcode.com/angelscript/sdk/files/angelscript_2.34.0.zip" + URLS "https://angelcode.com/angelscript/sdk/files/angelscript_2.34.0.zip" FILENAME "angelscript_2.34.0.zip" SHA512 c26dba452ab52c300da9c95fde8398acf4840cbc0e653ededf978d4a3e942cfe5b77292c74c49dc0279250a27cfd324c696c49d139a97c844b2a1eead9aae2f4 ) -- cgit v1.2.3