summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander M Pickering <alex@cogarr.net>2024-11-07 22:33:47 -0600
committerAlexander M Pickering <alex@cogarr.net>2024-11-07 22:33:47 -0600
commit86fad8c7a34a7f597bd592d8f684ff78e66a837a (patch)
treebd0177ac62f000efe6bd7989b48b93ea2979363d
parent270d9c3325ff2fe56e473968248c8b7cd291f8d2 (diff)
downloadlua4win-dist-lua-86fad8c7a34a7f597bd592d8f684ff78e66a837a.tar.gz
lua4win-dist-lua-86fad8c7a34a7f597bd592d8f684ff78e66a837a.tar.bz2
lua4win-dist-lua-86fad8c7a34a7f597bd592d8f684ff78e66a837a.zip
Use busybox for wget and some other utilitiesbug/lua_versions
-rw-r--r--config-5.1.lua15
-rwxr-xr-xinit1
-rw-r--r--lua4win.wxs5
-rw-r--r--meta.lua1
4 files changed, 22 insertions, 0 deletions
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 = {
20 } 20 }
21} 21}
22arch="mingw32-x86_64" 22arch="mingw32-x86_64"
23variables.BUNZIP2="busybox-l4w bunzip2"
24variables.CP="COPY"
25variables.FIND="busybox-l4w find"
26variables.GUNZIP="busybox-l4w gunzip"
27variables.LS="DIR"
28variables.MD5="busybox-l4w md5sum"
29variables.MD5SUM="busybox-l4w md5sum"
30variables.OPENSSL="busybox-l4w ssl_client"
31variables.RMDIR="DEL"
32variables.SEVENZ="7z"
33variables.TAR="busybox-l4w tar"
34variables.TOUCH="busybox-l4w touch"
35variables.UNZIP="busybox-l4w unzip -n"
36variables.WGET="busybox-l4w wget"
37variables.WGETNOCERTFLAG=""
diff --git a/init b/init
index 27395b3..e357f15 100755
--- a/init
+++ b/init
@@ -3,6 +3,7 @@
3cp lua4win-dist-lua/lua4win.wxs . 3cp lua4win-dist-lua/lua4win.wxs .
4cp lua4win-dist-lua/License.rtf . 4cp lua4win-dist-lua/License.rtf .
5cp lua4win-dist-lua/config-5.1.lua . 5cp lua4win-dist-lua/config-5.1.lua .
6mv busybox.exe busybox-l4w.exe
6cat lua4win.wxs | awk -f lua4win-dist-lua/guid_replacer.awk > replacer.sed 7cat lua4win.wxs | awk -f lua4win-dist-lua/guid_replacer.awk > replacer.sed
7sed -i -f replacer.sed lua4win.wxs 8sed -i -f replacer.sed lua4win.wxs
8wix/candle lua4win.wxs 9wix/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 @@
34 <Component Id="luarocks"> 34 <Component Id="luarocks">
35 <File Id="luarocksexe" DiskId='1' Source="luarocks.exe" /> 35 <File Id="luarocksexe" DiskId='1' Source="luarocks.exe" />
36 </Component> 36 </Component>
37 <Component Id="busybox">
38 <!-- Use a different name so we don't conflict with other busyboxes -->
39 <File Id="busyboxexe" DiskId='1' Source="busybox-l4w.exe" />
40 </Component>
37 <Directory Id="Config" Name="config"> 41 <Directory Id="Config" Name="config">
38 <Component Id="Config"> 42 <Component Id="Config">
39 <File Id="config.lua" Source="config-5.1.lua" /> 43 <File Id="config.lua" Source="config-5.1.lua" />
@@ -65,6 +69,7 @@
65 <ComponentRef Id="lua" /> 69 <ComponentRef Id="lua" />
66 <ComponentRef Id="luadl" /> 70 <ComponentRef Id="luadl" />
67 <ComponentRef Id="luarocks" /> 71 <ComponentRef Id="luarocks" />
72 <ComponentRef Id="busybox" />
68 <ComponentRef Id="Config" /> 73 <ComponentRef Id="Config" />
69 <ComponentRef Id="EnvironmentPath" /> 74 <ComponentRef Id="EnvironmentPath" />
70 <ComponentRef Id="SysConfigPath" /> 75 <ComponentRef Id="SysConfigPath" />
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"] = {
14 {"cicd","lua51-three-debug-mingw64:lua.exe"}, 14 {"cicd","lua51-three-debug-mingw64:lua.exe"},
15 {"cicd","lua51-three-debug-mingw64:lua51.dll"}, 15 {"cicd","lua51-three-debug-mingw64:lua51.dll"},
16 {"cicd","luarocks-51-three-debug-mingw64:luarocks.exe"}, 16 {"cicd","luarocks-51-three-debug-mingw64:luarocks.exe"},
17 {"cicd","busybox-w32-three-debug-mingw64:busybox.exe"},
17 {"cicd","lua4win-license:License.rtf"} 18 {"cicd","lua4win-license:License.rtf"}
18 }, 19 },
19 produces = { 20 produces = {