Skip to content

[baseline] fix tidy-html5 #23566

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.

Sign up for GitHub

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

Merged
dan-shaw merged 5 commits into from
Mar 16, 2022
Merged

[baseline] fix tidy-html5 #23566

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
805e309
fix tidy-html5 in CI
Mar 15, 2022
8b0e0d8
version stuff
Mar 15, 2022
4f34aaf
version stuff
Mar 15, 2022
cd5725c
copy to share/${PORT}
Neumann-A Mar 15, 2022
dd02f34
version stuff
Neumann-A Mar 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 11 additions & 18 deletions ports/tidy-html5/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,35 +8,28 @@ vcpkg_from_github(
HEAD_REF master
)

vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
NO_CHARSET_FLAG
OPTIONS
-DBUILD_SHARED_LIB=OFF
-DTIDY_CONSOLE_SHARED=OFF
)
vcpkg_add_to_path("${CURRENT_HOST_INSTALLED_DIR}/tools/libxslt/bin")
vcpkg_cmake_install()

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

file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/tidyd.exe)
file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/tidyd)
file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/tidy-html5)
file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/bin/tidyd.exe")
file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/bin/tidyd")

if(VCPKG_TARGET_IS_WINDOWS)
file(RENAME ${CURRENT_PACKAGES_DIR}/bin/tidy.exe ${CURRENT_PACKAGES_DIR}/tools/tidy-html5/tidy.exe)
else()
file(RENAME ${CURRENT_PACKAGES_DIR}/bin/tidy ${CURRENT_PACKAGES_DIR}/tools/tidy-html5/tidy)
endif()
vcpkg_copy_tools(TOOL_NAMES tidy AUTO_CLEAN)

if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
endif()

vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT})

file(INSTALL ${SOURCE_PATH}/README/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/tidy-html5 RENAME copyright)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
file(INSTALL "${SOURCE_PATH}/README/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/tidy-html5" RENAME copyright)
Comment thread
Neumann-A marked this conversation as resolved.
Outdated
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")

vcpkg_fixup_pkgconfig()
17 changes: 14 additions & 3 deletions ports/tidy-html5/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,18 @@
{
"name": "tidy-html5",
"version-string": "5.7.28",
"port-version": 4,
"version": "5.7.28",
"port-version": 5,
"description": "Tidy tidies HTML and XML. It can tidy your documents by itself, and developers can easily integrate its features into even more powerful tools.",
"homepage": "https://github.com/htacg/tidy-html5"
"homepage": "https://github.com/htacg/tidy-html5",
"license": null,
"dependencies": [
{
"name": "libxslt",
"host": true
},
{
"name": "vcpkg-cmake",
"host": true
}
]
}
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6886,7 +6886,7 @@
},
"tidy-html5": {
"baseline": "5.7.28",
"port-version": 4
"port-version": 5
},
"tiff": {
"baseline": "4.3.0",
Expand Down
5 changes: 5 additions & 0 deletions versions/t-/tidy-html5.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "63b9670b22eb5038a2961c1f91ac05052c439b0a",
"version": "5.7.28",
"port-version": 5
},
{
"git-tree": "ba5557c5b17df0184bd2ee1eeee06ec1131576f8",
"version-string": "5.7.28",
Expand Down