github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-19 21:03:48 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Update build and CI scripts to LUA 5.4

Browse source
This commit is contained in:
Jean-Michel Picod 2024-09-20 17:01:52 +02:00
commit 18e3600d95
5 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/codeql-analysis.yml vendored
View file

@ -41,7 +41,7 @@ jobs:
run: sudo apt-get update run: sudo apt-get update
- name: Install dependencies - name: Install dependencies
run: sudo apt-get install -yqq make autoconf build-essential ca-certificates pkg-config libreadline-dev gcc-arm-none-eabi libnewlib-dev qtbase5-dev libbz2-dev liblz4-dev libbluetooth-dev libpython3-dev python3 python3-dev libpython3-all-dev liblua5.2-dev liblua5.2-0 lua5.2 sed libssl-dev run: sudo apt-get install -yqq make autoconf build-essential ca-certificates pkg-config libreadline-dev gcc-arm-none-eabi libnewlib-dev qtbase5-dev libbz2-dev liblz4-dev libbluetooth-dev libpython3-dev python3 python3-dev libpython3-all-dev liblua5.4-dev liblua5.4-0 lua5.4 sed libssl-dev
- name: Install Python dependencies - name: Install Python dependencies
run: | run: |

6
.github/workflows/ubuntu.yml vendored
View file

@ -30,7 +30,7 @@ jobs:
run: sudo apt-get update run: sudo apt-get update
- name: Install dependencies - name: Install dependencies
run: sudo apt-get install -yqq make autoconf build-essential ca-certificates pkg-config libreadline-dev gcc-arm-none-eabi libnewlib-dev qtbase5-dev libbz2-dev liblz4-dev libbluetooth-dev libpython3-dev python3 python3-dev libpython3-all-dev liblua5.2-dev liblua5.2-0 lua5.2 sed libssl-dev libgd-dev run: sudo apt-get install -yqq make autoconf build-essential ca-certificates pkg-config libreadline-dev gcc-arm-none-eabi libnewlib-dev qtbase5-dev libbz2-dev liblz4-dev libbluetooth-dev libpython3-dev python3 python3-dev libpython3-all-dev liblua5.4-dev liblua5.4-0 lua5.4 sed libssl-dev libgd-dev
- name: Install Python dependencies - name: Install Python dependencies
run: pip install -r tools/requirements.txt run: pip install -r tools/requirements.txt
@ -60,7 +60,7 @@ jobs:
run: sudo apt-get update run: sudo apt-get update
- name: Install dependencies - name: Install dependencies
run: sudo apt-get install -yqq make autoconf build-essential ca-certificates pkg-config libreadline-dev gcc-arm-none-eabi libnewlib-dev qtbase5-dev libbz2-dev liblz4-dev libbluetooth-dev libpython3-dev python3 python3-dev libpython3-all-dev liblua5.2-dev liblua5.2-0 lua5.2 sed libssl-dev libgd-dev run: sudo apt-get install -yqq make autoconf build-essential ca-certificates pkg-config libreadline-dev gcc-arm-none-eabi libnewlib-dev qtbase5-dev libbz2-dev liblz4-dev libbluetooth-dev libpython3-dev python3 python3-dev libpython3-all-dev liblua5.4-dev liblua5.4-0 lua5.4 sed libssl-dev libgd-dev
- name: Install Python dependencies - name: Install Python dependencies
run: pip install -r tools/requirements.txt run: pip install -r tools/requirements.txt
@ -91,7 +91,7 @@ jobs:
run: sudo apt-get update run: sudo apt-get update
- name: Install dependencies - name: Install dependencies
run: sudo apt-get install -yqq make autoconf build-essential ca-certificates pkg-config libreadline-dev gcc-arm-none-eabi libnewlib-dev qtbase5-dev libbz2-dev liblz4-dev libbluetooth-dev libpython3-dev python3 python3-dev libpython3-all-dev liblua5.2-dev liblua5.2-0 lua5.2 sed libssl-dev libgd-dev run: sudo apt-get install -yqq make autoconf build-essential ca-certificates pkg-config libreadline-dev gcc-arm-none-eabi libnewlib-dev qtbase5-dev libbz2-dev liblz4-dev libbluetooth-dev libpython3-dev python3 python3-dev libpython3-all-dev liblua5.4-dev liblua5.4-0 lua5.4 sed libssl-dev libgd-dev
- name: Install Python dependencies - name: Install Python dependencies
run: pip install -r tools/requirements.txt run: pip install -r tools/requirements.txt

