Skip to content

Commit

Permalink
[tidy-html5] Fix for non-Windows users (#10308)
Browse files Browse the repository at this point in the history
* Fix tidy-html5 for non-Windows users

* Update ci baseline and remove deprecated stuff
  • Loading branch information
cyyynthia authored Mar 10, 2020
1 parent 83aa96e commit b813a77
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 6 deletions.
2 changes: 1 addition & 1 deletion ports/tidy-html5/CONTROL
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Source: tidy-html5
Version: 5.7.28-1
Version: 5.7.28-2
Homepage: https://github.com/htacg/tidy-html5
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.
11 changes: 8 additions & 3 deletions ports/tidy-html5/portfile.cmake
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
include(vcpkg_common_functions)

vcpkg_check_linkage(ONLY_STATIC_LIBRARY)

vcpkg_from_github(
Expand All @@ -23,8 +21,14 @@ vcpkg_install_cmake()

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(RENAME ${CURRENT_PACKAGES_DIR}/bin/tidy.exe ${CURRENT_PACKAGES_DIR}/tools/tidy-html5/tidy.exe)

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()

if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
Expand All @@ -33,3 +37,4 @@ 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)
2 changes: 0 additions & 2 deletions scripts/ci.baseline.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1730,8 +1730,6 @@ thor:x64-linux=fail
thor:x64-osx=fail
thrift:x64-osx=fail
tidy-html5:arm-uwp=fail
tidy-html5:x64-linux=fail
tidy-html5:x64-osx=fail
tidy-html5:x64-uwp=fail
tinkerforge:arm-uwp=fail
tinkerforge:x64-uwp=fail
Expand Down

0 comments on commit b813a77

Please sign in to comment.