From 866bb0bf011f7f8671341120925ef5f5772eef88 Mon Sep 17 00:00:00 2001
From: xpol <xpolife@gmail.com>
Date: Thu, 17 Oct 2019 14:48:26 +0800
Subject: [PATCH 1/9] Update main.yml

---
 .github/workflows/main.yml | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 .github/workflows/main.yml

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
new file mode 100644
index 0000000..6097c28
--- /dev/null
+++ b/.github/workflows/main.yml
@@ -0,0 +1,18 @@
+name: CI
+
+on: [push]
+
+jobs:
+  build:
+
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        node_version: ['8', '10', '12']
+        os: [windows-2019, or windows-2016]
+        
+    steps:
+#    - uses: actions/checkout@v1
+    - name: Run a multi-line script
+      run: |
+        tree C:\Program Files (x86)\Microsoft Visual Studio\

From c93e953417a25e86287ae8f204a1d781e3beadb3 Mon Sep 17 00:00:00 2001
From: xpol <xpolife@gmail.com>
Date: Thu, 17 Oct 2019 14:50:49 +0800
Subject: [PATCH 2/9] Update main.yml

---
 .github/workflows/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 6097c28..3d3f444 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -15,4 +15,4 @@ jobs:
 #    - uses: actions/checkout@v1
     - name: Run a multi-line script
       run: |
-        tree C:\Program Files (x86)\Microsoft Visual Studio\
+        tree "C:\Program Files (x86)\Microsoft Visual Studio"

From 1781bd4dbdda73c00d778771da538ac34818b117 Mon Sep 17 00:00:00 2001
From: xpol <xpolife@gmail.com>
Date: Thu, 17 Oct 2019 14:51:25 +0800
Subject: [PATCH 3/9] Update main.yml

---
 .github/workflows/main.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 3d3f444..c12c2f0 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -8,7 +8,6 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        node_version: ['8', '10', '12']
         os: [windows-2019, or windows-2016]
         
     steps:

From 5269c9c0cf342110d792ffeade054bd0b63cb33e Mon Sep 17 00:00:00 2001
From: xpol <xpolife@gmail.com>
Date: Thu, 17 Oct 2019 14:55:57 +0800
Subject: [PATCH 4/9] Update main.yml

---
 .github/workflows/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index c12c2f0..3e76add 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -14,4 +14,4 @@ jobs:
 #    - uses: actions/checkout@v1
     - name: Run a multi-line script
       run: |
-        tree "C:\Program Files (x86)\Microsoft Visual Studio"
+        set

From c49949b3adc9db0c03ab66690e93b59b044f115b Mon Sep 17 00:00:00 2001
From: xpol <xpolife@gmail.com>
Date: Thu, 17 Oct 2019 15:01:47 +0800
Subject: [PATCH 5/9] Update main.yml

---
 .github/workflows/main.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 3e76add..d401a4c 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -8,10 +8,10 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [windows-2019, or windows-2016]
+        os: [windows-2019, windows-2016]
         
     steps:
 #    - uses: actions/checkout@v1
     - name: Run a multi-line script
       run: |
-        set
+        where /r "C:\Program Files (x86)\Microsoft Visual Studio" *.bat

From c2ebe2dda95e6a6fd8edb3c5df38bf6442c24b03 Mon Sep 17 00:00:00 2001
From: Xpol Wan <xpolife@gmail.com>
Date: Thu, 17 Oct 2019 15:33:21 +0800
Subject: [PATCH 6/9] Disable luarocks and luajit and try CI build.

---
 .github/workflows/main.yml |  5 +++--
 CMakeLists.txt             | 16 ++++++++--------
 cmake/lua.cmake            |  6 +++---
 3 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index d401a4c..ceeca3c 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -11,7 +11,8 @@ jobs:
         os: [windows-2019, windows-2016]
         
     steps:
-#    - uses: actions/checkout@v1
+    - uses: actions/checkout@v1
     - name: Run a multi-line script
       run: |
-        where /r "C:\Program Files (x86)\Microsoft Visual Studio" *.bat
+        cmake -H. -Bbuild
+        cmake --build build --config Release --target install
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 54ed85d..e48010c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -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)
diff --git a/cmake/lua.cmake b/cmake/lua.cmake
index 364d0e5..80193db 100644
--- a/cmake/lua.cmake
+++ b/cmake/lua.cmake
@@ -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)
@@ -21,7 +21,7 @@ function(add_lua)
   set_target_properties(luac-${add_lua_VERSION} PROPERTIES OUTPUT_NAME luac COMPILE_OPTIONS /wd4334)
 
   # 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}")
@@ -60,7 +60,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}")

From 914dabd288fa158331ba92c499538cb9d7ff8555 Mon Sep 17 00:00:00 2001
From: Xpol Wan <xpolife@gmail.com>
Date: Thu, 17 Oct 2019 15:52:38 +0800
Subject: [PATCH 7/9] Make compile under mac and install docs.

---
 cmake/lua.cmake | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/cmake/lua.cmake b/cmake/lua.cmake
index 80193db..a220f95 100644
--- a/cmake/lua.cmake
+++ b/cmake/lua.cmake
@@ -9,7 +9,10 @@ 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)
+  set_target_properties(lua-${add_lua_VERSION}.shared PROPERTIES OUTPUT_NAME lua${add_lua_ABI})
+  if (MSVC)
+    set_target_properties(lua-${add_lua_VERSION}.shared COMPILE_DEFINITIONS LUA_BUILD_AS_DLL COMPILE_OPTIONS /wd4334)
+  endif()
 
   # Lua executable
   add_executable(lua-${add_lua_VERSION} ${add_lua_ROOT}/src/lua.c)
@@ -18,7 +21,10 @@ 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)
+  set_target_properties(luac-${add_lua_VERSION} PROPERTIES OUTPUT_NAME luac)
+  if (MSVC)
+    set_target_properties(lua-${add_lua_VERSION} COMPILE_OPTIONS /wd4334)
+  endif()
 
   # Config luarocks for this Lua version.
   # # config_luarocks(${add_lua_VERSION} lua.exe lua${add_lua_ABI}.lib)
@@ -32,6 +38,8 @@ function(add_lua)
     RUNTIME_OUTPUT_DIRECTORY_RELEASE "${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)

From 48dc391883c25e83e2ffa55b0acd28fb7f3ceaa8 Mon Sep 17 00:00:00 2001
From: Xpol Wan <xpolife@gmail.com>
Date: Thu, 17 Oct 2019 16:43:37 +0800
Subject: [PATCH 8/9] Save artifacts.

---
 .github/workflows/main.yml | 13 +++++++++++++
 cmake/lua.cmake            |  4 ++--
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index ceeca3c..af7a570 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -16,3 +16,16 @@ jobs:
       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
+
diff --git a/cmake/lua.cmake b/cmake/lua.cmake
index a220f95..ccecda8 100644
--- a/cmake/lua.cmake
+++ b/cmake/lua.cmake
@@ -11,7 +11,7 @@ function(add_lua)
   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})
   if (MSVC)
-    set_target_properties(lua-${add_lua_VERSION}.shared COMPILE_DEFINITIONS LUA_BUILD_AS_DLL COMPILE_OPTIONS /wd4334)
+    set_target_properties(lua-${add_lua_VERSION}.shared PROPERTIES OUTPUT_NAME lua${add_lua_ABI} COMPILE_DEFINITIONS LUA_BUILD_AS_DLL COMPILE_OPTIONS /wd4334)
   endif()
 
   # Lua executable
@@ -23,7 +23,7 @@ function(add_lua)
   add_executable(luac-${add_lua_VERSION} ${LUAC_FILES})
   set_target_properties(luac-${add_lua_VERSION} PROPERTIES OUTPUT_NAME luac)
   if (MSVC)
-    set_target_properties(lua-${add_lua_VERSION} COMPILE_OPTIONS /wd4334)
+    set_target_properties(lua-${add_lua_VERSION} PROPERTIES OUTPUT_NAME luac COMPILE_OPTIONS /wd4334)
   endif()
 
   # Config luarocks for this Lua version.

From e03d0075efc219b3b15e98624644bff4985070f9 Mon Sep 17 00:00:00 2001
From: Xpol Wan <xpolife@gmail.com>
Date: Thu, 17 Oct 2019 17:08:19 +0800
Subject: [PATCH 9/9] Crrrect install targets.

---
 cmake/lua.cmake | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/cmake/lua.cmake b/cmake/lua.cmake
index ccecda8..53f03f9 100644
--- a/cmake/lua.cmake
+++ b/cmake/lua.cmake
@@ -9,9 +9,10 @@ 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})
   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
@@ -21,9 +22,10 @@ function(add_lua)
 
   # Luac executable
   add_executable(luac-${add_lua_VERSION} ${LUAC_FILES})
-  set_target_properties(luac-${add_lua_VERSION} PROPERTIES OUTPUT_NAME luac)
   if (MSVC)
-    set_target_properties(lua-${add_lua_VERSION} PROPERTIES OUTPUT_NAME luac COMPILE_OPTIONS /wd4334)
+    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.
@@ -31,11 +33,11 @@ function(add_lua)
 
   # 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}")