Add CI for improved QOL

.github/workflows/cjson.yml

@@ -0,0 +1,86 @@
+name: CJSON-Main
+
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - 'master'
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  CJSON_MASTER:
+    strategy:
+      matrix:
+        target_system: [ ubuntu-22.04, windows-2022, macos-11 ]
+    runs-on: ${{ matrix.target_system }}
+    env:
+      BUILD_EXT: ${{ matrix.target_system == 'windows-2022' && '.dll' || '.so' }}
+      BUILD_DIR: ${{ matrix.target_system == 'windows-2022' && 'D:/a/lua-cjson/lua-cjson' || '/home/runner/work/lua-cjson/lua-cjson' }}
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: msys2/setup-msys2@v2
+        if: runner.os == 'Windows'
+        with:
+          msystem: UCRT64
+          update: true
+          install: git mingw-w64-ucrt-x86_64-gcc
+
+      - name: Prime ccache
+        uses: hendrikmuhs/ccache-action@v1.2
+        with:
+          key: ${{ matrix.target_system }}
+          max-size: 1000M
+
+      - name: Cache LuaJIT
+        id: cache-Lua
+        uses: actions/cache@v3
+        with:
+          path: |
+            LuaJIT
+          key: ${{ runner.os }}-Lua
+
+      - name: Get Deps (LuaJIT)
+        shell: bash
+        if: steps.cache-Lua.outputs.cache-hit != 'true'
+        run: |
+          curl -o LuaJIT.7z -L https://github.com/DreamWeave-MP/luajit2/releases/download/Stable-CI/LuaJIT-${{ runner.os }}.7z
+          7z x -y LuaJIT.7z -oLuaJIT/
+
+      - name: Configure
+        if: runner.os != 'Windows'
+        shell: bash
+        run: |
+          LUA_DIR=LuaJIT/ cmake .
+
+      - name: Configure
+        if: runner.os == 'Windows'
+        shell: bash
+        run: |
+          LUA_DIR=LuaJIT/ CC=$(which gcc) cmake . -G 'MinGW Makefiles'
+
+      - name: Build
+        run: |
+          cmake --build .
+
+      - name: Prep Release
+        run: |
+          mv cjson${{ env.BUILD_EXT }} cjson-${{ runner.os }}${{ env.BUILD_EXT }}
+
+      - name: Upload Release
+        if: github.event_name != 'pull_request'
+        uses: softprops/action-gh-release@v2
+        with:
+          tag_name: Stable-CI
+          files: cjson-${{ runner.os }}${{ env.BUILD_EXT }}
+          body: |
+            CI Build for Dreamweave IO2 fork
+
+      - name: Upload Artifact
+        if: github.event_name == 'pull_request'
+        uses: actions/upload-artifact@v6
+        with:
+          name: cjson-${{ runner.os }}
+          path: cjson-${{ runner.os }}${{ env.BUILD_EXT }}

.github/workflows/test.yml

@@ -0,0 +1,61 @@
+name: test
+
+on: [push, pull_request]
+
+jobs:
+  test:
+    strategy:
+      fail-fast: false
+      matrix:
+        cc: ["gcc", "clang"]
+        luaVersion: ["5.1", "5.2", "5.3", "5.4", "luajit", "luajit-openresty"]
+        include:
+          - luaVersion: "luajit"
+            runtestArgs: "LUA_INCLUDE_DIR=.lua/include/luajit-2.1"
+            runtestEnv: "SKIP_CMAKE=1"
+          - luaVersion: "luajit-openresty"
+            runtestArgs: "LUA_INCLUDE_DIR=.lua/include/luajit-2.1"
+            runtestEnv: "SKIP_CMAKE=1"
+
+    runs-on: ubuntu-24.04
+
+    steps:
+    - uses: actions/checkout@master
+
+    - uses: leafo/gh-actions-lua@master
+      env:
+        CC: ${{ matrix.cc }}
+      with:
+        luaVersion: ${{ matrix.luaVersion }}
+        luaCompileFlags: CC=${{ matrix.cc }}
+
+    - uses: leafo/gh-actions-luarocks@master
+
+    - name: runtests.sh
+      env:
+        CC: ${{ matrix.cc }}
+      run: |
+        LUA_DIR=.lua ${{ matrix.runtestEnv }} ./runtests.sh PREFIX=.lua ${{ matrix.runtestArgs }}
+
+    - name: setup prove
+      env:
+        CC: ${{ matrix.cc }}
+      run: |
+        make PREFIX=.lua ${{ matrix.runtestArgs }}
+        sudo apt-get update
+        sudo apt-get install -q valgrind libipc-run3-perl cppcheck cpanminus
+        sudo cpanm --notest Test::Base Test::LongString
+
+    - name: cppcheck
+      run: cppcheck -i .lua/ -i .install/ -i dtoa.c --force --error-exitcode=1 --enable=warning --inline-suppr .
+
+    - name: prove
+      run: LUA_BIN=lua prove -Itests tests
+
+    - name: prove (valgrind)
+      run: LUA_BIN=lua TEST_LUA_USE_VALGRIND=1 prove -Itests tests
+
+    - name: build
+      run: |
+        luarocks make
+

.gitignore

@@ -1,6 +1,7 @@
 *.html
 *.o
 *.so
+*.a
 notes
 packages
 tags

.travis.yml

@@ -1,13 +1,12 @@
 sudo: required
-dist: trusty
+dist: Focal
 
 os: linux
 
 language: c
 
 compiler:
   - gcc
-  - clang
 
 addons:
   apt:
@@ -18,6 +17,7 @@ addons:
     - libipc-run3-perl
     - lua5.1
     - lua5.1-dev
+    - cmake
 
 cache:
   apt: true
@@ -27,10 +27,11 @@ env:
     - JOBS=3
     - LUAROCKS_VER=2.4.2
   matrix:
-      #- LUA=1 LUA_DIR=/usr LUA_INCLUDE_DIR=$LUA_DIR/include/lua5.1
+      #- LUA=1 LUA_DIR=/usr LUA_INCLUDE_DIR=$LUA_DIR/include/lua5.1 
       - LUAJIT=1 LUA_DIR=/usr/local LUA_INCLUDE_DIR=$LUA_DIR/include/luajit-2.1 LUA_SUFFIX=--lua-suffix=jit
 
 install:
+    - sudo ln -s /usr/bin/cmake /usr/local/bin/cmake
     - if [ -n "$LUAJIT" ]; then git clone -b v2.1-agentzh https://github.com/openresty/luajit2.git; fi
     - if [ -n "$LUAJIT" ]; then cd ./luajit2; fi
     - if [ -n "$LUAJIT" ]; then make -j$JOBS CCDEBUG=-g Q= PREFIX=$LUAJIT_PREFIX CC=$CC XCFLAGS='-DLUA_USE_APICHECK -DLUA_USE_ASSERT' > build.log 2>&1 || (cat build.log && exit 1); fi
@@ -47,8 +48,14 @@ install:
     - cd ..
 
 script:
-  - cppcheck -i ./luajit2 -i --force --error-exitcode=1 --enable=warning . > build.log 2>&1 || (cat build.log && exit 1)
-  - sh runtests.sh
+  - cppcheck -i ./luajit2 --force --error-exitcode=1 --enable=warning . > build.log 2>&1 || (cat build.log && exit 1)
+  - bash runtests.sh
+  - make
+  - prove -Itests tests
+  - TEST_LUA_USE_VALGRIND=1 prove -Itests tests > build.log 2>&1; export e=$?
+  - cat build.log
+  - grep -E '^==[0-9]+==' build.log; if [ "$?" == 0 ]; then exit 1; else exit $e; fi
+  - cmake -DUSE_INTERNAL_FPCONV=1 .
   - make
   - prove -Itests tests
   - TEST_LUA_USE_VALGRIND=1 prove -Itests tests > build.log 2>&1; export e=$?

CI/get_luajit.Linux.sh

