Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[atliac-minitest] new port #37156

Merged
merged 38 commits into from
Mar 29, 2024
Merged

[atliac-minitest] new port #37156

merged 38 commits into from
Mar 29, 2024

Conversation

Atliac
Copy link
Contributor

@Atliac Atliac commented Mar 6, 2024

  • Changes comply with the maintainer guide.
  • The name of the port matches an existing name for this component on https://repology.org/ if possible, and/or is strongly associated with that component on search engines.
  • Optional dependencies are resolved in exactly one way. For example, if the component is built with CMake, all find_package calls are REQUIRED, are satisfied by vcpkg.json's declared dependencies, or disabled with CMAKE_DISABLE_FIND_PACKAGE_Xxx.
  • The versioning scheme in vcpkg.json matches what upstream says.
  • The license declaration in vcpkg.json matches what upstream says.
  • The installed as the "copyright" file matches what upstream says.
  • The source code of the component installed comes from an authoritative source.
  • The generated "usage text" is accurate. See adding-usage for context.
  • The version database is fixed by rerunning ./vcpkg x-add-version --all and committing the result.
  • Only one version is in the new port's versions file.
  • Only one version is added to each modified port's versions file.

@Atliac
Copy link
Contributor Author

Atliac commented Mar 6, 2024

@microsoft-github-policy-service agree

@FrankXie05 FrankXie05 added the category:new-port The issue is requesting a new library to be added; consider making a PR! label Mar 6, 2024
@FrankXie05
Copy link
Contributor

/azp run

Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@Atliac Atliac marked this pull request as draft March 8, 2024 13:52
@Atliac Atliac marked this pull request as ready for review March 8, 2024 15:42
@Atliac
Copy link
Contributor Author

Atliac commented Mar 17, 2024

Hi, what else do I need to do?

ports/minitest/portfile.cmake Outdated Show resolved Hide resolved
ports/minitest/portfile.cmake Outdated Show resolved Hide resolved
scripts/ci.baseline.txt Outdated Show resolved Hide resolved
versions/m-/minitest.json Outdated Show resolved Hide resolved
@FrankXie05
Copy link
Contributor

Note: I will be converting your PR to draft status. When you respond, please revert to "ready for review".
That way, I can be aware that you've responded since you can't modify the tags.

@FrankXie05 FrankXie05 marked this pull request as draft March 18, 2024 02:49
Co-authored-by: Frank <65999885+FrankXie05@users.noreply.github.com>
@Atliac Atliac marked this pull request as ready for review March 19, 2024 02:20
@Atliac Atliac marked this pull request as ready for review March 21, 2024 06:50
@Atliac Atliac changed the title [atkliac-minitest] new port [atliac-minitest] new port Mar 21, 2024
@Atliac
Copy link
Contributor Author

Atliac commented Mar 21, 2024

The port is renamed to atliac-minitest. Header file is installed in include/Atliac subdirectory. All other potential conflicts are prefixed with Atliac.

@Atliac Atliac marked this pull request as draft March 22, 2024 01:13
@Atliac Atliac marked this pull request as ready for review March 24, 2024 10:30
@Atliac Atliac requested a review from FrankXie05 March 27, 2024 07:19
FrankXie05
FrankXie05 previously approved these changes Mar 27, 2024
@FrankXie05 FrankXie05 added the info:reviewed Pull Request changes follow basic guidelines label Mar 27, 2024
Copy link
Member

@BillyONeal BillyONeal left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The generated usage text seems incorrect:

PS D:\vcpkg> .\vcpkg.exe install atliac-minitest
Computing installation plan...
A suitable version of cmake was not found (required v3.29.0) Downloading portable cmake 3.29.0...
Downloading cmake...
https://github.com/Kitware/CMake/releases/download/v3.29.0/cmake-3.29.0-windows-i386.zip->D:\vcpkg-downloads\cmake-3.29.0-windows-i386.zip
Downloading https://github.com/Kitware/CMake/releases/download/v3.29.0/cmake-3.29.0-windows-i386.zip
Extracting cmake...
The following packages will be built and installed:
    atliac-minitest:x64-windows@1.0.0
  * vcpkg-cmake:x64-windows@2023-05-04
  * vcpkg-cmake-config:x64-windows@2022-02-06#1
