Lua scripting

.github/workflows/build.yml

@@ -26,35 +26,41 @@ jobs:
             cpu: universal
             arch: any
             cxx: c++
+            cc: cc
             flags: '-DCMAKE_OSX_ARCHITECTURES="arm64;x86_64" -DCMAKE_OSX_DEPLOYMENT_TARGET=11.0 -DCMAKE_CXX_FLAGS_RELEASE="-O2 -DNDEBUG -Wall -Wextra -Wno-missing-field-initializers -Werror"'
           - os: windows-latest
             platform: windows
             cpu: Win32
             arch: x86
             cxx: cl
-            flags: '-DCMAKE_EXE_LINKER_FLAGS_RELEASE="/DEBUG /OPT:REF /OPT:ICF" -DCMAKE_CXX_FLAGS_RELEASE="/MT /O2 /DNDEBUG /Zi /Zc:preprocessor /W4" -A '
+            cc: cl
+            flags: '-DCMAKE_EXE_LINKER_FLAGS_RELEASE="/DEBUG /OPT:REF /OPT:ICF" -DCMAKE_C_FLAGS_RELEASE="/MT /O2 /c" -DCMAKE_CXX_FLAGS_RELEASE="/MT /O2 /DNDEBUG /Zi /Zc:preprocessor /W4" -A '
           - os: windows-latest
             cxx: cl
           - os: ubuntu-latest
             cpu: x64
             cxx: g++
+            cc: gcc
           - os: ubuntu-latest
             cpu: x86
-            apt: g++-i686-linux-gnu
+            apt: g++-i686-linux-gnu gcc-i686-linux-gnu
             cxx: /bin/i686-linux-gnu-g++
+            cc: /bin/i686-linux-gnu-gcc
           - os: ubuntu-latest
             cpu: arm
-            apt: g++-arm-linux-gnueabihf
+            apt: g++-arm-linux-gnueabihf gcc-arm-linux-gnueabihf
             cxx: /bin/arm-linux-gnueabihf-g++
+            cc: /bin/arm-linux-gnueabihf-gcc
           - os: ubuntu-latest
             cpu: arm64
-            apt: g++-aarch64-linux-gnu
+            apt: g++-aarch64-linux-gnu gcc-aarch64-linux-gnu
             cxx: /bin/aarch64-linux-gnu-g++
+            cc: /bin/aarch64-linux-gnu-gcc
 
           - os: ubuntu-latest
-            flags: '-DCMAKE_CXX_FLAGS_RELEASE="-static -s -O2 -DNDEBUG -Wall -Wextra -Wno-missing-field-initializers -Wno-psabi -Werror"'
+            flags: '-DCMAKE_C_FLAGS="-O2 -static" -DCMAKE_CXX_FLAGS_RELEASE="-static -s -O2 -DNDEBUG -Wall -Wextra -Wno-missing-field-initializers -Wno-psabi -Werror"'
           - os: windows-latest
-            flags: '-DCMAKE_EXE_LINKER_FLAGS_RELEASE="/DEBUG /OPT:REF /OPT:ICF" -DCMAKE_CXX_FLAGS_RELEASE="/MT /O2 /DNDEBUG /Zi /Zc:preprocessor /W4" -A '
+            flags: '-DCMAKE_EXE_LINKER_FLAGS_RELEASE="/DEBUG /OPT:REF /OPT:ICF" -DCMAKE_C_FLAGS_RELEASE="/MT /O2 /c" -DCMAKE_CXX_FLAGS_RELEASE="/MT /O2 /DNDEBUG /Zi /Zc:preprocessor /W4" -A '
 
           - os: ubuntu-latest
             platform: linux
@@ -88,17 +94,14 @@ jobs:
       run: >
         cmake -B ${{ steps.strings.outputs.bin }}
         -DCMAKE_CXX_COMPILER=${{ matrix.cxx }}
