From 86fad8c7a34a7f597bd592d8f684ff78e66a837a Mon Sep 17 00:00:00 2001 From: Alexander M Pickering Date: Thu, 7 Nov 2024 22:33:47 -0600 Subject: Use busybox for wget and some other utilities --- config-5.1.lua | 15 +++++++++++++++ init | 1 + lua4win.wxs | 5 +++++ meta.lua | 1 + 4 files changed, 22 insertions(+) diff --git a/config-5.1.lua b/config-5.1.lua index 713c6a9..edc4330 100644 --- a/config-5.1.lua +++ b/config-5.1.lua @@ -20,3 +20,18 @@ rocks_trees = { } } arch="mingw32-x86_64" +variables.BUNZIP2="busybox-l4w bunzip2" +variables.CP="COPY" +variables.FIND="busybox-l4w find" +variables.GUNZIP="busybox-l4w gunzip" +variables.LS="DIR" +variables.MD5="busybox-l4w md5sum" +variables.MD5SUM="busybox-l4w md5sum" +variables.OPENSSL="busybox-l4w ssl_client" +variables.RMDIR="DEL" +variables.SEVENZ="7z" +variables.TAR="busybox-l4w tar" +variables.TOUCH="busybox-l4w touch" +variables.UNZIP="busybox-l4w unzip -n" +variables.WGET="busybox-l4w wget" +variables.WGETNOCERTFLAG="" diff --git a/init b/init index 27395b3..e357f15 100755 --- a/init +++ b/init @@ -3,6 +3,7 @@ cp lua4win-dist-lua/lua4win.wxs . cp lua4win-dist-lua/License.rtf . cp lua4win-dist-lua/config-5.1.lua . +mv busybox.exe busybox-l4w.exe cat lua4win.wxs | awk -f lua4win-dist-lua/guid_replacer.awk > replacer.sed sed -i -f replacer.sed lua4win.wxs wix/candle lua4win.wxs diff --git a/lua4win.wxs b/lua4win.wxs index 8052432..2463b40 100644 --- a/lua4win.wxs +++ b/lua4win.wxs @@ -34,6 +34,10 @@ + + + + @@ -65,6 +69,7 @@ + diff --git a/meta.lua b/meta.lua index eb2c6e9..d3ffc58 100644 --- a/meta.lua +++ b/meta.lua @@ -14,6 +14,7 @@ build["lua4win-dist-lua"] = { {"cicd","lua51-three-debug-mingw64:lua.exe"}, {"cicd","lua51-three-debug-mingw64:lua51.dll"}, {"cicd","luarocks-51-three-debug-mingw64:luarocks.exe"}, + {"cicd","busybox-w32-three-debug-mingw64:busybox.exe"}, {"cicd","lua4win-license:License.rtf"} }, produces = { -- cgit v1.2.3-55-g6feb