Additional packages (*) will be modified to complete this operation.
Detecting compiler hash for triplet x64-windows...
Compiler found: C:/Program Files/Microsoft Visual Studio/2022/Enterprise/VC/Tools/MSVC/14.39.33519/bin/Hostx64/x64/cl.exe
Restored 0 package(s) from C:\Users\bion\AppData\Local\vcpkg\archives in 1.26 ms. Use --debug to see more details.
Installing 1/3 vcpkg-cmake:x64-windows@2023-05-04...
Building vcpkg-cmake:x64-windows@2023-05-04...
-- Installing: D:/vcpkg/packages/vcpkg-cmake_x64-windows/share/vcpkg-cmake/vcpkg_cmake_configure.cmake
-- Installing: D:/vcpkg/packages/vcpkg-cmake_x64-windows/share/vcpkg-cmake/vcpkg_cmake_build.cmake
-- Installing: D:/vcpkg/packages/vcpkg-cmake_x64-windows/share/vcpkg-cmake/vcpkg_cmake_install.cmake
-- Installing: D:/vcpkg/packages/vcpkg-cmake_x64-windows/share/vcpkg-cmake/vcpkg-port-config.cmake
-- Installing: D:/vcpkg/packages/vcpkg-cmake_x64-windows/share/vcpkg-cmake/copyright
-- Performing post-build validation
Stored binaries in 1 destinations in 64.6 ms.
Elapsed time to handle vcpkg-cmake:x64-windows: 114 ms
vcpkg-cmake:x64-windows package ABI: 32dcc1ca2d06869cd900b89ad2e8551e2a7a3da397a00052a9ded082f32746c1
Installing 2/3 vcpkg-cmake-config:x64-windows@2022-02-06#1...
Building vcpkg-cmake-config:x64-windows@2022-02-06#1...
-- Installing: D:/vcpkg/packages/vcpkg-cmake-config_x64-windows/share/vcpkg-cmake-config/vcpkg_cmake_config_fixup.cmake
-- Installing: D:/vcpkg/packages/vcpkg-cmake-config_x64-windows/share/vcpkg-cmake-config/vcpkg-port-config.cmake
-- Installing: D:/vcpkg/packages/vcpkg-cmake-config_x64-windows/share/vcpkg-cmake-config/copyright
-- Performing post-build validation
Stored binaries in 1 destinations in 26.6 ms.
Elapsed time to handle vcpkg-cmake-config:x64-windows: 66.9 ms
vcpkg-cmake-config:x64-windows package ABI: e1d6cc3158f9052fc69a659487ca8259728b6ed72801252fc91a1d65e91366a9
Installing 3/3 atliac-minitest:x64-windows@1.0.0...
Building atliac-minitest:x64-windows@1.0.0...
-- Downloading https://github.com/Atliac/minitest/archive/v1.0.0.tar.gz -> Atliac-minitest-v1.0.0.tar.gz...
-- Extracting source D:/vcpkg-downloads/Atliac-minitest-v1.0.0.tar.gz
-- Using source at D:/vcpkg/buildtrees/atliac-minitest/src/v1.0.0-b4d715cdbb.clean
-- Configuring x64-windows
-- Building x64-windows-dbg
-- Building x64-windows-rel
-- Installing: D:/vcpkg/packages/atliac-minitest_x64-windows/share/atliac-minitest/copyright
-- Performing post-build validation
Stored binaries in 1 destinations in 393 ms.
Elapsed time to handle atliac-minitest:x64-windows: 8.7 s
atliac-minitest:x64-windows package ABI: 6dc11694e7606b855d5395991b6520550d8f3f617280e8a3d334889778fd311d
Total install time: 8.9 s
minitest provides CMake targets:

    find_package(atliac-minitest CONFIG REQUIRED)
    minitest_discover_tests(target)

