From 3864f7b0c34b67e7ffd19e34eb4d465aca24066e Mon Sep 17 00:00:00 2001 From: myd7349 Date: Wed, 20 May 2020 05:34:08 +0800 Subject: [PATCH] [munit] Add new port (#6780) * [munit] Add new port * [munit] Modernize * [muint] Update to 2020-04-06 * [munit] Update CI baseline * [munit] Update CI baseline * [munit] Fail fast * [munit] Download meson on linux and osx * [vcpkg_find_acquire_program] Always download meson if not found * Revert "[munit] Download meson on linux and osx" This reverts commit e7e17730d40e1b8a11a12c2bb28340a72247dce0. Co-authored-by: wangli28 --- ports/munit/CONTROL | 5 +++++ ports/munit/fix-install.patch | 13 +++++++++++++ ports/munit/portfile.cmake | 25 +++++++++++++++++++++++++ scripts/ci.baseline.txt | 8 ++++++++ 4 files changed, 51 insertions(+) create mode 100644 ports/munit/CONTROL create mode 100644 ports/munit/fix-install.patch create mode 100644 ports/munit/portfile.cmake diff --git a/ports/munit/CONTROL b/ports/munit/CONTROL new file mode 100644 index 0000000000..8e1bb2e23c --- /dev/null +++ b/ports/munit/CONTROL @@ -0,0 +1,5 @@ +Source: munit +Version: 2019-04-06 +Description: A small but full-featured unit testing framework for C +Supports: !(arm|arm64|uwp) +Homepage: https://github.com/nemequ/munit diff --git a/ports/munit/fix-install.patch b/ports/munit/fix-install.patch new file mode 100644 index 0000000000..6ba7461ada --- /dev/null +++ b/ports/munit/fix-install.patch @@ -0,0 +1,13 @@ +diff --git a/meson.build b/meson.build +index c15b405..44ee737 100644 +--- a/meson.build ++++ b/meson.build +@@ -11,7 +11,7 @@ root_include = include_directories('.') + + munit = library('munit', + ['munit.c'], +- install: meson.is_subproject()) ++ install: not meson.is_subproject()) + + if meson.is_subproject() + munit_dep = declare_dependency( diff --git a/ports/munit/portfile.cmake b/ports/munit/portfile.cmake new file mode 100644 index 0000000000..bd45959308 --- /dev/null +++ b/ports/munit/portfile.cmake @@ -0,0 +1,25 @@ +vcpkg_fail_port_install(ON_ARCH "arm" "arm64" ON_TARGET "uwp") + +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO nemequ/munit + REF da8f73412998e4f1adf1100dc187533a51af77fd + SHA512 cd08c1291a73487f15fdba7bf8675fea9177f0ec9766900f65efb5f00c662532a16499447e9087d304de34ff9138f47d04ebf18713f5aa8aacede22c5e23b98b + HEAD_REF master + PATCHES + fix-install.patch +) + +vcpkg_configure_meson( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + --backend=ninja +) + +vcpkg_install_meson() + +vcpkg_copy_pdbs() + +file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 9a46bf00fa..895cf33278 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1173,6 +1173,14 @@ msmpi:arm-uwp=fail msmpi:x64-linux=fail msmpi:x64-osx=fail msmpi:x64-uwp=fail +munit:arm-uwp=fail +munit:arm64-windows=fail +munit:x64-uwp=fail +# Though `vcpkg_configure_meson` and `vcpkg_install_meson` support +# `x64-linux` and `x64-osx` now, it still failed on these targets. +# See: https://github.com/microsoft/vcpkg/pull/6780 +munit:x64-linux=fail +munit:x64-osx=fail muparser:arm-uwp=fail muparser:x64-uwp=fail murmurhash:arm-uwp=fail