Skip to content

Fix make dist to depend on LuaJIT's jit/*.lua files #33

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

Merged
merged 6 commits into from
Jan 3, 2023
Merged

Fix make dist to depend on LuaJIT's jit/*.lua files #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ffb2396
Fix add `build/jit/*.lua` as dependencies to `dist` target
gilzoide Jan 3, 2023
518df81
Update `clean` target to clear all non-hidden files
gilzoide Jan 3, 2023
cea8354
Update CHANGELOG
gilzoide Jan 3, 2023
da7e1c5
Fix `unzip-to-build` target to only copy build contents
gilzoide Jan 3, 2023
5bcd21e
Fix `test-*` targets
gilzoide Jan 3, 2023
5922e16
Update CHANGELOG
gilzoide Jan 3, 2023
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
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Changelog
## [Unreleased](https://github.com/gilzoide/godot-lua-pluginscript/compare/0.5.0...HEAD)
### Fixed

- [build] Fixed `make dist` dependencies to include LuaJIT's `jit/*.lua` files
- [build] Fixed `make unzip-to-build` to only copy contents from `build` folder

## [0.5.0](https://github.com/gilzoide/godot-lua-pluginscript/releases/tag/0.5.0)
### Added
Expand Down
51 changes: 37 additions & 14 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ XCODEBUILD ?= xcodebuild
NDK_TOOLCHAIN_BIN ?= $(wildcard $(ANDROID_NDK_ROOT)/toolchains/llvm/prebuilt/*/bin)
ZIP_URL ?=
ZIP_URL_DOWNLOAD_OUTPUT ?= /tmp/godot-lua-pluginscript-unzip-to-build.zip
ZIP_TEMP_FOLDER ?= /tmp/godot-lua-pluginscript-unzip-to-build


CFLAGS += -std=c11 -Ilib/godot-headers -Ilib/high-level-gdnative -Ilib/luajit/src
Expand All @@ -36,24 +37,39 @@ _STRIP = $(CROSS)$(STRIP)
SRC = language_gdnative.c
OBJS = $(SRC:.c=.o) init_script.o
BUILT_OBJS = $(addprefix build/%/,$(OBJS))
MAKE_LUAJIT_OUTPUT = build/%/luajit/src/luajit.o build/%/luajit/src/lua51.dll build/%/luajit/src/libluajit.a
LUAJIT_MAKE_OUTPUT = build/%/luajit/src/luajit.o build/%/luajit/src/lua51.dll build/%/luajit/src/libluajit.a

PLUGIN_SRC = plugin/export_plugin.lua \
plugin/in_editor_callbacks/.gdignore \
plugin/in_editor_callbacks/init.lua \
plugin/lua_repl.lua \
plugin/lua_repl.tscn \
plugin/luasrcdiet/.gdignore \
plugin/plugin.cfg \
plugin/plugin.gd

GDNLIB_ENTRY_PREFIX = addons/godot-lua-pluginscript
BUILD_FOLDERS = \
build build/native build/$(GDNLIB_ENTRY_PREFIX) \
build build/native build/$(GDNLIB_ENTRY_PREFIX) build/jit \
build/windows_x86 build/windows_x86_64 \
build/linux_x86 build/linux_x86_64 \
build/osx_x86_64 build/osx_arm64 build/osx_arm64_x86_64 \
build/ios_armv7s build/ios_arm64 build/ios_simulator_arm64 build/ios_simulator_x86_64 build/ios_simulator_arm64_x86_64 \
build/android_armv7a build/android_aarch64 build/android_x86 build/android_x86_64

LUAJIT_JITLIB_SRC = bc.lua bcsave.lua dump.lua p.lua v.lua zone.lua \
dis_x86.lua dis_x64.lua dis_arm.lua dis_arm64.lua \
dis_arm64be.lua dis_ppc.lua dis_mips.lua dis_mipsel.lua \
dis_mips64.lua dis_mips64el.lua vmdef.lua
LUAJIT_JITLIB_DEST = $(addprefix build/jit/,$(LUAJIT_JITLIB_SRC))

LUASRCDIET_SRC = $(wildcard lib/luasrcdiet/luasrcdiet/*.lua) lib/luasrcdiet/COPYRIGHT lib/luasrcdiet/COPYRIGHT_Lua51
LUASRCDIET_DEST = $(addprefix plugin/luasrcdiet/,$(notdir $(LUASRCDIET_SRC)))
LUASRCDIET_FLAGS = --maximum --quiet --noopt-binequiv

DIST_BUILT_LIBS = $(filter-out build/osx_arm64/% build/osx_x86_64/% build/ios_simulator_arm64/% build/ios_simulator_x86_64/%,$(wildcard build/*/*lua*.*))
DIST_SRC = LICENSE
DIST_ADDONS_SRC = LICENSE lps_coroutine.lua lua_pluginscript.gdnlib build/.gdignore $(wildcard build/jit/*.lua plugin/*.* plugin/in_editor_callbacks/* plugin/*/.gdignore) $(DIST_BUILT_LIBS) $(LUASRCDIET_DEST)
DIST_ADDONS_SRC = LICENSE lps_coroutine.lua lua_pluginscript.gdnlib build/.gdignore $(PLUGIN_SRC) $(DIST_BUILT_LIBS) $(LUASRCDIET_DEST) $(LUAJIT_JITLIB_DEST)
DIST_ZIP_SRC = $(DIST_SRC) $(addprefix $(GDNLIB_ENTRY_PREFIX)/,$(DIST_ADDONS_SRC))
DIST_DEST = $(addprefix build/,$(DIST_SRC)) $(addprefix build/$(GDNLIB_ENTRY_PREFIX)/,$(DIST_ADDONS_SRC))