PS D:\vcpkg> type D:\test\CMakeLists.txt
cmake_minimum_required(VERSION 3.28)

project(test)

add_executable(target test.cpp)
find_package(atliac-minitest CONFIG REQUIRED)
minitest_discover_tests(target)
PS D:\vcpkg> type D:\test\test.cpp
#include <Atliac/minitest.h>

int main() {

}
PS D:\vcpkg>

#####################

**********************************************************************
** Visual Studio 2022 Developer Command Prompt v17.9.5
** Copyright (c) 2022 Microsoft Corporation
**********************************************************************

C:\Program Files\Microsoft Visual Studio\2022\Enterprise>d:

D:\>cmake -G Ninja "-DCMAKE_TOOLCHAIN_FILE=D:/vcpkg/scripts/buildsystems/vcpkg.cmake" -S D:\test -B D:\testbuild
-- The C compiler identification is MSVC 19.39.33523.0
-- The CXX compiler identification is MSVC 19.39.33523.0
-- Detecting C compiler ABI info
-- Detecting C compiler ABI info - done
-- Check for working C compiler: C:/Program Files/Microsoft Visual Studio/2022/Enterprise/VC/Tools/MSVC/14.39.33519/bin/Hostx86/x86/cl.exe - skipped
-- Detecting C compile features
-- Detecting C compile features - done
-- Detecting CXX compiler ABI info
-- Detecting CXX compiler ABI info - done
-- Check for working CXX compiler: C:/Program Files/Microsoft Visual Studio/2022/Enterprise/VC/Tools/MSVC/14.39.33519/bin/Hostx86/x86/cl.exe - skipped
-- Detecting CXX compile features
-- Detecting CXX compile features - done
CMake Error at D:/vcpkg/scripts/buildsystems/vcpkg.cmake:859 (_find_package):
  Could not find a package configuration file provided by "atliac-minitest"
  with any of the following names:

    atliac-minitestConfig.cmake
    atliac-minitest-config.cmake

  Add the installation prefix of "atliac-minitest" to CMAKE_PREFIX_PATH or
  set "atliac-minitest_DIR" to a directory containing one of the above files.
  If "atliac-minitest" provides a separate development package or SDK, be
  sure it has been installed.
Call Stack (most recent call first):
  CMakeLists.txt:6 (find_package)


-- Configuring incomplete, errors occurred!

D:\>

@BillyONeal
Copy link
Member

Please press 'ready for review' when this works; everything else here looks great, thanks!

@BillyONeal BillyONeal marked this pull request as draft March 27, 2024 20:23
@BillyONeal BillyONeal removed info:reviewed Pull Request changes follow basic guidelines requires:vcpkg-team-review This PR or issue requires someone on the vcpkg team to take a further look. labels Mar 27, 2024
@Atliac
Copy link
Contributor Author

Atliac commented Mar 28, 2024

@BillyONeal The generated usage is correct. I've created a test repository minitest_port_test, which passes .github/workflows/atliac-minitest_port_test.yaml.

While I did update the usage, it just provides more info.

Could you test it again, please!

@Atliac Atliac requested a review from BillyONeal March 28, 2024 05:56
@Atliac Atliac marked this pull request as ready for review March 28, 2024 05:56
@BillyONeal
Copy link
Member

:sigh: I made a stupid mistake and built the port for x64 but tried to test from x86. (And it looked like there was not the right config file but I missed it somehow)

@BillyONeal BillyONeal added the info:reviewed Pull Request changes follow basic guidelines label Mar 29, 2024
@BillyONeal BillyONeal merged commit 05d8ab6 into microsoft:master Mar 29, 2024
16 checks passed
@BillyONeal
Copy link
Member

Thanks for the new port, sorry for fat fingering the test!

@Atliac Atliac deleted the minitest branch March 29, 2024 10:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
category:new-port The issue is requesting a new library to be added; consider making a PR! info:reviewed Pull Request changes follow basic guidelines
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants