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

[New Port] Add Xqilla port #23020

Merged
merged 19 commits into from
Feb 18, 2022
Merged

[New Port] Add Xqilla port #23020

merged 19 commits into from
Feb 18, 2022

Conversation

pierrebizz
Copy link
Contributor

A port of XQilla - an xpath 2.0 parser from http://xqilla.sourceforge.net/HomePage

  • Which triplets are supported/not supported? Have you updated the CI baseline?

    ,

  • Does your PR follow the maintainer guide?

    Yes

  • If you have added/updated a port: Have you run ./vcpkg x-add-version --all and committed the result?

ports/xqilla/CMakeLists.txt Outdated Show resolved Hide resolved
ports/xqilla/vcpkg.json Outdated Show resolved Hide resolved
@JonLiu1993 JonLiu1993 changed the title New Port: Xqilla [New Port] Add Xqilla port Feb 10, 2022
@JonLiu1993 JonLiu1993 self-assigned this Feb 10, 2022
@JonLiu1993 JonLiu1993 added the category:new-port The issue is requesting a new library to be added; consider making a PR! label Feb 10, 2022
ports/xqilla/vcpkg.json Outdated Show resolved Hide resolved
ports/xqilla/portfile.cmake Outdated Show resolved Hide resolved
@JonLiu1993
Copy link
Member

@pierrebizz ,Could you use MSbuild to re-add the port?

  • I noticed that Win32Projects and configure are provided upstream,
  • The cmake we wrote ourselves may not match the upstream,

@pierrebizz
Copy link
Contributor Author

pierrebizz commented Feb 11, 2022

@JonLiu1993 : What do you mean by Could you use MSbuild to re-add the port?
Do I do that by adding the WINDOWS_USE_MSBUILD flag to vckpg_cmake_configure ?

Comment on lines 19 to 28
vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
NO_CHARSET_FLAG
WINDOWS_USE_MSBUILD
GENERATOR Ninja
OPTIONS
${COMPILE_OPTIONS}
)

vcpkg_cmake_install()
Copy link
Contributor

Choose a reason for hiding this comment

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

if (VCPKG_TARGET_IS_WINDOWS)
    vcpkg_install_msbuild(
        SOURCE_PATH "${SOURCE_PATH}/Win32Projects/VC14"
        ....
    )
else()
    vcpkg_configure_make(
        SOURCE_PATH "${SOURCE_PATH}"
        OPTIONS
            ...
    )
    vcpkg_install_make()
endif()

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I'm pretty sure this would not work, as XQilla does not provide targets that would be compatible with x64-windows-static. It provides a static solution that links dynamically with the runtime library

Copy link
Contributor Author

Choose a reason for hiding this comment

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

The xqlilla.vcxproj references xerces-c as a relative path that is not reflected in the vcpkg build; I think it would be simpler to keep using the CMakeLists.

Copy link
Contributor

Choose a reason for hiding this comment

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

  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration" >
    <ConfigurationType>DynamicLibrary</ConfigurationType>
    <UseOfMfc>false</UseOfMfc>
    <CharacterSet>MultiByte</CharacterSet>
    <PlatformToolset>v140</PlatformToolset>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Static Debug|Win32'" Label="Configuration" >
    <ConfigurationType>StaticLibrary</ConfigurationType>
    <UseOfMfc>false</UseOfMfc>
    <CharacterSet>MultiByte</CharacterSet>
    <PlatformToolset>v140</PlatformToolset>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration" >
    <ConfigurationType>DynamicLibrary</ConfigurationType>
    <UseOfMfc>false</UseOfMfc>
    <CharacterSet>MultiByte</CharacterSet>
    <PlatformToolset>v140</PlatformToolset>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Static Release|Win32'" Label="Configuration" >
    <ConfigurationType>StaticLibrary</ConfigurationType>
    <UseOfMfc>false</UseOfMfc>
    <CharacterSet>MultiByte</CharacterSet>
    <PlatformToolset>v140</PlatformToolset>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration" >
    <ConfigurationType>DynamicLibrary</ConfigurationType>
    <UseOfMfc>false</UseOfMfc>
    <CharacterSet>MultiByte</CharacterSet>
    <PlatformToolset>v140</PlatformToolset>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Static Debug|x64'" Label="Configuration" >
    <ConfigurationType>StaticLibrary</ConfigurationType>
    <UseOfMfc>false</UseOfMfc>
    <CharacterSet>MultiByte</CharacterSet>
    <PlatformToolset>v140</PlatformToolset>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration" >
    <ConfigurationType>DynamicLibrary</ConfigurationType>
    <UseOfMfc>false</UseOfMfc>
    <CharacterSet>MultiByte</CharacterSet>
    <PlatformToolset>v140</PlatformToolset>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Static Release|x64'" Label="Configuration" >

I think we can accpet the cmake method but we should review the CMakeLists.txt futher.

@JonLiu1993 JonLiu1993 added info:reviewed Pull Request changes follow basic guidelines and removed requires:author-response labels Feb 18, 2022
@vicroms vicroms merged commit d929fb3 into microsoft:master Feb 18, 2022
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.

5 participants