Skip to content

Commit

Permalink
[liblo] Fix filenames for linux in liblo portfile (#19660)
Browse files Browse the repository at this point in the history
* Fix filenames for linux vs windows in liblo portfile

* Removed deprecated call and now using vcpkg_copy_tools

* Upgraded to manifest file

* Increment port-version

* Remove now working builds from ci.baseline

* Updated versioning files

* Fixed type for vcpkg.json

* Updated sha for liblo version
  • Loading branch information
stekyne authored Aug 31, 2021
1 parent 78b7f1b commit a761a22
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 12 deletions.
4 changes: 0 additions & 4 deletions ports/liblo/CONTROL

This file was deleted.

6 changes: 1 addition & 5 deletions ports/liblo/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,10 @@ vcpkg_install_cmake()
# Install needed files into package directory
vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/liblo)

file(INSTALL ${CURRENT_PACKAGES_DIR}/bin/oscsend.exe DESTINATION ${CURRENT_PACKAGES_DIR}/tools/liblo)
file(INSTALL ${CURRENT_PACKAGES_DIR}/bin/oscdump.exe DESTINATION ${CURRENT_PACKAGES_DIR}/tools/liblo)
vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/liblo)
vcpkg_copy_tools(TOOL_NAMES oscsend oscdump AUTO_CLEAN)

# Remove unnecessary files
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/oscsend.exe ${CURRENT_PACKAGES_DIR}/bin/oscdump.exe)
file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/oscsend.exe ${CURRENT_PACKAGES_DIR}/debug/bin/oscdump.exe)

if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
Expand Down
7 changes: 7 additions & 0 deletions ports/liblo/vcpkg.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"name": "liblo",
"version-string": "0.31",
"port-version": 1,
"description": "liblo is an implementation of the Open Sound Control protocol for POSIX systems",
"homepage": "https://github.com/radarsat1/liblo"
}
2 changes: 0 additions & 2 deletions scripts/ci.baseline.txt
Original file line number Diff line number Diff line change
Expand Up @@ -617,8 +617,6 @@ liblas:arm64-windows=fail
liblemon:arm-uwp=fail
liblemon:x64-uwp=fail
liblo:arm-uwp=fail
liblo:x64-linux=fail
liblo:x64-osx=fail
liblo:x64-uwp=fail
liblsl:arm64-windows=fail
liblsl:arm-uwp=fail
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -3366,7 +3366,7 @@
},
"liblo": {
"baseline": "0.31",
"port-version": 0
"port-version": 1
},
"liblsl": {
"baseline": "1.14.0",
Expand Down
5 changes: 5 additions & 0 deletions versions/l-/liblo.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "c4df5a746fe8bc045b2287c0b6122717757a30a3",
"version-string": "0.31",
"port-version": 1
},
{
"git-tree": "04145d21ab7fff62c0bbf2a8846bc9ddea192fe2",
"version-string": "0.31",
Expand Down

0 comments on commit a761a22

Please sign in to comment.