MacroQuest Customizations for luarocks 3.92

- Set version to 3.9.2-mq
- Added --skip-config-warning to skip the lua interpreter warning
- Added --cache for specifying cache
- Added -e for excuting lua directly using the built-in interpreter
- Updated lua-bz2 dep for windows and adjusted for https for easier retrieval
- Fixed issue with downloading ZLIB for windows builds
- Updated paths for mingw for compiling on WSL with mingw
- Hacked in a fix for forcing the all_in_one CONFIG_FILE to retain the LUA_INCDIR
- Hacked in a fix for luasocket building on WSL with mingw

Author: Knightly1

appveyor.yml

@@ -1,12 +1,12 @@
-version: 3.0.0.{build}-test
+version: 3.9.2-mq.
 
 shallow_clone: true
 
 matrix:
   fast_finish: true
 
 environment:
-  LUAROCKS_VER: 3.0.0
+  LUAROCKS_VER: 3.9.2-mq
 
   matrix:
   # Lua 5.4 tests

binary/Makefile.windows

@@ -1,14 +1,14 @@
 
 # "i686-w64-mingw32" or "x86_64-w64-mingw32"
-MINGW_PREFIX?=i686-w64-mingw32
+MINGW_PREFIX?=x86_64-w64-mingw32
 # sysroot of your mingw-w64 installation
-MINGW_SYSROOT=/usr/lib/mingw-w64-sysroot/$(MINGW_PREFIX)
+MINGW_SYSROOT=/usr/$(MINGW_PREFIX)
 # "mingw" or "mingw64"
 OPENSSL_PLATFORM=mingw
 # Versions of dependencies
 LIBLUA_VERSION=5.4.3
 OPENSSL_VERSION=1.0.2o
-ZLIB_VERSION=1.2.12
+ZLIB_VERSION=1.3
 BZIP2_VERSION=1.0.6
 
 WINDOWS_DEPS_DIR=windows-deps-$(MINGW_PREFIX)
@@ -24,7 +24,7 @@ windows-binary: $(WINDOWS_DEPS_DIR)/lib/liblua.a $(WINDOWS_DEPS_DIR)/lib/libssl.
 
 $(BUILD_WINDOWS_DEPS_DIR)/lua-$(LIBLUA_VERSION).tar.gz:
 	mkdir -p $(@D)
-	cd $(BUILD_WINDOWS_DEPS_DIR) && curl -OL https://www.lua.org/ftp/lua-$(LIBLUA_VERSION).tar.gz
+	cd $(BUILD_WINDOWS_DEPS_DIR) && wget https://www.lua.org/ftp/lua-$(LIBLUA_VERSION).tar.gz
 $(BUILD_WINDOWS_DEPS_DIR)/lua-$(LIBLUA_VERSION): $(BUILD_WINDOWS_DEPS_DIR)/lua-$(LIBLUA_VERSION).tar.gz
 	cd $(BUILD_WINDOWS_DEPS_DIR) && tar zxvpf lua-$(LIBLUA_VERSION).tar.gz
 $(WINDOWS_DEPS_DIR)/lib/liblua.a: $(BUILD_WINDOWS_DEPS_DIR)/lua-$(LIBLUA_VERSION)
