aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHisham Muhammad <hisham@gobolinux.org>2020-01-28 12:58:21 -0300
committerHisham Muhammad <hisham@gobolinux.org>2020-01-28 12:58:21 -0300
commit4f66ca5d0d77e3f7cdd175ede54ba2851a5819a9 (patch)
tree701f816715c287c0bf8261acb6a8ea9b549af28b
parentb6cb0c16a18789967ee71ceebf2819a2a6e8ca08 (diff)
downloadluarocks-3.3.0.tar.gz
luarocks-3.3.0.tar.bz2
luarocks-3.3.0.zip
Release: 3.3.0v3.3.0
-rw-r--r--appveyor.yml4
-rwxr-xr-xconfigure4
-rw-r--r--install.bat2
-rw-r--r--luarocks-3.3.0-1.rockspec (renamed from luarocks-dev-1.rockspec)3
-rwxr-xr-xpublishrelease7
-rw-r--r--src/luarocks/core/cfg.lua4
6 files changed, 14 insertions, 10 deletions
diff --git a/appveyor.yml b/appveyor.yml
index 6a4f9417..4ab66669 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,4 +1,4 @@
1version: 3.0.0.{build}-test 1version: 3.3.0.{build}-test
2 2
3shallow_clone: true 3shallow_clone: true
4 4
@@ -6,7 +6,7 @@ matrix:
6 fast_finish: true 6 fast_finish: true
7 7
8environment: 8environment:
9 LUAROCKS_VER: 3.0.0 9 LUAROCKS_VER: 3.3.0
10 10
11 matrix: 11 matrix:
12 # Lua 5.1 tests 12 # Lua 5.1 tests
diff --git a/configure b/configure
index 5deb44be..99dccba4 100755
--- a/configure
+++ b/configure
@@ -308,7 +308,7 @@ do
308 # -------------------------------- 308 # --------------------------------
309 --versioned-rocks-dir) 309 --versioned-rocks-dir)
310 echo "--versioned-rocks-dir is no longer necessary." 310 echo "--versioned-rocks-dir is no longer necessary."
311 echo "The rocks tree in LuaRocks 3.0 is always versioned." 311 echo "The rocks tree in LuaRocks 3.x is always versioned."
312 ;; 312 ;;
313 --lua-suffix) 313 --lua-suffix)
314 echo "--lua-suffix is no longer necessary." 314 echo "--lua-suffix is no longer necessary."
@@ -323,7 +323,7 @@ do
323done 323done
324 324
325echo 325echo
326BLUE "Configuring LuaRocks version dev..." 326BLUE "Configuring LuaRocks version 3.3.0..."
327echo 327echo
328echo 328echo
329 329
diff --git a/install.bat b/install.bat
index 06d8348c..0b953671 100644
--- a/install.bat
+++ b/install.bat
@@ -6,7 +6,7 @@ local vars = {}
6 6
7 7
8vars.PREFIX = nil 8vars.PREFIX = nil
9vars.VERSION = "3.0" 9vars.VERSION = "3.3"
10vars.SYSCONFDIR = nil 10vars.SYSCONFDIR = nil
11vars.CONFBACKUPDIR = nil 11vars.CONFBACKUPDIR = nil
12vars.SYSCONFFILENAME = nil 12vars.SYSCONFFILENAME = nil
diff --git a/luarocks-dev-1.rockspec b/luarocks-3.3.0-1.rockspec
index a1f30ef4..20ad83fa 100644
--- a/luarocks-dev-1.rockspec
+++ b/luarocks-3.3.0-1.rockspec
@@ -1,8 +1,9 @@
1rockspec_format = "3.0" 1rockspec_format = "3.0"
2package = "luarocks" 2package = "luarocks"
3version = "dev-1" 3version = "3.3.0-1"
4source = { 4source = {
5 url = "git+https://github.com/luarocks/luarocks", 5 url = "git+https://github.com/luarocks/luarocks",
6 tag = "v3.3.0",
6} 7}
7description = { 8description = {
8 summary = "A package manager for Lua modules.", 9 summary = "A package manager for Lua modules.",
diff --git a/publishrelease b/publishrelease
index 2e635bea..dc5e673c 100755
--- a/publishrelease
+++ b/publishrelease
@@ -25,6 +25,8 @@ git checkout v$v || {
25packages=( 25packages=(
26 luarocks-$v-windows-32.zip 26 luarocks-$v-windows-32.zip
27 luarocks-$v-windows-32.zip.asc 27 luarocks-$v-windows-32.zip.asc
28 luarocks-$v-windows-64.zip
29 luarocks-$v-windows-64.zip.asc
28 luarocks-$v-linux-x86_64.zip 30 luarocks-$v-linux-x86_64.zip
29 luarocks-$v-linux-x86_64.zip.asc 31 luarocks-$v-linux-x86_64.zip.asc
30 luarocks-$v-win32.zip 32 luarocks-$v-win32.zip
@@ -88,7 +90,8 @@ gawk '
88 print "<!-- add new release here -->" 90 print "<!-- add new release here -->"
89 print "" 91 print ""
90 print "<tr><td><a href=\"luarocks-'$v'.tar.gz\">luarocks-'$v'.tar.gz</a></td><td><a href=\"luarocks-'$v'.tar.gz.asc\">PGP signature</a></td></tr>" 92 print "<tr><td><a href=\"luarocks-'$v'.tar.gz\">luarocks-'$v'.tar.gz</a></td><td><a href=\"luarocks-'$v'.tar.gz.asc\">PGP signature</a></td></tr>"
91 print "<tr><td><a href=\"luarocks-'$v'-windows-32.zip\">luarocks-'$v'-windows-32.zip</a> (luarocks.exe stand-alone Windows binary)</td><td><a href=\"luarocks-'$v'-windows-32.zip.asc\">PGP signature</a></td></tr>" 93 print "<tr><td><a href=\"luarocks-'$v'-windows-32.zip\">luarocks-'$v'-windows-32.zip</a> (luarocks.exe stand-alone Windows 32-bit binary)</td><td><a href=\"luarocks-'$v'-windows-32.zip.asc\">PGP signature</a></td></tr>"
94 print "<tr><td><a href=\"luarocks-'$v'-windows-64.zip\">luarocks-'$v'-windows-64.zip</a> (luarocks.exe stand-alone Windows 64-bit binary)</td><td><a href=\"luarocks-'$v'-windows-64.zip.asc\">PGP signature</a></td></tr>"
92 print "<tr><td><a href=\"luarocks-'$v'-linux-x86_64.zip\">luarocks-'$v'-linux-x86_64.zip</a> (luarocks stand-alone Linux x86_64 binary)</td><td><a href=\"luarocks-'$v'-linux-x86_64.zip.asc\">PGP signature</a></td></tr>" 95 print "<tr><td><a href=\"luarocks-'$v'-linux-x86_64.zip\">luarocks-'$v'-linux-x86_64.zip</a> (luarocks stand-alone Linux x86_64 binary)</td><td><a href=\"luarocks-'$v'-linux-x86_64.zip.asc\">PGP signature</a></td></tr>"
93 print "<tr><td><a href=\"luarocks-'$v'-win32.zip\">luarocks-'$v'-win32.zip</a> (legacy Windows package, includes Lua 5.1)</td><td><a href=\"luarocks-'$v'-win32.zip.asc\">PGP signature</a></td></tr>" 96 print "<tr><td><a href=\"luarocks-'$v'-win32.zip\">luarocks-'$v'-win32.zip</a> (legacy Windows package, includes Lua 5.1)</td><td><a href=\"luarocks-'$v'-win32.zip.asc\">PGP signature</a></td></tr>"
94 done = 1 97 done = 1
@@ -116,7 +119,7 @@ gawk '
116 print "{" 119 print "{"
117 print "\"'$v'\": {" 120 print "\"'$v'\": {"
118 print "\"date\": \"'$(date +'%Y-%m-%d')'\"," 121 print "\"date\": \"'$(date +'%Y-%m-%d')'\","
119 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\"]," 122 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\"],"
120 print "\"about\": []" 123 print "\"about\": []"
121 print "}}," 124 print "}},"
122 } 125 }
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")
19 19
20-------------------------------------------------------------------------------- 20--------------------------------------------------------------------------------
21 21
22local program_version = "dev" 22local program_version = "3.3.0"
23local program_series = "3.0" 23local program_series = "3.3"
24local major_version = (program_version:match("([^.]%.[^.])")) or program_series 24local major_version = (program_version:match("([^.]%.[^.])")) or program_series
25 25
26local is_windows = package.config:sub(1,1) == "\\" 26local is_windows = package.config:sub(1,1) == "\\"