From 4f66ca5d0d77e3f7cdd175ede54ba2851a5819a9 Mon Sep 17 00:00:00 2001 From: Hisham Muhammad Date: Tue, 28 Jan 2020 12:58:21 -0300 Subject: Release: 3.3.0 --- appveyor.yml | 4 ++-- configure | 4 ++-- install.bat | 2 +- luarocks-3.3.0-1.rockspec | 37 +++++++++++++++++++++++++++++++++++++ luarocks-dev-1.rockspec | 36 ------------------------------------ publishrelease | 7 +++++-- src/luarocks/core/cfg.lua | 4 ++-- 7 files changed, 49 insertions(+), 45 deletions(-) create mode 100644 luarocks-3.3.0-1.rockspec delete mode 100644 luarocks-dev-1.rockspec diff --git a/appveyor.yml b/appveyor.yml index 6a4f9417..4ab66669 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,4 +1,4 @@ -version: 3.0.0.{build}-test +version: 3.3.0.{build}-test shallow_clone: true @@ -6,7 +6,7 @@ matrix: fast_finish: true environment: - LUAROCKS_VER: 3.0.0 + LUAROCKS_VER: 3.3.0 matrix: # Lua 5.1 tests diff --git a/configure b/configure index 5deb44be..99dccba4 100755 --- a/configure +++ b/configure @@ -308,7 +308,7 @@ do # -------------------------------- --versioned-rocks-dir) echo "--versioned-rocks-dir is no longer necessary." - echo "The rocks tree in LuaRocks 3.0 is always versioned." + echo "The rocks tree in LuaRocks 3.x is always versioned." ;; --lua-suffix) echo "--lua-suffix is no longer necessary." @@ -323,7 +323,7 @@ do done echo -BLUE "Configuring LuaRocks version dev..." +BLUE "Configuring LuaRocks version 3.3.0..." echo echo diff --git a/install.bat b/install.bat index 06d8348c..0b953671 100644 --- a/install.bat +++ b/install.bat @@ -6,7 +6,7 @@ local vars = {} vars.PREFIX = nil -vars.VERSION = "3.0" +vars.VERSION = "3.3" vars.SYSCONFDIR = nil vars.CONFBACKUPDIR = nil vars.SYSCONFFILENAME = nil diff --git a/luarocks-3.3.0-1.rockspec b/luarocks-3.3.0-1.rockspec new file mode 100644 index 00000000..20ad83fa --- /dev/null +++ b/luarocks-3.3.0-1.rockspec @@ -0,0 +1,37 @@ +rockspec_format = "3.0" +package = "luarocks" +version = "3.3.0-1" +source = { + url = "git+https://github.com/luarocks/luarocks", + tag = "v3.3.0", +} +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", +} +test = { + type = "busted", + platforms = { + windows = { + flags = { "--exclude-tags=ssh,git,unix" } + }, + unix = { + flags = { "--exclude-tags=ssh,git" } + } + } +} diff --git a/luarocks-dev-1.rockspec b/luarocks-dev-1.rockspec deleted file mode 100644 index a1f30ef4..00000000 --- a/luarocks-dev-1.rockspec +++ /dev/null @@ -1,36 +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", -} -test = { - type = "busted", - platforms = { - windows = { - flags = { "--exclude-tags=ssh,git,unix" } - }, - unix = { - flags = { "--exclude-tags=ssh,git" } - } - } -} diff --git a/publishrelease b/publishrelease index 2e635bea..dc5e673c 100755 --- a/publishrelease +++ b/publishrelease @@ -25,6 +25,8 @@ git checkout v$v || { packages=( luarocks-$v-windows-32.zip luarocks-$v-windows-32.zip.asc + luarocks-$v-windows-64.zip + luarocks-$v-windows-64.zip.asc luarocks-$v-linux-x86_64.zip luarocks-$v-linux-x86_64.zip.asc luarocks-$v-win32.zip @@ -88,7 +90,8 @@ gawk ' print "" print "" print "luarocks-'$v'.tar.gzPGP signature" - print "luarocks-'$v'-windows-32.zip (luarocks.exe stand-alone Windows binary)PGP signature" + print "luarocks-'$v'-windows-32.zip (luarocks.exe stand-alone Windows 32-bit binary)PGP signature" + print "luarocks-'$v'-windows-64.zip (luarocks.exe stand-alone Windows 64-bit binary)PGP signature" print "luarocks-'$v'-linux-x86_64.zip (luarocks stand-alone Linux x86_64 binary)PGP signature" print "luarocks-'$v'-win32.zip (legacy Windows package, includes Lua 5.1)PGP signature" done = 1 @@ -116,7 +119,7 @@ gawk ' print "{" print "\"'$v'\": {" print "\"date\": \"'$(date +'%Y-%m-%d')'\"," - print "\"files\": [\"luarocks-'$v'.tar.gz\", \"luarocks-'$v'.tar.gz.asc\", \"luarocks-'$v'-win32.zip\", \"luarocks-'$v'-win32.zip.asc\", \"luarocks-'$v'-windows-32.zip\", \"luarocks-'$v'-windows-32.zip.asc\", \"luarocks-'$v'-linux-x86_64.zip\", \"luarocks-'$v'-linux-x86_64.zip.asc\"]," + print "\"files\": [\"luarocks-'$v'.tar.gz\", \"luarocks-'$v'.tar.gz.asc\", \"luarocks-'$v'-win32.zip\", \"luarocks-'$v'-win32.zip.asc\", \"luarocks-'$v'-windows-32.zip\", \"luarocks-'$v'-windows-32.zip.asc\", \"luarocks-'$v'-windows-64.zip\", \"luarocks-'$v'-windows-64.zip.asc\", \"luarocks-'$v'-linux-x86_64.zip\", \"luarocks-'$v'-linux-x86_64.zip.asc\"]," print "\"about\": []" print "}}," } diff --git a/src/luarocks/core/cfg.lua b/src/luarocks/core/cfg.lua index b3561422..5e95feeb 100644 --- a/src/luarocks/core/cfg.lua +++ b/src/luarocks/core/cfg.lua @@ -19,8 +19,8 @@ local sysdetect = require("luarocks.core.sysdetect") -------------------------------------------------------------------------------- -local program_version = "dev" -local program_series = "3.0" +local program_version = "3.3.0" +local program_series = "3.3" local major_version = (program_version:match("([^.]%.[^.])")) or program_series local is_windows = package.config:sub(1,1) == "\\" -- cgit v1.2.3-55-g6feb