@@ -0,0 +1,36 @@
+#!/bin/bash
+
+set -euo pipefail
+
+print_help() {
+  echo "usage: $0 [group]..."
+  echo
+  echo "  available groups: "${!GROUPED_DEPS[@]}""
+}
+
+declare -rA GROUPED_DEPS=(
+  # Common dependencies for building OpenMW.
+  [openmw-deps]="
+    libluajit-5.1-dev
+  "
+)
+
+if [[ $# -eq 0 ]]; then
+  >&2 print_help
+  exit 1
+fi
+
+deps=()
+for group in "$@"; do
+  if [[ ! -v GROUPED_DEPS[$group] ]]; then
+    >&2 echo "error: unknown group ${group}"
+    exit 1
+  fi
+  deps+=(${GROUPED_DEPS[$group]})
+done
+
+export APT_CACHE_DIR="${PWD}/apt-cache"
+set -x
+mkdir -pv "$APT_CACHE_DIR"
+apt-get update -yq
+apt-get -q -o dir::cache::archives="$APT_CACHE_DIR" install -y --no-install-recommends "${deps[@]}"

CI/get_luajit.windows.sh

@@ -0,0 +1,52 @@
+set -e
+
+download() {
+    if [ $# -lt 3 ]; then
+	echo "Invalid parameters to download."
+	return 1
+    fi
+
+    NAME=$1
+    shift
+
+    echo "$NAME..."
+
+    while [ $# -gt 1 ]; do
+	URL=$1
+	FILE=$2
+	shift
+	shift
+
+	if ! [ -f $FILE ]; then
+	    printf "  Downloading $FILE... "
+
+	    if [ -z $VERBOSE ]; then
+		RET=0
+		curl --silent --fail --retry 10 -Ly 5 -o $FILE $URL || RET=$?
+	    else
+		RET=0
+		curl --fail --retry 10 -Ly 5 -o $FILE $URL || RET=$?
+	    fi
+
+	    if [ $RET -ne 0 ]; then
+		echo "Failed!"
+		wrappedExit $RET
+	    else
+		echo "Done."
+	    fi
+	else
+	    echo "  $FILE exists, skipping."
+	fi
+    done
+
+    if [ $# -ne 0 ]; then
+	echo "Missing parameter."
+    fi
+}
+
+download "LuaJIT v2.1.0-beta3-452-g7a0cf5fd" \
+	 "https://gitlab.com/OpenMW/openmw-deps/-/raw/main/windows/LuaJIT-v2.1.0-beta3-452-g7a0cf5fd-msvc2019-win64.7z" \
+	 "LuaJIT-v2.1.0-beta3-452-g7a0cf5fd-msvc2019-win64.7z"
+
+echo "Extracting LuaJIT . . ."
+eval 7z x -y LuaJIT-v2.1.0-beta3-452-g7a0cf5fd-msvc2019-win64.7z -o./LuaJIT

CMakeLists.txt

@@ -4,7 +4,7 @@
 #       Windows: set LUA_DIR=c:\lua51
 
 project(lua-cjson C)
-cmake_minimum_required(VERSION 2.6)
+cmake_minimum_required(VERSION 2.8.12)
 
 option(USE_INTERNAL_FPCONV "Use internal strtod() / g_fmt() code for performance")
 option(MULTIPLE_THREADS "Support multi-threaded apps with internal fpconv - recommended" ON)
@@ -15,7 +15,9 @@ if(NOT CMAKE_BUILD_TYPE)
         FORCE)
 endif()
 
-find_package(Lua51 REQUIRED)
+set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/)
+
+find_package(LuaJit REQUIRED)
 include_directories(${LUA_INCLUDE_DIR})
 
 if(NOT USE_INTERNAL_FPCONV)
@@ -68,6 +70,13 @@ else()
     set(_lua_module_dir "${_lua_lib_dir}/lua/5.1")
 endif()
 
+if(MSVC)
+    add_definitions(-D_CRT_SECURE_NO_WARNINGS)
+    add_definitions(-Dinline=__inline)
+    add_definitions(-Dsnprintf=_snprintf)
+    add_definitions(-Dstrncasecmp=_strnicmp)
+endif()
+
 add_library(cjson MODULE lua_cjson.c strbuf.c ${FPCONV_SOURCES})
 set_target_properties(cjson PROPERTIES PREFIX "")
 target_link_libraries(cjson ${_MODULE_LINK})

Makefile

@@ -15,7 +15,7 @@ LUA_VERSION =       5.1
 TARGET =            cjson.so
 PREFIX =            /usr/local
 #CFLAGS =            -g -Wall -pedantic -fno-inline
-CFLAGS =            -O3 -Wall -pedantic -DNDEBUG
+CFLAGS =            -O3 -Wall -pedantic -DNDEBUG -g
 CJSON_CFLAGS =      -fpic
 CJSON_LDFLAGS =     -shared
 LUA_INCLUDE_DIR ?=   $(PREFIX)/include
@@ -84,20 +84,20 @@ OBJS =              lua_cjson.o strbuf.o $(FPCONV_OBJS)
 
 .PHONY: all clean install install-extra doc
 
-.SUFFIXES: .html .txt
+.SUFFIXES: .html .adoc
 
 .c.o:
 	$(CC) -c $(CFLAGS) $(CPPFLAGS) $(BUILD_CFLAGS) -o $@ $<
 
-.txt.html:
+.adoc.html:
 	$(ASCIIDOC) -n -a toc $<
 
 all: $(TARGET)
 
 doc: manual.html performance.html
 
 $(TARGET): $(OBJS)
-	$(CC) $(LDFLAGS) $(CJSON_LDFLAGS) -o $@ $(OBJS)
+	$(CC) -o $@ $(LDFLAGS) $(CJSON_LDFLAGS) $(OBJS)
 
 install: $(TARGET)
 	mkdir -p $(DESTDIR)$(LUA_CMODULE_DIR)