@@ -36,7 +36,7 @@ $(WINDOWS_DEPS_DIR)/lib/liblua.a: $(BUILD_WINDOWS_DEPS_DIR)/lua-$(LIBLUA_VERSION
 
 $(BUILD_WINDOWS_DEPS_DIR)/openssl-$(OPENSSL_VERSION).tar.gz:
 	mkdir -p $(@D)
-	cd $(BUILD_WINDOWS_DEPS_DIR) && curl -OL https://www.openssl.org/source/openssl-$(OPENSSL_VERSION).tar.gz
+	cd $(BUILD_WINDOWS_DEPS_DIR) && wget https://www.openssl.org/source/openssl-$(OPENSSL_VERSION).tar.gz
 $(BUILD_WINDOWS_DEPS_DIR)/openssl-$(OPENSSL_VERSION): $(BUILD_WINDOWS_DEPS_DIR)/openssl-$(OPENSSL_VERSION).tar.gz
 	cd $(BUILD_WINDOWS_DEPS_DIR) && tar zxvpf openssl-$(OPENSSL_VERSION).tar.gz
 $(WINDOWS_DEPS_DIR)/lib/libssl.a: $(BUILD_WINDOWS_DEPS_DIR)/openssl-$(OPENSSL_VERSION)
@@ -46,7 +46,7 @@ $(WINDOWS_DEPS_DIR)/lib/libssl.a: $(BUILD_WINDOWS_DEPS_DIR)/openssl-$(OPENSSL_VE
 
 $(BUILD_WINDOWS_DEPS_DIR)/zlib-$(ZLIB_VERSION).tar.gz:
 	mkdir -p $(@D)
-	cd $(BUILD_WINDOWS_DEPS_DIR) && curl -OL https://www.zlib.net/zlib-$(ZLIB_VERSION).tar.gz
+	cd $(BUILD_WINDOWS_DEPS_DIR) && wget https://www.zlib.net/zlib-$(ZLIB_VERSION).tar.gz
 $(BUILD_WINDOWS_DEPS_DIR)/zlib-$(ZLIB_VERSION): $(BUILD_WINDOWS_DEPS_DIR)/zlib-$(ZLIB_VERSION).tar.gz
 	cd $(BUILD_WINDOWS_DEPS_DIR) && tar zxvpf zlib-$(ZLIB_VERSION).tar.gz
 $(WINDOWS_DEPS_DIR)/lib/libz.a: $(BUILD_WINDOWS_DEPS_DIR)/zlib-$(ZLIB_VERSION)
@@ -61,7 +61,7 @@ $(WINDOWS_DEPS_DIR)/lib/libz.a: $(BUILD_WINDOWS_DEPS_DIR)/zlib-$(ZLIB_VERSION)
 
 $(BUILD_WINDOWS_DEPS_DIR)/bzip2-$(BZIP2_VERSION).tar.gz:
 	mkdir -p $(@D)
-	cd $(BUILD_WINDOWS_DEPS_DIR) && curl -OL http://downloads.sourceforge.net/project/bzip2/bzip2-$(BZIP2_VERSION).tar.gz
+	cd $(BUILD_WINDOWS_DEPS_DIR) && wget http://downloads.sourceforge.net/project/bzip2/bzip2-$(BZIP2_VERSION).tar.gz
 $(BUILD_WINDOWS_DEPS_DIR)/bzip2-$(BZIP2_VERSION): $(BUILD_WINDOWS_DEPS_DIR)/bzip2-$(BZIP2_VERSION).tar.gz
 	cd $(BUILD_WINDOWS_DEPS_DIR) && tar zxvpf bzip2-$(BZIP2_VERSION).tar.gz
 $(WINDOWS_DEPS_DIR)/lib/libbz2.a: $(BUILD_WINDOWS_DEPS_DIR)/bzip2-$(BZIP2_VERSION)

binary/all_in_one

@@ -34,7 +34,7 @@ local FORCE_CONFIG = (arg[6] == "yes")
 local MY_PLATFORM = arg[7] or "unix"
 local CC = arg[8] or "gcc"
 local NM = arg[9] or "nm"
-local CROSSCOMPILER_SYSROOT = arg[10] or "/usr/lib/mingw-w64-sysroot/i686-w64-mingw32"
+local CROSSCOMPILER_SYSROOT = arg[10] or "/usr/x86_64-w64-mingw32"
 local TRIPLET = arg[11] or CROSSCOMPILER_SYSROOT:gsub(".*/", "")
 local PROCESSOR = arg[12] or TRIPLET:gsub("%-.*", "")
 if PROCESSOR == "i686" then
@@ -435,6 +435,27 @@ end
 
 --------------------------------------------------------------------------------
 
+local function readFile(path)
+   local file = io.open(path, "r")
+   if not file then return nil end
+   local content = file:read("*a")
+   file:close()
+   return content
+end
+
+-- Function to write contents to a file
+local function writeFile(path, content)
+   local file = io.open(path, "w")
+   if not file then return false end
+   file:write(content)
+   file:close()
+   return true
+end
+
+---------------------------------------------------------------------------------
+
+
+
 local function main()
 
    os.remove("src/luarocks/core/hardcoded.lua")
@@ -466,11 +487,11 @@ local function main()
 
    local dependencies = {
       md5 = "md5",
-      luasec = "./binary/luasec-1.0.2-1.rockspec",
       ["lua-zlib"] = "./binary/lua-zlib-1.2-0.rockspec",
       ["lua-bz2"] = "./binary/lua-bz2-0.2.1-1.rockspec",
       luaposix = if_platform("unix", "./binary/luaposix-35.1-1.rockspec"),
       luasocket = "luasocket",
+      luasec = "./binary/luasec-1.0.2-1.rockspec",
       luafilesystem = "luafilesystem",
       dkjson = "dkjson",
    }
@@ -482,7 +503,30 @@ local function main()
       print("----------------------------------------------------------------")
       local vers = manif.get_versions(queries.from_dep_string(name), "one")
       if not next(vers) then
-         local ok = os.execute("LUAROCKS_CONFIG='" .. CONFIG_FILE .. "' ./luarocks install --no-project '--tree=" .. LUA_MODULES .. "' " .. arg)
+         -- Knightly Edit to force config update
+         local content = readFile(CONFIG_FILE)
+         if not content then
+            error("Failed to read the config file at "..CONFIG_FILE)
+         end
+         -- Add or update the LUA_INCDIR line
+         local luaIncDirLine = '   LUA_INCDIR = "/usr/include/lua5.4",\n'
+         if not content:find("LUA_INCDIR") then
+            -- Add new line
+            content = content:gsub("(variables%s*=%s*{)", "%1\n" .. luaIncDirLine)
+            -- Write the updated content back to the config file
+            if not writeFile(CONFIG_FILE, content) then
+               error("Failed to write to the config file at "..CONFIG_FILE)
+            end
+         end
+
+         local ok = 1
+         if name == 'luasocket' and string.find(CONFIG_FILE, 'mingw') then
+            print("LUAROCKS_CONFIG='" .. CONFIG_FILE .. "' ./luarocks install --only-server https://raw.githubusercontent.com/macroquest/moonrocks/luarocks_build/ --no-project '--tree=" .. LUA_MODULES .. "' " .. arg)
+            ok = os.execute("LUAROCKS_CONFIG='" .. CONFIG_FILE .. "' ./luarocks install --only-server https://raw.githubusercontent.com/macroquest/moonrocks/luarocks_build/ --no-project '--tree=" .. LUA_MODULES .. "' " .. arg)
+         else
+           print("LUAROCKS_CONFIG='" .. CONFIG_FILE .. "' ./luarocks install --no-project '--tree=" .. LUA_MODULES .. "' " .. arg)
+           ok = os.execute("LUAROCKS_CONFIG='" .. CONFIG_FILE .. "' ./luarocks install --no-project '--tree=" .. LUA_MODULES .. "' " .. arg)
+         end
          if ok ~= 0 and ok ~= true then
             error("Failed building dependency: " .. name)
          end

binary/lua-bz2-0.2.1-1.rockspec

@@ -1,8 +1,8 @@
 package = "lua-bz2"
 version = "0.2.1-1"
 source = {
-   url = "git+ssh://git@github.com/hishamhm/lua-bz2.git",
-   tag = "0.2.1",
+   url = "git+https://github.com/hishamhm/lua-bz2.git",
+   tag = "0.2.1.1",
 }
 description = {
    summary = "A Lua binding to Julian Seward's libbzip2",

configure

@@ -320,7 +320,7 @@ do
 done
 
 echo
-BLUE "Configuring LuaRocks version dev..."
+BLUE "Configuring LuaRocks version 3.9.2-mq..."
 echo
 echo
 

install.bat

@@ -6,7 +6,7 @@ local vars = {}
 
 
 vars.PREFIX = nil
-vars.VERSION = "3.0"
+vars.VERSION = "3.9"
 vars.SYSCONFDIR = nil
 vars.CONFBACKUPDIR = nil
 vars.SYSCONFFILENAME = nil

src/luarocks/cmd.lua

@@ -486,6 +486,11 @@ Enabling completion for Fish:
       tostring(cfg.connection_timeout)..".")
       :argname("<seconds>")
       :convert(tonumber)
+   parser:option("--cache", "Folder to use for caching rockspecs")
+      :argname("<cache>")
+   parser:flag("--skip-config-warning", "Skip the warning for missing configuration")
+   parser:option("-e", "Execute lua script and exit")
+      :argname("<quoted_script>")
 
    -- Used internally to force the use of a particular project tree
    parser:option("--project-tree"):hidden(true)
@@ -578,6 +583,20 @@ function cmd.run_command(description, commands, external_namespace, ...)
    local parser = get_parser(description, cmd_modules)
    args = parser:parse(args)
 
+   -- Execute lua script and exit
+   if args.e then
+      local func, err = load(args.e)
+      if func then
+         local success, runtimeError = pcall(func)
+         if not success then
+             die(runtimeError)
+         end
+         os.exit(cmd.errorcodes.OK)
+      else
+         die(err)
+      end
+   end
+
    -- Compatibility for old flag
    if args.nodeps then
       args.deps_mode = "none"
@@ -617,7 +636,7 @@ function cmd.run_command(description, commands, external_namespace, ...)
       end
    end
 
-   if not lua_found and args.command ~= "config" and args.command ~= "help" then
+   if not lua_found and args.command ~= "config" and args.command ~= "help" and not args.skip_config_warning then
       util.warning(tried ..
                    "\nModules may not install with the correct configurations. " ..
                    "You may want to configure the path prefix to your build " ..
@@ -662,6 +681,10 @@ function cmd.run_command(description, commands, external_namespace, ...)
       cfg.local_cache = dir.path(fs.system_cache_dir(), "luarocks")
    end
 
+   if args.cache then
+      cfg.local_cache = args.cache
+   end
+
    if args.no_manifest then
       cfg.no_manifest = true
    end

src/luarocks/core/cfg.lua

@@ -20,7 +20,7 @@ local vers = require("luarocks.core.vers")
 
 --------------------------------------------------------------------------------
 
-local program_version = "dev"
+local program_version = "3.9.2-mq"
 
 local is_windows = package.config:sub(1,1) == "\\"