summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--appveyor.yml4
-rwxr-xr-xconfigure2
-rw-r--r--install.bat2
-rw-r--r--luarocks-3.1.2-1.rockspec (renamed from luarocks-dev-1.rockspec)3
-rw-r--r--src/luarocks/core/cfg.lua4
5 files changed, 8 insertions, 7 deletions
diff --git a/appveyor.yml b/appveyor.yml
index 2117694c..e03c8bae 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,4 +1,4 @@
1version: 3.0.0.{build}-test 1version: 3.1.2.{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.1.2
10 10
11 matrix: 11 matrix:
12 # Lua 5.1 tests 12 # Lua 5.1 tests
diff --git a/configure b/configure
index e64eac28..7ed58d3b 100755
--- a/configure
+++ b/configure
@@ -318,7 +318,7 @@ do
318done 318done
319 319
320echo 320echo
321BLUE "Configuring LuaRocks version dev..." 321BLUE "Configuring LuaRocks version 3.1.2..."
322echo 322echo
323echo 323echo
324 324
diff --git a/install.bat b/install.bat
index 43b18e1d..4d390785 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.1"
10vars.SYSCONFDIR = nil 10vars.SYSCONFDIR = nil
11vars.SYSCONFFORCE = nil 11vars.SYSCONFFORCE = nil
12vars.CONFBACKUPDIR = nil 12vars.CONFBACKUPDIR = nil
diff --git a/luarocks-dev-1.rockspec b/luarocks-3.1.2-1.rockspec
index a1f30ef4..4a1b98cf 100644
--- a/luarocks-dev-1.rockspec
+++ b/luarocks-3.1.2-1.rockspec
@@ -1,8 +1,9 @@
1rockspec_format = "3.0" 1rockspec_format = "3.0"
2package = "luarocks" 2package = "luarocks"
3version = "dev-1" 3version = "3.1.2-1"
4source = { 4source = {
5 url = "git+https://github.com/luarocks/luarocks", 5 url = "git+https://github.com/luarocks/luarocks",
6 tag = "v3.1.2",
6} 7}
7description = { 8description = {
8 summary = "A package manager for Lua modules.", 9 summary = "A package manager for Lua modules.",
diff --git a/src/luarocks/core/cfg.lua b/src/luarocks/core/cfg.lua
index 02fb564b..24e02222 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.1.2"
23local program_series = "3.0" 23local program_series = "3.1"
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) == "\\"