+        -DCMAKE_C_COMPILER=${{ matrix.cc }}
         ${{ matrix.flags }} ${{ matrix.os == 'windows-latest' && matrix.cpu || '' }}
         -DCMAKE_BUILD_TYPE=Release
         -S ${{ github.workspace }}
 
     - name: Build
       run: cmake --build ${{ steps.strings.outputs.bin }} --config Release
 
-    - name: Test (POSIX)
-      if: matrix.os != 'windows-latest' && matrix.cpu != 'arm' && matrix.cpu != 'arm64'
-      run: ${{ steps.strings.outputs.bin }}/vtm -v
-
     - name: Pack (POSIX)
       if: matrix.os != 'windows-latest'
       run: 7z a -ttar vtm_${{ matrix.platform }}_${{ matrix.arch }}.tar ${{ steps.strings.outputs.bin }}/vtm

.gitignore

@@ -1,3 +1,4 @@
 /.vs
 /.vscode
 /bin
+/build

CMakeLists.txt

@@ -1,37 +1,55 @@
-cmake_minimum_required (VERSION 3.10)
+cmake_minimum_required(VERSION 3.24)
 
-project ("vtm")
-# project ("term")
-# project ("calc")
+project("vtm")
+# project("term")
+# project("calc")
 
-set (CMAKE_CXX_STANDARD 20)
-set (CMAKE_CXX_STANDARD_REQUIRED ON)
+set(CMAKE_CXX_STANDARD 20)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 # Set the build type to Release if none is specified.
-if (NOT CMAKE_BUILD_TYPE OR CMAKE_BUILD_TYPE STREQUAL "")
-    set (CMAKE_BUILD_TYPE "Release" CACHE STRING "" FORCE)
-endif ()
+if(NOT CMAKE_BUILD_TYPE OR CMAKE_BUILD_TYPE STREQUAL "")
+    set(CMAKE_BUILD_TYPE "Release" CACHE STRING "" FORCE)
+endif()
 
-if (CMAKE_SYSTEM_NAME STREQUAL "Windows")    # WIN32 and similar checks are soft-deprecated
+if(CMAKE_SYSTEM_NAME STREQUAL "Windows")    # WIN32 and similar checks are soft-deprecated
     # Disable manifest embedding for the windows builds.
     # Reason: Anti-virus program (Windows Defender) may lock and scan `vtm.exe` file before embedding the manifest.
     #         mt.exe: general error c101008d: Failed to write the updated manifest to the resource of file...
-    #set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /MANIFEST:NO")
+    #set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /MANIFEST:NO")
     # /EHsc    Tells the compiler that exceptions can only occur at a throw statement or at a function call.
     # /bigobj  Our event model spawns a large number of objects. By default, an object file can hold up to 65,279 (almost 2^16) addressable sections. This limit applies no matter which target platform is specified. /bigobj increases that address capacity to 4,294,967,296 (2^32).
     # /utf-8   All literals in our source code are in UTF-8 format.
-    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /EHsc /bigobj /utf-8 /Zc:preprocessor")
-    set (WIN32_RESOURCES ".resources/images/vtm.rc")
-else ()
-    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /EHsc /bigobj /utf-8 /Zc:preprocessor")
+    set(WIN32_RESOURCES ".resources/images/vtm.rc")
+else()
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread")
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DLUA_USE_POSIX")
     # Static linkage
-    #set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -static -pthread -s")
-endif ()
+    #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -static -pthread -s")
+endif()
 
