From ea65c0e5ba282f93651b1ae6c7ffcc36aee1da2f Mon Sep 17 00:00:00 2001 From: Adam Martin Date: Fri, 7 Oct 2016 06:50:20 -0500 Subject: [lua] Initial addition --- ports/lua/CMakeLists.txt | 43 +++++++++++++++++++++++++++++++++++++++++++ ports/lua/CONTROL | 3 +++ ports/lua/COPYRIGHT | 6 ++++++ ports/lua/portfile.cmake | 35 +++++++++++++++++++++++++++++++++++ 4 files changed, 87 insertions(+) create mode 100644 ports/lua/CMakeLists.txt create mode 100644 ports/lua/CONTROL create mode 100644 ports/lua/COPYRIGHT create mode 100644 ports/lua/portfile.cmake (limited to 'ports/lua') diff --git a/ports/lua/CMakeLists.txt b/ports/lua/CMakeLists.txt new file mode 100644 index 000000000..78ec44325 --- /dev/null +++ b/ports/lua/CMakeLists.txt @@ -0,0 +1,43 @@ +PROJECT ( lua ) + +IF( NOT WIN32 ) + message( FATAL_ERROR "Written for window only" ) +ENDIF() + +CMAKE_MINIMUM_REQUIRED(VERSION 2.8) + +# remove warnings +ADD_DEFINITIONS(-D_CRT_SECURE_NO_WARNINGS ) + +SET (HDR_LIBLUA +src/lapi.h src/lauxlib.h src/lcode.h src/lctype.h src/ldebug.h src/ldo.h src/lfunc.h +src/lgc.h src/llex.h src/llimits.h src/lmem.h src/lobject.h src/lopcodes.h src/lparser.h +src/lstate.h src/lstring.h src/ltable.h src/ltm.h src/lua.h src/luaconf.h src/lualib.h +src/lundump.h src/lvm.h src/lzio.h +) + +#SET_SOURCE_FILES_PROPERTIES(${HDR_LIBLUA} PROPERTIES HEADER_FILE_ONLY TRUE) +#include_directories(src) + +# Build Libraries +SET (SRC_LIBLUA +src/lapi.c src/lauxlib.c src/lbaselib.c src/lbitlib.c src/lcode.c src/lcorolib.c +src/lctype.c src/ldblib.c src/ldebug.c src/ldo.c src/ldump.c src/lfunc.c src/lgc.c +src/linit.c src/liolib.c src/llex.c src/lmathlib.c src/lmem.c src/loadlib.c src/lobject.c +src/lopcodes.c src/loslib.c src/lparser.c src/lstate.c src/lstring.c src/lstrlib.c +src/ltable.c src/ltablib.c src/ltm.c src/lundump.c src/lutf8lib.c src/lvm.c src/lzio.c +) + +SET ( SRC_LUA src/lua.c ) + +# append headers to sources to make them show up in MSVC GUI +LIST(APPEND SRC_LIBLUA ${HDR_LIBLUA}) + +#DLL +ADD_LIBRARY ( lua53 SHARED ${SRC_LIBLUA} ${SRC_LUA} ) +SET_TARGET_PROPERTIES (lua53 PROPERTIES DEFINE_SYMBOL "LUA_BUILD_AS_DLL" ) + +INSTALL ( TARGETS lua53 DESTINATION ${CMAKE_INSTALL_PREFIX}/lib ) +INSTALL(DIRECTORY src/ DESTINATION include + FILES_MATCHING PATTERN lualib.h PATTERN luaconf.h + PATTERN lua.hpp PATTERN lua.h PATTERN lauxlib.h) \ No newline at end of file diff --git a/ports/lua/CONTROL b/ports/lua/CONTROL new file mode 100644 index 000000000..1c4829675 --- /dev/null +++ b/ports/lua/CONTROL @@ -0,0 +1,3 @@ +Source: lua +Version: +Description: diff --git a/ports/lua/COPYRIGHT b/ports/lua/COPYRIGHT new file mode 100644 index 000000000..729a2ccd5 --- /dev/null +++ b/ports/lua/COPYRIGHT @@ -0,0 +1,6 @@ +Copyright © 1994–2016 Lua.org, PUC-Rio. +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/ports/lua/portfile.cmake b/ports/lua/portfile.cmake new file mode 100644 index 000000000..9114338c4 --- /dev/null +++ b/ports/lua/portfile.cmake @@ -0,0 +1,35 @@ +# Common Ambient Variables: +# VCPKG_ROOT_DIR = +# TARGET_TRIPLET is the current triplet (x86-windows, etc) +# PORT is the current port name (zlib, etc) +# CURRENT_BUILDTREES_DIR = ${VCPKG_ROOT_DIR}\buildtrees\${PORT} +# CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET} +# + +include(${CMAKE_TRIPLET_FILE}) +include(vcpkg_common_functions) +set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/lua-5.3.3) +vcpkg_download_distfile(ARCHIVE + URLS "http://www.lua.org/ftp/lua-5.3.3.tar.gz" + FILENAME "lua-5.3.3.tar.gz" + SHA512 7b8122ed48ea2a9faa47d1b69b4a5b1523bb7be67e78f252bb4339bf75e957a88c5405156e22b4b63ccf607a5407bf017a4cee1ce12b1aa5262047655960a3cc +) +vcpkg_extract_source_archive(${ARCHIVE}) + +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} +) + +vcpkg_install_cmake() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/bin) +file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/bin) +file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/lua53.dll ${CURRENT_PACKAGES_DIR}/debug/bin/lua53.dll) +file(RENAME ${CURRENT_PACKAGES_DIR}/lib/lua53.dll ${CURRENT_PACKAGES_DIR}/bin/lua53.dll) + +# Handle copyright +file(COPY ${CMAKE_CURRENT_LIST_DIR}/COPYRIGHT DESTINATION ${CURRENT_PACKAGES_DIR}/share/lua) +vcpkg_copy_pdbs() -- cgit v1.2.3 From d3a453e6386fab5ce2c037a2f1831c5a620cce28 Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Fri, 7 Oct 2016 14:49:49 -0700 Subject: [lua] Reduce post-install work needed in portfile by adding them to CMakeLists.txt --- ports/lua/CMakeLists.txt | 39 +++++++++++++++++++++++++-------------- ports/lua/portfile.cmake | 8 ++------ 2 files changed, 27 insertions(+), 20 deletions(-) (limited to 'ports/lua') diff --git a/ports/lua/CMakeLists.txt b/ports/lua/CMakeLists.txt index 78ec44325..76ee6e15c 100644 --- a/ports/lua/CMakeLists.txt +++ b/ports/lua/CMakeLists.txt @@ -6,9 +6,6 @@ ENDIF() CMAKE_MINIMUM_REQUIRED(VERSION 2.8) -# remove warnings -ADD_DEFINITIONS(-D_CRT_SECURE_NO_WARNINGS ) - SET (HDR_LIBLUA src/lapi.h src/lauxlib.h src/lcode.h src/lctype.h src/ldebug.h src/ldo.h src/lfunc.h src/lgc.h src/llex.h src/llimits.h src/lmem.h src/lobject.h src/lopcodes.h src/lparser.h @@ -16,9 +13,6 @@ src/lstate.h src/lstring.h src/ltable.h src/ltm.h src/lua.h src/luaconf.h src/lu src/lundump.h src/lvm.h src/lzio.h ) -#SET_SOURCE_FILES_PROPERTIES(${HDR_LIBLUA} PROPERTIES HEADER_FILE_ONLY TRUE) -#include_directories(src) - # Build Libraries SET (SRC_LIBLUA src/lapi.c src/lauxlib.c src/lbaselib.c src/lbitlib.c src/lcode.c src/lcorolib.c @@ -28,16 +22,33 @@ src/lopcodes.c src/loslib.c src/lparser.c src/lstate.c src/lstring.c src/lstrlib src/ltable.c src/ltablib.c src/ltm.c src/lundump.c src/lutf8lib.c src/lvm.c src/lzio.c ) -SET ( SRC_LUA src/lua.c ) - # append headers to sources to make them show up in MSVC GUI LIST(APPEND SRC_LIBLUA ${HDR_LIBLUA}) +IF (BUILD_SHARED_LIBS) + ADD_DEFINITIONS ( -DLUA_BUILD_AS_DLL ) +ENDIF () + +# remove warnings +ADD_DEFINITIONS (-D_CRT_SECURE_NO_WARNINGS ) + #DLL -ADD_LIBRARY ( lua53 SHARED ${SRC_LIBLUA} ${SRC_LUA} ) -SET_TARGET_PROPERTIES (lua53 PROPERTIES DEFINE_SYMBOL "LUA_BUILD_AS_DLL" ) +ADD_LIBRARY ( lua ${SRC_LIBLUA} ) + +INSTALL ( TARGETS lua + RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin + LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib + ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib +) -INSTALL ( TARGETS lua53 DESTINATION ${CMAKE_INSTALL_PREFIX}/lib ) -INSTALL(DIRECTORY src/ DESTINATION include - FILES_MATCHING PATTERN lualib.h PATTERN luaconf.h - PATTERN lua.hpp PATTERN lua.h PATTERN lauxlib.h) \ No newline at end of file +IF (NOT DEFINED SKIP_INSTALL_HEADERS) + INSTALL( + FILES + src/lualib.h + src/lua.h + src/luaconf.h + src/lua.hpp + src/lauxlib.h + DESTINATION include + ) +ENDIF () \ No newline at end of file diff --git a/ports/lua/portfile.cmake b/ports/lua/portfile.cmake index 9114338c4..f8c1071f7 100644 --- a/ports/lua/portfile.cmake +++ b/ports/lua/portfile.cmake @@ -20,16 +20,12 @@ file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} + OPTIONS_DEBUG + -DSKIP_INSTALL_HEADERS=ON ) vcpkg_install_cmake() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/bin) -file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/bin) -file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/lua53.dll ${CURRENT_PACKAGES_DIR}/debug/bin/lua53.dll) -file(RENAME ${CURRENT_PACKAGES_DIR}/lib/lua53.dll ${CURRENT_PACKAGES_DIR}/bin/lua53.dll) - # Handle copyright file(COPY ${CMAKE_CURRENT_LIST_DIR}/COPYRIGHT DESTINATION ${CURRENT_PACKAGES_DIR}/share/lua) vcpkg_copy_pdbs() -- cgit v1.2.3 From 0de56e180f3806e76e0419c1ebd98726b9ac311a Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Fri, 7 Oct 2016 14:49:58 -0700 Subject: [lua] Add version and description --- ports/lua/CONTROL | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'ports/lua') diff --git a/ports/lua/CONTROL b/ports/lua/CONTROL index 1c4829675..ae661f3f6 100644 --- a/ports/lua/CONTROL +++ b/ports/lua/CONTROL @@ -1,3 +1,3 @@ Source: lua -Version: -Description: +Version: 5.3.3 +Description: a powerful, fast, lightweight, embeddable scripting language -- cgit v1.2.3