2020-11-22 22:07:29 +01:00
|
|
|
diff -uNr wordgrinder-0.8/build.lua wordgrinder-0.8.mod/build.lua
|
|
|
|
--- wordgrinder-0.8/build.lua 2020-10-23 21:48:53.000000000 +0000
|
|
|
|
+++ wordgrinder-0.8.mod/build.lua 2020-11-22 21:00:14.905827141 +0000
|
|
|
|
@@ -549,11 +549,9 @@
|
2019-05-11 17:27:56 +02:00
|
|
|
if has_package(luapackage) then
|
|
|
|
if want_frontend("x11") then
|
|
|
|
build_wordgrinder_binary("bin/xwordgrinder", luapackage, "x11", buildstyle)
|
|
|
|
- run_wordgrinder_tests("bin/xwordgrinder", luapackage, "x11", buildstyle)
|
|
|
|
end
|
|
|
|
if want_frontend("curses") then
|
|
|
|
build_wordgrinder_binary("bin/wordgrinder", luapackage, "curses", buildstyle)
|
|
|
|
- run_wordgrinder_tests("bin/wordgrinder", luapackage, "curses", buildstyle)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
2020-11-22 22:07:29 +01:00
|
|
|
@@ -579,23 +577,14 @@
|
2019-05-11 17:27:56 +02:00
|
|
|
return binary
|
|
|
|
end
|
|
|
|
|
|
|
|
- local preferred_test
|
|
|
|
local preferred_curses
|
|
|
|
local preferred_x11
|
|
|
|
if want_frontend("curses") then
|
|
|
|
preferred_curses = "bin/wordgrinder-"..package_name(LUA_PACKAGE).."-curses-release"
|
|
|
|
- preferred_test = "test-"..package_name(LUA_PACKAGE).."-curses-debug"
|
|
|
|
-
|
|
|
|
- preferred_curses = strip_binary(preferred_curses)
|
|
|
|
install_file("755", preferred_curses, DESTDIR..BINDIR.."/wordgrinder")
|
|
|
|
end
|
|
|
|
if want_frontend("x11") then
|
|
|
|
preferred_x11 = "bin/xwordgrinder-"..package_name(LUA_PACKAGE).."-x11-release"
|
|
|
|
- if not preferred_test then
|
|
|
|
- preferred_test = "test-"..package_name(LUA_PACKAGE).."-x11-debug"
|
|
|
|
- end
|
|
|
|
-
|
|
|
|
- preferred_x11 = strip_binary(preferred_x11)
|
|
|
|
install_file("755", preferred_x11, DESTDIR..BINDIR.."/xwordgrinder")
|
|
|
|
end
|
|
|
|
install_file("644", "bin/wordgrinder.1", DESTDIR..MANDIR.."/man1/wordgrinder.1")
|
2020-11-22 22:07:29 +01:00
|
|
|
@@ -615,8 +604,7 @@
|
2019-05-11 17:27:56 +02:00
|
|
|
|
2020-11-22 22:07:29 +01:00
|
|
|
emit("build binaries: phony bin/wordgrinder.1 bin/xwordgrinder.1 ",
|
|
|
|
preferred_curses or "", " ", preferred_x11 or "", " ")
|
|
|
|
- emit("build tests: phony ", preferred_test)
|
2019-05-11 17:27:56 +02:00
|
|
|
- emit("build all: phony binaries tests")
|
|
|
|
+ emit("build all: phony binaries")
|
|
|
|
emit("build install: phony all ", table.concat(installables, " "))
|
|
|
|
emit("build install-notests: phony binaries ", table.concat(installables, " "))
|
|
|
|
end
|