diff options
Diffstat (limited to '')
-rw-r--r-- | config-5.1.lua | 6 | ||||
-rw-r--r-- | lua4win.wxs | 4 | ||||
-rw-r--r-- | meta.lua | 1 |
3 files changed, 8 insertions, 3 deletions
diff --git a/config-5.1.lua b/config-5.1.lua index 32af92f..30effe8 100644 --- a/config-5.1.lua +++ b/config-5.1.lua | |||
@@ -21,14 +21,14 @@ rocks_trees = { | |||
21 | } | 21 | } |
22 | arch="mingw32-x86_64" | 22 | arch="mingw32-x86_64" |
23 | variables.BUNZIP2="busybox-l4w bunzip2" | 23 | variables.BUNZIP2="busybox-l4w bunzip2" |
24 | variables.CP="COPY" | 24 | variables.CP="busybox-l4w cp" |
25 | variables.FIND="busybox-l4w find" | 25 | variables.FIND="busybox-l4w find" |
26 | variables.GUNZIP="busybox-l4w gunzip" | 26 | variables.GUNZIP="busybox-l4w gunzip" |
27 | variables.LS="DIR" | 27 | variables.LS="DIR /B" |
28 | variables.MD5="busybox-l4w md5sum" | 28 | variables.MD5="busybox-l4w md5sum" |
29 | variables.MD5SUM="busybox-l4w md5sum" | 29 | variables.MD5SUM="busybox-l4w md5sum" |
30 | variables.OPENSSL="busybox-l4w ssl_client" | 30 | variables.OPENSSL="busybox-l4w ssl_client" |
31 | variables.RMDIR="DEL" | 31 | variables.RMDIR="DEL /Q" |
32 | variables.SEVENZ="7z" | 32 | variables.SEVENZ="7z" |
33 | variables.TAR="busybox-l4w tar" | 33 | variables.TAR="busybox-l4w tar" |
34 | variables.TOUCH="busybox-l4w touch" | 34 | variables.TOUCH="busybox-l4w touch" |
diff --git a/lua4win.wxs b/lua4win.wxs index 74053e5..4a4f182 100644 --- a/lua4win.wxs +++ b/lua4win.wxs | |||
@@ -37,6 +37,9 @@ | |||
37 | <!-- Use a different name so we don't conflict with other busyboxes --> | 37 | <!-- Use a different name so we don't conflict with other busyboxes --> |
38 | <File Id="busyboxexe" DiskId='1' Source="busybox-l4w.exe" /> | 38 | <File Id="busyboxexe" DiskId='1' Source="busybox-l4w.exe" /> |
39 | </Component> | 39 | </Component> |
40 | <Component Id="sevenzip"> | ||
41 | <File Id="sevenzexe" DiskId='1' Source="7z.exe" /> | ||
42 | </Component> | ||
40 | <Directory Id="Config" Name="config"> | 43 | <Directory Id="Config" Name="config"> |
41 | <Component Id="Config"> | 44 | <Component Id="Config"> |
42 | <File Id="config.lua" Source="config-5.1.lua" /> | 45 | <File Id="config.lua" Source="config-5.1.lua" /> |
@@ -68,6 +71,7 @@ | |||
68 | <ComponentRef Id="luadl" /> | 71 | <ComponentRef Id="luadl" /> |
69 | <ComponentRef Id="luarocks" /> | 72 | <ComponentRef Id="luarocks" /> |
70 | <ComponentRef Id="busybox" /> | 73 | <ComponentRef Id="busybox" /> |
74 | <ComponentRef Id="sevenzip" /> | ||
71 | <ComponentRef Id="Config" /> | 75 | <ComponentRef Id="Config" /> |
72 | <ComponentRef Id="EnvironmentPath" /> | 76 | <ComponentRef Id="EnvironmentPath" /> |
73 | <ComponentRef Id="SysConfigPath" /> | 77 | <ComponentRef Id="SysConfigPath" /> |
@@ -15,6 +15,7 @@ build["lua4win-dist-lua"] = { | |||
15 | {"cicd","luajit-three-debug-mingw64:lua51.dll"}, | 15 | {"cicd","luajit-three-debug-mingw64:lua51.dll"}, |
16 | {"cicd","luarocks-jit-three-debug-mingw64:luarocks.exe"}, | 16 | {"cicd","luarocks-jit-three-debug-mingw64:luarocks.exe"}, |
17 | {"cicd","busybox-w32-three-debug-mingw64:busybox.exe"}, | 17 | {"cicd","busybox-w32-three-debug-mingw64:busybox.exe"}, |
18 | {"cicd","7zip:7z.exe"}, | ||
18 | {"cicd","lua4win-license:License.rtf"} | 19 | {"cicd","lua4win-license:License.rtf"} |
19 | }, | 20 | }, |
20 | produces = { | 21 | produces = { |