Skip to content

Update main.yml #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
Open

Update main.yml #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
866bb0b
Update main.yml
xpol Oct 17, 2019
c93e953
Update main.yml
xpol Oct 17, 2019
1781bd4
Update main.yml
xpol Oct 17, 2019
5269c9c
Update main.yml
xpol Oct 17, 2019
c49949b
Update main.yml
xpol Oct 17, 2019
c2ebe2d
Disable luarocks and luajit and try CI build.
xpol Oct 17, 2019
914dabd
Make compile under mac and install docs.
xpol Oct 17, 2019
48dc391
Save artifacts.
xpol Oct 17, 2019
e03d007
Crrrect install targets.
xpol Oct 17, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 31 additions & 0 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
name: CI

on: [push]

jobs:
build:

runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [windows-2019, windows-2016]

steps:
- uses: actions/checkout@v1
- name: Run a multi-line script
run: |
cmake -H. -Bbuild
cmake --build build --config Release --target install
- uses: actions/upload-artifact@v1
with:
name: lua-5.1
path: build/install/versions/5.1
- uses: actions/upload-artifact@v1
with:
name: lua-5.2
path: build/install/versions/5.2
- uses: actions/upload-artifact@v1
with:
name: lua-5.3
path: build/install/versions/5.3

16 changes: 8 additions & 8 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,18 @@ option(WITH_LUAROCKS "Install Luarocks" ON)
set(CMAKE_INSTALL_PREFIX ${CMAKE_CURRENT_BINARY_DIR}/install)
execute_process(COMMAND git describe --dirty --tags OUTPUT_VARIABLE LUAVM_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE)

include(cmake/msvc.cmake) # load msvc variables
include(cmake/luarocks.cmake)
# include(cmake/msvc.cmake) # load msvc variables
# include(cmake/luarocks.cmake)
include(cmake/lua.cmake)

add_lua(VERSION 5.1 ABI 51 ROOT ${CMAKE_CURRENT_SOURCE_DIR}/lua/versions/lua-5.1)
add_lua(VERSION 5.2 ABI 52 ROOT ${CMAKE_CURRENT_SOURCE_DIR}/lua/versions/lua-5.2)
add_lua(VERSION 5.3 ABI 53 ROOT ${CMAKE_CURRENT_SOURCE_DIR}/lua/versions/lua-5.3)
add_jit(VERSION 2.0 ABI 51 ROOT ${CMAKE_CURRENT_SOURCE_DIR}/lua/versions/luajit-2.0)
add_jit(VERSION 2.1 ABI 51 ROOT ${CMAKE_CURRENT_SOURCE_DIR}/lua/versions/luajit-2.1)
#add_jit(VERSION 2.0 ABI 51 ROOT ${CMAKE_CURRENT_SOURCE_DIR}/lua/versions/luajit-2.0)
#add_jit(VERSION 2.1 ABI 51 ROOT ${CMAKE_CURRENT_SOURCE_DIR}/lua/versions/luajit-2.1)

include(cmake/external/OpenSSL.cmake)
include(cmake/external/ZLIB.cmake)
# include(cmake/external/OpenSSL.cmake)
# include(cmake/external/ZLIB.cmake)

include(cmake/luavm.cmake)
include(cmake/installer.cmake)
# include(cmake/luavm.cmake)
# include(cmake/installer.cmake)
30 changes: 20 additions & 10 deletions cmake/lua.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
include(cmake/luarocks.cmake)
# include(cmake/luarocks.cmake)

# add_lua(VERSION 5.1 ABI 51 ROOT path/to/lua)
function(add_lua)
Expand All @@ -9,7 +9,11 @@ function(add_lua)

# Shared library
add_library(lua-${add_lua_VERSION}.shared SHARED ${LIBRARY_FILES})
set_target_properties(lua-${add_lua_VERSION}.shared PROPERTIES OUTPUT_NAME lua${add_lua_ABI} COMPILE_DEFINITIONS LUA_BUILD_AS_DLL COMPILE_OPTIONS /wd4334)
if (MSVC)
set_target_properties(lua-${add_lua_VERSION}.shared PROPERTIES OUTPUT_NAME lua${add_lua_ABI} COMPILE_DEFINITIONS LUA_BUILD_AS_DLL COMPILE_OPTIONS /wd4334)
else()
set_target_properties(lua-${add_lua_VERSION}.shared PROPERTIES OUTPUT_NAME lua${add_lua_ABI})
endif()

# Lua executable
add_executable(lua-${add_lua_VERSION} ${add_lua_ROOT}/src/lua.c)
Expand All @@ -18,20 +22,26 @@ function(add_lua)

# Luac executable
add_executable(luac-${add_lua_VERSION} ${LUAC_FILES})
set_target_properties(luac-${add_lua_VERSION} PROPERTIES OUTPUT_NAME luac COMPILE_OPTIONS /wd4334)
if (MSVC)
set_target_properties(luac-${add_lua_VERSION} PROPERTIES OUTPUT_NAME luac COMPILE_OPTIONS /wd4334)
else()
set_target_properties(luac-${add_lua_VERSION} PROPERTIES OUTPUT_NAME luac)
endif()

# Config luarocks for this Lua version.
config_luarocks(${add_lua_VERSION} lua.exe lua${add_lua_ABI}.lib)
# # config_luarocks(${add_lua_VERSION} lua.exe lua${add_lua_ABI}.lib)

# Install files
set(PREFIX "${CMAKE_INSTALL_PREFIX}/versions/${add_lua_VERSION}")
set_target_properties(lua-${add_lua_VERSION}.shared lua-${add_lua_VERSION} luac-${add_lua_VERSION}
PROPERTIES
ARCHIVE_OUTPUT_DIRECTORY_RELEASE "${PREFIX}"
LIBRARY_OUTPUT_DIRECTORY_RELEASE "${PREFIX}"
RUNTIME_OUTPUT_DIRECTORY_RELEASE "${PREFIX}"
install(
TARGETS lua-${add_lua_VERSION}.shared lua-${add_lua_VERSION} luac-${add_lua_VERSION}
RUNTIME DESTINATION "${PREFIX}"
LIBRARY DESTINATION "${PREFIX}"
ARCHIVE DESTINATION "${PREFIX}"
)
install(FILES ${LUA_HEADERS} DESTINATION "${PREFIX}/include")
install(FILES ${add_lua_ROOT}/README DESTINATION "${PREFIX}")
install(DIRECTORY ${add_lua_ROOT}/doc DESTINATION "${PREFIX}")
endfunction()

# add_jit(VERSION 2.0 ABI 51 ROOT path/to/luajit)
Expand Down Expand Up @@ -60,7 +70,7 @@ function(add_jit)
INSTALL_COMMAND ""
)

config_luarocks(${LUA_VERSION} luajit.exe lua${add_luajit_ABI}.lib)
# config_luarocks(${LUA_VERSION} luajit.exe lua${add_luajit_ABI}.lib)

# Install files
set(PREFIX "${CMAKE_INSTALL_PREFIX}/versions/${LUA_VERSION}")
Expand Down