Add our rock servers and a system-wide rock tree

3 files changed, 32 insertions, 2 deletions

diff --git a/config-5.1.lua b/config-5.1.lua
new file mode 100644
index 0000000..a24aa83
--- /dev/null
+++ b/config-5.1.lua
@@ -0,0 +1,19 @@
+
+rocks_servers = {
+        {
+                "http://lua4.win",
+                "https://luarocks.org",
+                "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/",
+                "https://loadk.com/luarocks/"
+        }
+}
+rocks_trees = {
+        {
+                name = "system",
+                root = os_getenv("LUAROCKS_SYSCONFDIR"):gsub("config","luarocks")
+        },
+        {
+                name = "user",
+                root = home .. "\\luarocks"
+        }
+}
diff --git a/lua4win.wxs b/lua4win.wxs
index 194db77..42c2402 100644
--- a/lua4win.wxs
+++ b/lua4win.wxs
@@ -38,6 +38,8 @@
                                                         <Component Id="Config">
                                                                 <File Id="config.lua" Source="config-5.1.lua" />
                                                         </Component>
+                                                        </Directory>
+                                                <Directory Id="Luarocks" Name="luarocks">
                                                 </Directory>
                                                 <Component Id="EnvironmentPath" Guid="Lua4Win.PATH">
                                                         <Environment Id="Path" Name="PATH" Action="set" System="yes" Part="last" Value="[INSTALLDIR]"/>
@@ -45,6 +47,13 @@
                                                 <Component Id="SysConfigPath" Guid="Lua4Win.SYSCONFDIR">
                                                         <Environment Id="Sysconfdir" Name="LUAROCKS_SYSCONFDIR" Action="set" System="yes" Part="last" Value="[INSTALLDIR]config"/>
                                                 </Component>
+                                                <!-- This stuff is re-created from `luarocks path` -->
+                                                <Component ID="LuaPath" Guid="Lua4Win.LUA_PATH">
+                                                        <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" />
+                                                </Component>
+                                                <Component Id="LuaCPath" Guid="Lua4Win.LUA_CPATH">
+                                                        <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" />
+                                                </Component>
                                         </Directory>
                                 </Directory>
                         </Directory>
@@ -57,6 +66,8 @@
                         <ComponentRef Id="Config" />
                         <ComponentRef Id="EnvironmentPath" />
                         <ComponentRef Id="SysConfigPath" />
+                        <ComponentRef Id="LuaPath" />
+                        <ComponentRef Id="LuaCPath" />
                 </Feature>
 
                 <Property Id="WIXUI_INSTALLDIR" Value="INSTALLDIR" />
diff --git a/test b/test
index 2f74971..83f1130 100755
--- a/test
+++ b/test
@@ -75,7 +75,7 @@ tar -czf images.tar.gz *.png
 
 # Make sure we've installed it
 INSTALLDIR='/root/.wine/drive_c/Program Files (x86)/Lua4Win/Lua4Win 1.0'
-test -e $INSTALLDIR/luajit.exe
-test -e $INSTALLDIR/luarocks.exe
+test -e "$INSTALLDIR/luajit.exe"
+test -e "$INSTALLDIR/luarocks.exe"
 wine "$INSTALLDIR/luarocks.exe" --help
 wine "$INSTALLDIR/luarocks.exe" config