diff options
| author | Bowser65 <bowoser@weeb.services> | 2020-03-10 23:59:38 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-10 15:59:38 -0700 |
| commit | b813a777e8424a30116ea2a3d32973a5cfdbb005 (patch) | |
| tree | 4c7cec47a38afd87e088e2911604846aa12334a2 | |
| parent | 83aa96e446c3094486cf480dc83d9d3a7a9989fe (diff) | |
| download | vcpkg-b813a777e8424a30116ea2a3d32973a5cfdbb005.tar.gz vcpkg-b813a777e8424a30116ea2a3d32973a5cfdbb005.zip | |
[tidy-html5] Fix for non-Windows users (#10308)
* Fix tidy-html5 for non-Windows users
* Update ci baseline and remove deprecated stuff
| -rw-r--r-- | ports/tidy-html5/CONTROL | 2 | ||||
| -rw-r--r-- | ports/tidy-html5/portfile.cmake | 11 | ||||
| -rw-r--r-- | scripts/ci.baseline.txt | 2 |
3 files changed, 9 insertions, 6 deletions
diff --git a/ports/tidy-html5/CONTROL b/ports/tidy-html5/CONTROL index 2d891ec0a..b7ad75aea 100644 --- a/ports/tidy-html5/CONTROL +++ b/ports/tidy-html5/CONTROL @@ -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. diff --git a/ports/tidy-html5/portfile.cmake b/ports/tidy-html5/portfile.cmake index e0e504311..ddf60c6b2 100644 --- a/ports/tidy-html5/portfile.cmake +++ b/ports/tidy-html5/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( @@ -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) @@ -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) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index de59916c1..5872a33d6 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -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
|