8
client/Makefile
View file

@ -175,11 +175,11 @@ PM3INCLUDES += $(ID48LIBINC)
## Lua ## Lua
ifneq ($(SKIPLUASYSTEM),1) ifneq ($(SKIPLUASYSTEM),1)
ifdef MACPORTS_PREFIX ifdef MACPORTS_PREFIX
LUAINCLUDES = $(shell $(PKG_CONFIG_ENV) pkg-config --cflags lua-5.2 2>/dev/null) LUAINCLUDES = $(shell $(PKG_CONFIG_ENV) pkg-config --cflags lua-5.4 2>/dev/null)
LUALDLIBS = $(shell $(PKG_CONFIG_ENV) pkg-config --libs lua-5.2 2>/dev/null) LUALDLIBS = $(shell $(PKG_CONFIG_ENV) pkg-config --libs lua-5.4 2>/dev/null)
else else
LUAINCLUDES = $(shell $(PKG_CONFIG_ENV) pkg-config --cflags lua5.2 2>/dev/null) LUAINCLUDES = $(shell $(PKG_CONFIG_ENV) pkg-config --cflags lua5.4 2>/dev/null)
LUALDLIBS = $(shell $(PKG_CONFIG_ENV) pkg-config --libs lua5.2 2>/dev/null) LUALDLIBS = $(shell $(PKG_CONFIG_ENV) pkg-config --libs lua5.4 2>/dev/null)
endif endif
ifneq ($(LUALDLIBS),) ifneq ($(LUALDLIBS),)
LUALIB = LUALIB =

6
client/deps/lua.cmake
View file

@ -7,6 +7,7 @@ add_library(pm3rrg_rdv4_lua STATIC
liblua/ldump.c liblua/ldump.c
liblua/lfunc.c liblua/lfunc.c
liblua/lgc.c liblua/lgc.c
liblua/linit.c
liblua/llex.c liblua/llex.c
liblua/lmem.c liblua/lmem.c
liblua/lobject.c liblua/lobject.c
@ -21,16 +22,15 @@ add_library(pm3rrg_rdv4_lua STATIC
liblua/lzio.c liblua/lzio.c
liblua/lauxlib.c liblua/lauxlib.c
liblua/lbaselib.c liblua/lbaselib.c
liblua/lbitlib.c
liblua/lcorolib.c liblua/lcorolib.c
liblua/ldblib.c liblua/ldblib.c
liblua/liolib.c liblua/liolib.c
liblua/lmathlib.c liblua/lmathlib.c
liblua/loadlib.c
liblua/loslib.c liblua/loslib.c
liblua/lstrlib.c liblua/lstrlib.c
liblua/ltablib.c liblua/ltablib.c
liblua/loadlib.c liblua/lutf8lib.c
liblua/linit.c
) )
target_compile_definitions(pm3rrg_rdv4_lua PRIVATE LUA_COMPAT_ALL) target_compile_definitions(pm3rrg_rdv4_lua PRIVATE LUA_COMPAT_ALL)

4
client/experimental_lib/example_lua/02run_test.sh
View file

@ -1,8 +1,8 @@
#!/bin/bash #!/bin/bash
# pm3.so somewhere in default LUA_CPATH : # pm3.so somewhere in default LUA_CPATH :
# /usr/local/lib/lua/5.2/pm3.so # /usr/local/lib/lua/5.4/pm3.so
# /usr/lib/lua/5.2/pm3.so # /usr/lib/lua/5.4/pm3.so
# ./pm3.so # ./pm3.so
./test.lua ./test.lua