Expand Down Expand Up @@ -119,31 +135,36 @@ ifneq (,$(CODE_SIGN_IDENTITY))
endif

define GEN_TEST
test-$1: $1 $(LUASRCDIET_DEST) $(DIST_DEST) build/project.godot
test-$1: $1 $(LUASRCDIET_DEST) $(LUAJIT_JITLIB_DEST) $(DIST_DEST) build/project.godot
@mkdir -p $(dir build/addons/godot-lua-pluginscript/$2)
cp $2 build/addons/godot-lua-pluginscript/$2
$(GODOT_BIN) --path build --no-window --quit --script "$(CURDIR)/src/test/init.lua"
endef

# Avoid removing intermediate files created by chained implicit rules
.PRECIOUS: build/%/luajit build/%/init_script.c $(BUILT_OBJS) build/%/lua51.dll $(MAKE_LUAJIT_OUTPUT)
.PRECIOUS: build/%/luajit build/%/init_script.c $(BUILT_OBJS) build/%/lua51.dll $(LUAJIT_MAKE_OUTPUT)

$(BUILD_FOLDERS):
mkdir -p $@

build/%/language_gdnative.o: src/language_gdnative.c lib/high-level-gdnative/hgdn.h
$(_CC) -o $@ $< -c $(CFLAGS)

$(MAKE_LUAJIT_OUTPUT): | build/%/luajit build/jit
$(LUAJIT_MAKE_OUTPUT): | build/%/luajit
$(MAKE) -C $(firstword $|) $(and $(TARGET_SYS),TARGET_SYS=$(TARGET_SYS)) $(MAKE_LUAJIT_ARGS)
@mkdir -p build/jit
cp $(firstword $|)/src/jit/vmdef.lua build/jit
build/%/luajit/src/jit/vmdef.lua: | build/%/luajit
$(MAKE) -C $(firstword $|)/src jit/vmdef.lua $(MAKE_LUAJIT_ARGS)
build/%/lua51.dll: build/%/luajit/src/lua51.dll
cp $< $@
build/%/luajit: | build/%
cp -r lib/luajit $@
build/jit: | build
cp -r lib/luajit/src/jit/ $@

build/jit/vmdef.lua: MACOSX_DEPLOYMENT_TARGET ?= 11.0
build/jit/vmdef.lua: MAKE_LUAJIT_ARGS = MACOSX_DEPLOYMENT_TARGET=$(MACOSX_DEPLOYMENT_TARGET)
build/jit/vmdef.lua: build/native/luajit/src/jit/vmdef.lua | build/jit
cp $< $@
build/jit/%.lua: lib/luajit/src/jit/%.lua | build/jit
cp $< $@

build/init_script.lua: $(LUA_INIT_SCRIPT_SRC) | build
cat $^ > $@
Expand Down Expand Up @@ -192,7 +213,7 @@ build/$(GDNLIB_ENTRY_PREFIX)/%:
cp $* $@
$(addprefix build/,$(DIST_SRC)): | build
cp $(notdir $@) $@
build/lua_pluginscript.zip: $(LUASRCDIET_DEST) $(DIST_DEST)
build/lua_pluginscript.zip: $(LUASRCDIET_DEST) $(LUAJIT_JITLIB_DEST) $(DIST_DEST)
cd build && zip lua_pluginscript $(DIST_ZIP_SRC)
build/project.godot: src/tools/project.godot | build
cp $< $@
Expand All @@ -205,7 +226,7 @@ build/compile_commands.json: Makefile
# Phony targets
.PHONY: clean dist docs set-version unzip-to-build
clean:
$(RM) -r build/*/ plugin/luasrcdiet/*
$(RM) -r $(wildcard build/**) plugin/luasrcdiet/*

dist: build/lua_pluginscript.zip

Expand All @@ -218,12 +239,14 @@ set-version:
plugin/plugin.cfg

unzip-to-build:
$(RM) -r $(ZIP_TEMP_FOLDER)/*
ifneq (,$(filter http://% https://%,$(ZIP_URL)))
curl -L $(ZIP_URL) -o $(ZIP_URL_DOWNLOAD_OUTPUT)
cd build && unzip -u $(ZIP_URL_DOWNLOAD_OUTPUT)
unzip $(ZIP_URL_DOWNLOAD_OUTPUT) -d $(ZIP_TEMP_FOLDER)
else
cd build && unzip -u $(ZIP_URL)
unzip $(ZIP_URL) -d $(ZIP_TEMP_FOLDER)
endif
cp -R $(ZIP_TEMP_FOLDER)/addons/godot-lua-pluginscript/build/. build


# Miscelaneous targets
Expand Down