3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-01-14 06:06:01 +08:00
Code Issues Projects Releases Wiki Activity

[luafilesystem][lpeg] Bump versions (#11554)

Browse Source 
* Bump luafilesytem to 1.8.0 and lpeg to 1.0.2

* Code review changes for lpeg / luafilesystem

* [lpeg][luafilesystem] Remove windows only gates

* Remove failures from baseline
This commit is contained in:
Stephen E. Baker 2020-05-27 00:32:47 -04:00 committed by GitHub
parent cff57958e7
commit 46d0f05e2d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 50 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
ports/lpeg/CMakeLists.txt
View File

@ -1,28 +1,24 @@
cmake_minimum_required(VERSION 3.0)
project(lpeg)
if(NOT WIN32)
message(FATAL_ERROR "Written for windows only")
endif()
find_path(LUA_INCLUDE_DIR lua.h PATH_SUFFIXES lua)
find_library(LUA_LIBRARY lua)
set(LPEG_INCLUDES ${LUA_INCLUDE_DIR})
set(LPEG_LIBRARIES ${LUA_LIBRARY})
add_library(lpeg
lpvm.c
lptree.c
lpprint.c
lpcap.c
lpcode.c
lpeg.def)
target_include_directories(lpeg PRIVATE ${LPEG_INCLUDES})
target_link_libraries(lpeg PRIVATE ${LPEG_LIBRARIES})
install(TARGETS lpeg
RUNTIME DESTINATION bin
LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib)
install(FILES re.lua DESTINATION share/lua)
cmake_minimum_required(VERSION 3.0)
project(lpeg)
find_path(LUA_INCLUDE_DIR lua.h PATH_SUFFIXES lua)
find_library(LUA_LIBRARY lua)
set(LPEG_INCLUDES ${LUA_INCLUDE_DIR})
set(LPEG_LIBRARIES ${LUA_LIBRARY})
add_library(lpeg
lpvm.c
lptree.c
lpprint.c
lpcap.c
lpcode.c
lpeg.def)
target_include_directories(lpeg PRIVATE ${LPEG_INCLUDES})
target_link_libraries(lpeg PRIVATE ${LPEG_LIBRARIES})
install(TARGETS lpeg
RUNTIME DESTINATION bin
LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib)
install(FILES re.lua DESTINATION share/lua)

2
ports/lpeg/CONTROL
View File

@ -1,5 +1,5 @@
Source: lpeg
Version: 1.0.1-4
Version: 1.0.2-1
Homepage: https://www.inf.puc-rio.br/~roberto/lpeg
Description: LPeg is a pattern-matching library for Lua, based on Parsing Expression Grammars (PEGs).
Build-Depends: lua

9
ports/lpeg/portfile.cmake
View File

@ -1,12 +1,9 @@
#cmake-only scripts
include(vcpkg_common_functions)
set(LPEG_VER 1.0.1)
set(LPEG_VER 1.0.2)
vcpkg_download_distfile(ARCHIVE
URLS "http://www.inf.puc-rio.br/~roberto/lpeg/lpeg-${LPEG_VER}.tar.gz"
FILENAME "lpeg-${LPEG_VER}.tar.gz"
SHA512 7b43fbee7eff443000986684bc56bba6d2796a31cf860740746c70e155bdea1b62a46b93f97e2747e3ef0f63e965148778ac2985d0f2d83e1e37ec4ebbabf4aa
SHA512 110527ddf9f8e5e8a80ef0ae8847c8ba8cd2597dba3bfe2865cba9af60daafbb885f21e74231952f5ab793d021e050b482066a821c6954d52090a5eae77e9814
)
vcpkg_extract_source_archive_ex(
@ -28,7 +25,7 @@ vcpkg_install_cmake()
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
# Handle copyright
file(INSTALL ${SOURCE_PATH}/lpeg.html DESTINATION ${CURRENT_PACKAGES_DIR}/share/lpeg RENAME copyright)
file(INSTALL ${SOURCE_PATH}/lpeg.html DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
# Allow empty include directory
set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled)

38
ports/luafilesystem/CMakeLists.txt
View File

@ -1,21 +1,17 @@
cmake_minimum_required(VERSION 3.0)
project(luafilesystem)
if(NOT WIN32)
message(FATAL_ERROR "Written for windows only")
endif()
find_path(LUA_INCLUDE_DIR lua.h PATH_SUFFIXES lua)
find_library(LUA_LIBRARY lua)
set(LFS_INCLUDES ${LUA_INCLUDE_DIR})
set(LFS_LIBRARIES ${LUA_LIBRARY})
add_library( lfs src/lfs.h src/lfs.c src/lfs.def)
target_include_directories(lfs PRIVATE ${LFS_INCLUDES})
target_link_libraries(lfs PRIVATE ${LFS_LIBRARIES})
install(TARGETS lfs
RUNTIME DESTINATION bin
LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib)
cmake_minimum_required(VERSION 3.0)
project(luafilesystem)
find_path(LUA_INCLUDE_DIR lua.h PATH_SUFFIXES lua)
find_library(LUA_LIBRARY lua)
set(LFS_INCLUDES ${LUA_INCLUDE_DIR})
set(LFS_LIBRARIES ${LUA_LIBRARY})
add_library( lfs src/lfs.h src/lfs.c src/lfs.def)
target_include_directories(lfs PRIVATE ${LFS_INCLUDES})
target_link_libraries(lfs PRIVATE ${LFS_LIBRARIES})
install(TARGETS lfs
RUNTIME DESTINATION bin
LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib)

2
ports/luafilesystem/CONTROL
View File

@ -1,5 +1,5 @@
Source: luafilesystem
Version: 1.7.0.2-1
Version: 1.8.0-1
Homepage: https://github.com/keplerproject/luafilesystem
Description: LuaFileSystem is a Lua library developed to complement the set of functions related to file systems offered by the standard Lua distribution.
Build-Depends: lua

20
ports/luafilesystem/lfs-def-fix.patch
View File

@ -1,20 +0,0 @@
From 92527d96199912f79b8046ddb32ff83a16771cb4 Mon Sep 17 00:00:00 2001
From: "Stephen E. Baker" <baker.stephen.e@gmail.com>
Date: Fri, 15 Sep 2017 21:18:58 -0400
Subject: [PATCH] Update version in lfs.def
Version number of current release is 1.7
---
src/lfs.def | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/lfs.def b/src/lfs.def
index 8a36d41..4055ff0 100644
--- a/src/lfs.def
+++ b/src/lfs.def
@@ -1,4 +1,4 @@
LIBRARY lfs.dll
-VERSION 1.6
+VERSION 1.7
EXPORTS
luaopen_lfs

13
ports/luafilesystem/portfile.cmake
View File

@ -1,8 +1,6 @@
include(vcpkg_common_functions)
set(LUAFILESYSTEM_VERSION 1.7.0.2)
set(LUAFILESYSTEM_REVISION v1_7_0_2)
set(LUAFILESYSTEM_HASH a1d4d077776e57cd878dbcd21656da141ea3686c587b5420a2b039aeaf086b7e7d05d531ee1cc2bbd7d06660d1315b09593e52143f6711f033ce8eecdc550511)
set(LUAFILESYSTEM_VERSION 1.8.0)
set(LUAFILESYSTEM_REVISION v1_8_0)
set(LUAFILESYSTEM_HASH 79d964f13ae43716281dc8521d2f128b22f2261234c443e242b857cfdf621e208bdf4512f8ba710baa113e9b3b71e2544609de65e2c483f569c243a5cf058247)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
@ -10,8 +8,6 @@ vcpkg_from_github(
REF ${LUAFILESYSTEM_REVISION}
SHA512 ${LUAFILESYSTEM_HASH}
HEAD_REF master
PATCHES
lfs-def-fix.patch
)
file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
@ -25,8 +21,7 @@ vcpkg_install_cmake()
vcpkg_copy_pdbs()
# Handle copyright
file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/luafilesystem)
file(RENAME ${CURRENT_PACKAGES_DIR}/share/luafilesystem/LICENSE ${CURRENT_PACKAGES_DIR}/share/luafilesystem/copyright)
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
# Allow empty include directory
set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled)

4
scripts/ci.baseline.txt
View File

@ -1019,12 +1019,8 @@ log4cplus:arm-uwp=fail
log4cplus:x64-uwp=fail
log4cpp:arm-uwp=fail
log4cpp:x64-uwp=fail
lpeg:x64-linux=fail
lpeg:x64-osx=fail
lua:arm-uwp=fail
lua:x64-uwp=fail
luafilesystem:x64-linux=fail
luafilesystem:x64-osx=fail
luajit:arm64-windows = skip
luajit:arm-uwp = skip
luajit:x64-linux = skip