-add_executable (vtm "src/vtm.cpp" ${WIN32_RESOURCES})
-# add_executable (term "src/netxs/apps/term.cpp")
-# add_executable (calc "src/netxs/apps/calc.cpp")
+# Lua
+include(FetchContent)
+FetchContent_Declare(lua
+                     URL      https://www.lua.org/ftp/lua-5.4.7.tar.gz
+                     URL_HASH SHA256=9fbf5e28ef86c69858f6d3d34eccc32e911c1a28b4120ff3e84aaa70cfbf1e30
+                     DOWNLOAD_EXTRACT_TIMESTAMP true)
+FetchContent_MakeAvailable(lua)
+file(GLOB lua_src CONFIGURE_DEPENDS ${lua_SOURCE_DIR}/src/*.c)
+list(REMOVE_ITEM lua_src ${lua_SOURCE_DIR}/src/lua.c ${lua_SOURCE_DIR}/src/luac.c)
+add_library(lua ${lua_src})
+target_include_directories(lua PUBLIC ${lua_SOURCE_DIR}/src)
+target_sources(lua PRIVATE ${lua_src})
 
-if (NOT WIN32)
-    install (TARGETS vtm  DESTINATION bin)
-endif ()
+add_executable(vtm "src/vtm.cpp" ${WIN32_RESOURCES})
+# add_executable(term "src/netxs/apps/term.cpp")
+# add_executable(calc "src/netxs/apps/calc.cpp")
+
+target_link_libraries(vtm lua)
+# target_link_libraries(term lua)
+# target_link_libraries(calc lua)
+
+if(NOT WIN32)
+    install(TARGETS vtm DESTINATION bin)
+endif()

CMakeSettings.json

@@ -13,7 +13,17 @@
       "variables": [
         {
           "name": "CMAKE_CXX_FLAGS_DEBUG",
-          "value": "-DDEBUG /MTd /Zi /Ob0 /Od /RTC1 /bigobj /utf-8 /Zc:preprocessor /W4",
+          "value": "/DDEBUG /MTd /Zi /Ob0 /Od /RTC1 /bigobj /utf-8 /Zc:preprocessor /W4",
+          "type": "STRING"
+        },
+        {
+          "name": "CMAKE_C_FLAGS_DEBUG",
+          "value": "/DDEBUG /MTd /c",
+          "type": "STRING"
+        },
+        {
+          "name": "CMAKE_MSVC_RUNTIME_LIBRARY",
+          "value": "MultiThreadedDebug",
           "type": "STRING"
         }
       ],
@@ -54,7 +64,17 @@
       "variables": [
         {
           "name": "CMAKE_CXX_FLAGS_DEBUG",
-          "value": "-DDEBUG /MTd /Zi /Ob0 /Od /RTC1 /bigobj /utf-8 /Zc:preprocessor /W4",
+          "value": "/DDEBUG /MTd /Zi /Ob0 /Od /RTC1 /bigobj /utf-8 /Zc:preprocessor /W4",
+          "type": "STRING"
+        },
+        {
+          "name": "CMAKE_C_FLAGS_DEBUG",
+          "value": "/DDEBUG /MTd /c",
+          "type": "STRING"
+        },
+        {
+          "name": "CMAKE_MSVC_RUNTIME_LIBRARY",
+          "value": "MultiThreadedDebug",
           "type": "STRING"
         }
       ]
@@ -80,6 +100,16 @@
           "name": "CMAKE_CXX_COMPILER",
           "value": "/bin/i686-linux-gnu-g++",
           "type": "STRING"
+        },
+        {
+          "name": "CMAKE_C_COMPILER",
+          "value": "/bin/i686-linux-gnu-gcc",
+          "type": "STRING"
+        },
+        {
+          "name": "CMAKE_C_FLAGS",
+          "value": "-O2 -static",
+          "type": "STRING"
         }
       ],
       "intelliSenseMode": "linux-gcc-x86",
@@ -101,6 +131,16 @@
           "name": "CMAKE_CXX_FLAGS_RELEASE",
           "value": "/MT /O2 /DNDEBUG /EHsc /bigobj /utf-8 /Zc:preprocessor /W4",
           "type": "STRING"
+        },
+        {
+          "name": "CMAKE_C_FLAGS_RELEASE",
+          "value": "/DNDEBUG /MT /O2 /c",
+          "type": "STRING"
+        },
+        {
+          "name": "CMAKE_MSVC_RUNTIME_LIBRARY",
+          "value": "MultiThreaded",
+          "type": "STRING"
         }
       ],
       "intelliSenseMode": "windows-msvc-arm"
@@ -120,6 +160,16 @@
           "name": "CMAKE_CXX_FLAGS_RELEASE",
           "value": "/MT /O2 /DNDEBUG /EHsc /bigobj /utf-8 /Zc:preprocessor /W4",
           "type": "STRING"
+        },
+        {
+          "name": "CMAKE_C_FLAGS_RELEASE",
+          "value": "/DNDEBUG /MT /O2 /c",
+          "type": "STRING"
+        },
+        {
+          "name": "CMAKE_MSVC_RUNTIME_LIBRARY",
+          "value": "MultiThreaded",
+          "type": "STRING"
         }
       ],
       "intelliSenseMode": "windows-msvc-arm64"
@@ -139,6 +189,16 @@
           "name": "CMAKE_CXX_FLAGS_RELEASE",
           "value": "/MT /O2 /DNDEBUG /EHsc /bigobj /utf-8 /Zc:preprocessor /W4",
           "type": "STRING"
+        },
+        {
+          "name": "CMAKE_C_FLAGS_RELEASE",
+          "value": "/DNDEBUG /MT /O2 /c",
+          "type": "STRING"
+        },
+        {
+          "name": "CMAKE_MSVC_RUNTIME_LIBRARY",
+          "value": "MultiThreaded",
+          "type": "STRING"
         }
       ]
     },
@@ -162,6 +222,16 @@
           "name": "DCMAKE_EXE_LINKER_FLAGS_RELEASE",
           "value": "/DEBUG /OPT:REF /OPT:ICF",
           "type": "STRING"
+        },
+        {
+          "name": "CMAKE_C_FLAGS_RELEASE",
+          "value": "/DNDEBUG /MT /O2 /c",
+          "type": "STRING"
+        },
+        {
+          "name": "CMAKE_MSVC_RUNTIME_LIBRARY",
+          "value": "MultiThreaded",
+          "type": "STRING"
         }
       ]
     },
@@ -186,6 +256,16 @@
           "name": "CMAKE_CXX_COMPILER",
           "value": "/bin/arm-linux-gnueabihf-g++",
           "type": "STRING"
+        },
+        {
+          "name": "CMAKE_C_COMPILER",
+          "value": "/bin/arm-linux-gnueabihf-gcc",
+          "type": "STRING"
+        },
+        {
+          "name": "CMAKE_C_FLAGS",
+          "value": "-O2 -static",
+          "type": "STRING"
         }
       ],
       "intelliSenseMode": "linux-gcc-arm",
@@ -214,6 +294,16 @@
           "name": "CMAKE_CXX_COMPILER",
           "value": "/bin/aarch64-linux-gnu-g++",
           "type": "STRING"
+        },
+        {
+          "name": "CMAKE_C_COMPILER",
+          "value": "/bin/aarch64-linux-gnu-gcc",
+          "type": "STRING"
+        },
+        {
+          "name": "CMAKE_C_FLAGS",
+          "value": "-O2 -static",
+          "type": "STRING"
         }
       ],
       "intelliSenseMode": "linux-gcc-arm",
@@ -242,6 +332,16 @@
           "name": "CMAKE_CXX_COMPILER",
           "value": "/bin/i686-linux-gnu-g++",
           "type": "STRING"
+        },
+        {
+          "name": "CMAKE_C_COMPILER",
+          "value": "/bin/i686-linux-gnu-gcc",
+          "type": "STRING"
+        },
+        {
+          "name": "CMAKE_C_FLAGS",
+          "value": "-O2 -static",
+          "type": "STRING"
         }
       ],
       "intelliSenseMode": "linux-gcc-x86",