aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--appveyor.yml4
-rwxr-xr-xconfigure2
-rw-r--r--install.bat2
-rw-r--r--luarocks-dev-1.rockspec (renamed from luarocks-3.2.0-1.rockspec)3
-rw-r--r--src/luarocks/core/cfg.lua4
5 files changed, 7 insertions, 8 deletions
diff --git a/appveyor.yml b/appveyor.yml
index d70516cc..2117694c 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,4 +1,4 @@
1version: 3.2.0.{build}-test 1version: 3.0.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.2.0 9 LUAROCKS_VER: 3.0.0
10 10
11 matrix: 11 matrix:
12 # Lua 5.1 tests 12 # Lua 5.1 tests
diff --git a/configure b/configure
index 1a64ce06..5deb44be 100755
--- a/configure
+++ b/configure
@@ -323,7 +323,7 @@ do
323done 323done
324 324
325echo 325echo
326BLUE "Configuring LuaRocks version 3.2.0..." 326BLUE "Configuring LuaRocks version dev..."
327echo 327echo
328echo 328echo
329 329
diff --git a/install.bat b/install.bat
index b97ea83e..f0305ab4 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.2" 9vars.VERSION = "3.0"
10vars.SYSCONFDIR = nil 10vars.SYSCONFDIR = nil
11vars.CONFBACKUPDIR = nil 11vars.CONFBACKUPDIR = nil
12vars.SYSCONFFILENAME = nil 12vars.SYSCONFFILENAME = nil
diff --git a/luarocks-3.2.0-1.rockspec b/luarocks-dev-1.rockspec
index 72eb5b4d..a1f30ef4 100644
--- a/luarocks-3.2.0-1.rockspec
+++ b/luarocks-dev-1.rockspec
@@ -1,9 +1,8 @@
1rockspec_format = "3.0" 1rockspec_format = "3.0"
2package = "luarocks" 2package = "luarocks"
3version = "3.2.0-1" 3version = "dev-1"
4source = { 4source = {
5 url = "git+https://github.com/luarocks/luarocks", 5 url = "git+https://github.com/luarocks/luarocks",
6 tag = "3.2.0",
7} 6}
8description = { 7description = {
9 summary = "A package manager for Lua modules.", 8 summary = "A package manager for Lua modules.",
diff --git a/src/luarocks/core/cfg.lua b/src/luarocks/core/cfg.lua
index 2ec18230..008ae7dc 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 = "3.2.0" 22local program_version = "dev"
23local program_series = "3.2" 23local program_series = "3.0"
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) == "\\"