From 0f4c793427a1cf2b7879ee668c1479058412629c Mon Sep 17 00:00:00 2001 From: Hisham Muhammad Date: Thu, 8 Dec 2022 15:11:02 -0300 Subject: Release 3.9.2 --- appveyor.yml | 4 ++-- configure | 2 +- install.bat | 2 +- luarocks-3.9.2-1.rockspec | 38 ++++++++++++++++++++++++++++++++++++++ luarocks-dev-1.rockspec | 37 ------------------------------------- src/luarocks/core/cfg.lua | 2 +- 6 files changed, 43 insertions(+), 42 deletions(-) create mode 100644 luarocks-3.9.2-1.rockspec delete mode 100644 luarocks-dev-1.rockspec diff --git a/appveyor.yml b/appveyor.yml index b084cff5..81d0310f 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,4 +1,4 @@ -version: 3.0.0.{build}-test +version: 3.9.2.{build}-test shallow_clone: true @@ -6,7 +6,7 @@ matrix: fast_finish: true environment: - LUAROCKS_VER: 3.0.0 + LUAROCKS_VER: 3.9.2 matrix: # Lua 5.4 tests diff --git a/configure b/configure index 4a5542b9..a8bf8809 100755 --- a/configure +++ b/configure @@ -320,7 +320,7 @@ do done echo -BLUE "Configuring LuaRocks version dev..." +BLUE "Configuring LuaRocks version 3.9.2..." echo echo diff --git a/install.bat b/install.bat index 7a5df9cd..de8cb70b 100644 --- a/install.bat +++ b/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 diff --git a/luarocks-3.9.2-1.rockspec b/luarocks-3.9.2-1.rockspec new file mode 100644 index 00000000..c4fe644d --- /dev/null +++ b/luarocks-3.9.2-1.rockspec @@ -0,0 +1,38 @@ +rockspec_format = "3.0" +package = "luarocks" +version = "3.9.2-1" +source = { + url = "git+https://github.com/luarocks/luarocks", + tag = "v3.9.2" +} +description = { + summary = "A package manager for Lua modules.", + detailed = [[ + LuaRocks allows you to install Lua modules as self-contained + packages called "rocks", which also contain version dependency + information. This information is used both during installation, + so that when one rock is requested all rocks it depends on are + installed as well, and at run time, so that when a module is + required, the correct version is loaded. LuaRocks supports both + local and remote repositories, and multiple local rocks trees. + ]], + homepage = "http://www.luarocks.org", + issues_url = "https://github.com/luarocks/luarocks/issues", + maintainer = "Hisham Muhammad", + license = "MIT", +} +test_dependencies = { + "luacov", + "busted-htest", +} +test = { + type = "busted", + platforms = { + windows = { + flags = { "--exclude-tags=ssh,git,unix", "-Xhelper", "lua_dir=$(LUA_DIR)", "-Xhelper", "lua_interpreter=$(LUA)" } + }, + unix = { + flags = { "--exclude-tags=ssh,git", "-Xhelper", "lua_dir=$(LUA_DIR)", "-Xhelper", "lua_interpreter=$(LUA)" } + } + } +} diff --git a/luarocks-dev-1.rockspec b/luarocks-dev-1.rockspec deleted file mode 100644 index 718ce338..00000000 --- a/luarocks-dev-1.rockspec +++ /dev/null @@ -1,37 +0,0 @@ -rockspec_format = "3.0" -package = "luarocks" -version = "dev-1" -source = { - url = "git+https://github.com/luarocks/luarocks", -} -description = { - summary = "A package manager for Lua modules.", - detailed = [[ - LuaRocks allows you to install Lua modules as self-contained - packages called "rocks", which also contain version dependency - information. This information is used both during installation, - so that when one rock is requested all rocks it depends on are - installed as well, and at run time, so that when a module is - required, the correct version is loaded. LuaRocks supports both - local and remote repositories, and multiple local rocks trees. - ]], - homepage = "http://www.luarocks.org", - issues_url = "https://github.com/luarocks/luarocks/issues", - maintainer = "Hisham Muhammad", - license = "MIT", -} -test_dependencies = { - "luacov", - "busted-htest", -} -test = { - type = "busted", - platforms = { - windows = { - flags = { "--exclude-tags=ssh,git,unix", "-Xhelper", "lua_dir=$(LUA_DIR)", "-Xhelper", "lua_interpreter=$(LUA)" } - }, - unix = { - flags = { "--exclude-tags=ssh,git", "-Xhelper", "lua_dir=$(LUA_DIR)", "-Xhelper", "lua_interpreter=$(LUA)" } - } - } -} diff --git a/src/luarocks/core/cfg.lua b/src/luarocks/core/cfg.lua index a5f27e27..eb170f35 100644 --- a/src/luarocks/core/cfg.lua +++ b/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" local is_windows = package.config:sub(1,1) == "\\" -- cgit v1.2.3-55-g6feb From fda59d6ab9321a9be5cff01136883bc1eaf5b270 Mon Sep 17 00:00:00 2001 From: Hisham Muhammad Date: Thu, 8 Dec 2022 17:06:42 -0300 Subject: Windows binary: update zlib to 1.2.13 --- binary/Makefile.windows | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/binary/Makefile.windows b/binary/Makefile.windows index 3e540279..8d943ed1 100644 --- a/binary/Makefile.windows +++ b/binary/Makefile.windows @@ -8,7 +8,7 @@ OPENSSL_PLATFORM=mingw # Versions of dependencies LIBLUA_VERSION=5.4.3 OPENSSL_VERSION=1.0.2o -ZLIB_VERSION=1.2.12 +ZLIB_VERSION=1.2.13 BZIP2_VERSION=1.0.6 WINDOWS_DEPS_DIR=windows-deps-$(MINGW_PREFIX) -- cgit v1.2.3-55-g6feb From b5a1b7de2ab8a0d3eb2c517af1de6f73e48fbe23 Mon Sep 17 00:00:00 2001 From: Hisham Muhammad Date: Thu, 8 Dec 2022 17:08:14 -0300 Subject: Windows binary build tweaks --- binary/all_in_one | 2 +- binary/luasocket-3.1.0-1.rockspec | 136 ++++++++++++++++++++++++++++++++++++++ makedist | 2 +- 3 files changed, 138 insertions(+), 2 deletions(-) create mode 100644 binary/luasocket-3.1.0-1.rockspec diff --git a/binary/all_in_one b/binary/all_in_one index 9db25bf8..eace5290 100755 --- a/binary/all_in_one +++ b/binary/all_in_one @@ -470,7 +470,7 @@ local function main() ["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", + luasocket = "./binary/luasocket-3.1.0-1.rockspec", luafilesystem = "luafilesystem", dkjson = "dkjson", } diff --git a/binary/luasocket-3.1.0-1.rockspec b/binary/luasocket-3.1.0-1.rockspec new file mode 100644 index 00000000..f33080b0 --- /dev/null +++ b/binary/luasocket-3.1.0-1.rockspec @@ -0,0 +1,136 @@ +package = "LuaSocket" +version = "3.1.0-1" +source = { + url = "git+https://github.com/lunarmodules/luasocket.git", + tag = "v3.1.0" +} +description = { + summary = "Network support for the Lua language", + detailed = [[ + LuaSocket is a Lua extension library composed of two parts: a set of C + modules that provide support for the TCP and UDP transport layers, and a + set of Lua modules that provide functions commonly needed by applications + that deal with the Internet. + ]], + homepage = "https://github.com/lunarmodules/luasocket", + license = "MIT" +} +dependencies = { + "lua >= 5.1" +} + +local function make_plat(plat) + local defines = { + unix = { + "LUASOCKET_DEBUG" + }, + macosx = { + "LUASOCKET_DEBUG", + "UNIX_HAS_SUN_LEN" + }, + win32 = { + "LUASOCKET_DEBUG", + "NDEBUG" + }, + mingw32 = { + "LUASOCKET_DEBUG", + "LUASOCKET_INET_PTON", + "WINVER=0x0501", + }, + } + local modules = { + ["socket.core"] = { + sources = { + "src/luasocket.c" + , "src/timeout.c" + , "src/buffer.c" + , "src/io.c" + , "src/auxiliar.c" + , "src/options.c" + , "src/inet.c" + , "src/except.c" + , "src/select.c" + , "src/tcp.c" + , "src/udp.c" + , "src/compat.c" }, + defines = defines[plat], + incdir = "/src" + }, + ["mime.core"] = { + sources = { "src/mime.c", "src/compat.c" }, + defines = defines[plat], + incdir = "/src" + }, + ["socket.http"] = "src/http.lua", + ["socket.url"] = "src/url.lua", + ["socket.tp"] = "src/tp.lua", + ["socket.ftp"] = "src/ftp.lua", + ["socket.headers"] = "src/headers.lua", + ["socket.smtp"] = "src/smtp.lua", + ltn12 = "src/ltn12.lua", + socket = "src/socket.lua", + mime = "src/mime.lua" + } + if plat == "unix" + or plat == "macosx" + or plat == "haiku" + then + modules["socket.core"].sources[#modules["socket.core"].sources+1] = "src/usocket.c" + if plat == "haiku" then + modules["socket.core"].libraries = {"network"} + end + modules["socket.unix"] = { + sources = { + "src/buffer.c" + , "src/compat.c" + , "src/auxiliar.c" + , "src/options.c" + , "src/timeout.c" + , "src/io.c" + , "src/usocket.c" + , "src/unix.c" + , "src/unixdgram.c" + , "src/unixstream.c" }, + defines = defines[plat], + incdir = "/src" + } + modules["socket.serial"] = { + sources = { + "src/buffer.c" + , "src/compat.c" + , "src/auxiliar.c" + , "src/options.c" + , "src/timeout.c" + , "src/io.c" + , "src/usocket.c" + , "src/serial.c" }, + defines = defines[plat], + incdir = "/src" + } + end + if plat == "win32" + or plat == "mingw32" + then + modules["socket.core"].sources[#modules["socket.core"].sources+1] = "src/wsocket.c" + modules["socket.core"].libraries = { "ws2_32" } + modules["socket.core"].libdirs = {} + end + return { modules = modules } +end + +build = { + type = "builtin", + platforms = { + unix = make_plat("unix"), + macosx = make_plat("macosx"), + haiku = make_plat("haiku"), + win32 = make_plat("win32"), + mingw32 = make_plat("mingw32"), + mingw64 = make_plat("mingw64") + }, + copy_directories = { + "docs" + , "samples" + , "etc" + , "test" } +} diff --git a/makedist b/makedist index 0cc247d3..0ba46034 100755 --- a/makedist +++ b/makedist @@ -150,7 +150,7 @@ if [ "$1" = "binary" ] then shift - ./configure --lua-version=5.4 + ./configure --lua-version=5.4 --with-lua=${LUA_DIR:-/usr} make binary cd build-binary -- cgit v1.2.3-55-g6feb