diff options
| author | Alexander M Pickering <alex@cogarr.net> | 2024-11-17 13:15:19 -0600 |
|---|---|---|
| committer | Alexander M Pickering <alex@cogarr.net> | 2024-11-17 13:15:19 -0600 |
| commit | f999d65015ffb2bbf8b5d7fb0c2b96d0fe57b01f (patch) | |
| tree | 32e5362d4d5bcfdaf75e81a6b97c74bb26b2f35b | |
| parent | bb10efc22d0ceefee87a15ae30dfbc5af0f947c0 (diff) | |
| download | lua4win-dist-lua-f999d65015ffb2bbf8b5d7fb0c2b96d0fe57b01f.tar.gz lua4win-dist-lua-f999d65015ffb2bbf8b5d7fb0c2b96d0fe57b01f.tar.bz2 lua4win-dist-lua-f999d65015ffb2bbf8b5d7fb0c2b96d0fe57b01f.zip | |
Fix end tag
| -rw-r--r-- | lua4win.wxs | 65 |
1 files changed, 32 insertions, 33 deletions
diff --git a/lua4win.wxs b/lua4win.wxs index c801f65..74053e5 100644 --- a/lua4win.wxs +++ b/lua4win.wxs | |||
| @@ -24,42 +24,41 @@ | |||
| 24 | <Directory Id="TARGETDIR" Name="SourceDir"> | 24 | <Directory Id="TARGETDIR" Name="SourceDir"> |
| 25 | <Directory Id="ProgramFilesFolder"> | 25 | <Directory Id="ProgramFilesFolder"> |
| 26 | <Directory Id="INSTALLDIR" Name="Lua4Win"> | 26 | <Directory Id="INSTALLDIR" Name="Lua4Win"> |
| 27 | <Component Id="lua"> | 27 | <Component Id="lua"> |
| 28 | <File Id="luaexe" DiskId='1' Source="lua.exe" /> | 28 | <File Id="luaexe" DiskId='1' Source="lua.exe" /> |
| 29 | </Component> | ||
| 30 | <Component Id="luadl"> | ||
| 31 | <File Id="lua51dll" DiskId='1' Source="lua51.dll" /> | ||
| 32 | </Component> | ||
| 33 | <Component Id="luarocks"> | ||
| 34 | <File Id="luarocksexe" DiskId='1' Source="luarocks.exe" /> | ||
| 35 | </Component> | ||
| 36 | <Component Id="busybox"> | ||
| 37 | <!-- Use a different name so we don't conflict with other busyboxes --> | ||
| 38 | <File Id="busyboxexe" DiskId='1' Source="busybox-l4w.exe" /> | ||
| 39 | </Component> | ||
| 40 | <Directory Id="Config" Name="config"> | ||
| 41 | <Component Id="Config"> | ||
| 42 | <File Id="config.lua" Source="config-5.1.lua" /> | ||
| 29 | </Component> | 43 | </Component> |
| 30 | <Component Id="luadl"> | ||
| 31 | <File Id="lua51dll" DiskId='1' Source="lua51.dll" /> | ||
| 32 | </Component> | ||
| 33 | <Component Id="luarocks"> | ||
| 34 | <File Id="luarocksexe" DiskId='1' Source="luarocks.exe" /> | ||
| 35 | </Component> | ||
| 36 | <Component Id="busybox"> | ||
| 37 | <!-- Use a different name so we don't conflict with other busyboxes --> | ||
| 38 | <File Id="busyboxexe" DiskId='1' Source="busybox-l4w.exe" /> | ||
| 39 | </Component> | ||
| 40 | <Directory Id="Config" Name="config"> | ||
| 41 | <Component Id="Config"> | ||
| 42 | <File Id="config.lua" Source="config-5.1.lua" /> | ||
| 43 | </Component> | ||
| 44 | </Directory> | ||
| 45 | <Directory Id="Luarocks" Name="luarocks"> | ||
| 46 | </Directory> | 44 | </Directory> |
| 47 | <Component Id="EnvironmentPath" Guid="Lua4Win.PATH"> | 45 | <Directory Id="Luarocks" Name="luarocks"> |
| 48 | <Environment Id="Path" Name="PATH" Action="set" System="yes" Part="last" Value="[INSTALLDIR]"/> | ||
| 49 | <Environment Id="Path2" Name="PATH" Action="set" System="yes" Part="last" Value="[INSTALLDIR]luarocks\\bin"/> | ||
| 50 | <Environment Id="Path3" Name="PATH" Action="set" System="yes" Part="last" Value="[AppDataFolder]luarocks\\bin"/> | ||
| 51 | </Component> | ||
| 52 | <Component Id="SysConfigPath" Guid="Lua4Win.SYSCONFDIR"> | ||
| 53 | <Environment Id="Sysconfdir" Name="LUAROCKS_SYSCONFDIR" Action="set" System="yes" Part="last" Value="[INSTALLDIR]config"/> | ||
| 54 | </Component> | ||
| 55 | <!-- This stuff is re-created from `luarocks path` --> | ||
| 56 | <Component Id="LuaPath" Guid="Lua4Win.LUA_PATH"> | ||
| 57 | <Environment Id="LUA_PATH" Name="LUA_PATH" Action="set" System="yes" Part="last" Value=".\\?.lua;[INSTALLDIR]lua\\?.lua;[INSTALLDIR]lua\\?\\init.lua;[AppDataFolder]luarocks\\share\\lua\\5.1\\?.lua;[AppDataFolder]luarocks\\share\\lua\\5.1\\?\\init.lua" /> | ||
| 58 | </Component> | ||
| 59 | <Component Id="LuaCPath" Guid="Lua4Win.LUA_CPATH"> | ||
| 60 | <Environment Id="LUA_CPATH" Name="LUA_CPATH" Action="set" System="yes" Part="last" Value=".\\?.dll;[INSTALLDIR]?.dll;[INSTALLDIR]loadall.dll;[AppDataFolder]luarocks\\lib\\lua\\5.1\\?.dll" /> | ||
| 61 | </Component> | ||
| 62 | </Directory> | 46 | </Directory> |
| 47 | <Component Id="EnvironmentPath" Guid="Lua4Win.PATH"> | ||
| 48 | <Environment Id="Path" Name="PATH" Action="set" System="yes" Part="last" Value="[INSTALLDIR]"/> | ||
| 49 | <Environment Id="Path2" Name="PATH" Action="set" System="yes" Part="last" Value="[INSTALLDIR]luarocks\\bin"/> | ||
| 50 | <Environment Id="Path3" Name="PATH" Action="set" System="yes" Part="last" Value="[AppDataFolder]luarocks\\bin"/> | ||
| 51 | </Component> | ||
| 52 | <Component Id="SysConfigPath" Guid="Lua4Win.SYSCONFDIR"> | ||
| 53 | <Environment Id="Sysconfdir" Name="LUAROCKS_SYSCONFDIR" Action="set" System="yes" Part="last" Value="[INSTALLDIR]config"/> | ||
| 54 | </Component> | ||
| 55 | <!-- This stuff is re-created from `luarocks path` --> | ||
| 56 | <Component Id="LuaPath" Guid="Lua4Win.LUA_PATH"> | ||
| 57 | <Environment Id="LUA_PATH" Name="LUA_PATH" Action="set" System="yes" Part="last" Value=".\\?.lua;[INSTALLDIR]lua\\?.lua;[INSTALLDIR]lua\\?\\init.lua;[AppDataFolder]luarocks\\share\\lua\\5.1\\?.lua;[AppDataFolder]luarocks\\share\\lua\\5.1\\?\\init.lua" /> | ||
| 58 | </Component> | ||
| 59 | <Component Id="LuaCPath" Guid="Lua4Win.LUA_CPATH"> | ||
| 60 | <Environment Id="LUA_CPATH" Name="LUA_CPATH" Action="set" System="yes" Part="last" Value=".\\?.dll;[INSTALLDIR]?.dll;[INSTALLDIR]loadall.dll;[AppDataFolder]luarocks\\lib\\lua\\5.1\\?.dll" /> | ||
| 61 | </Component> | ||
| 63 | </Directory> | 62 | </Directory> |
| 64 | </Directory> | 63 | </Directory> |
| 65 | </Directory> | 64 | </Directory> |