8 files changed, 13 insertions, 85 deletions

diff --git a/.travis.yml b/.travis.yml
index d359c83a..aca8460a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,10 +13,6 @@ cache:
   - testrun/testing_server-2.1
   - testrun/binary-samples
   
-smoke_script: &smoke_script
-  - ./makedist 3.1.1
-  - ./smoke_test.sh luarocks-3.1.1.tar.gz
-
 unit_script: &unit_script
   - busted -o gtest --exclude-tags=git,integration --verbose -Xhelper "lua_dir=$PWD/lua_install,travis"
   - busted -o gtest --exclude-tags=git,integration --verbose -Xhelper "lua_dir=$PWD/lua_install,travis,env=full"
@@ -25,24 +21,12 @@ integration_script: &integration_script
   - lua -v
   - if [ "$TRAVIS_OS_NAME" = "linux" ]; then shellcheck ./configure; fi
   - ./configure --with-lua=lua_install
-  - ./makedist 3.1.1
-  - busted -o gtest --exclude-tags=git,unit --verbose -Xhelper "lua_dir=$PWD/lua_install,travis"
-  - busted -o gtest --exclude-tags=git,unit --verbose -Xhelper "lua_dir=$PWD/lua_install,travis,env=full"
-
+  - ./makedist dev
+  - busted -o gtest --exclude-tags=gpg,git,unit --verbose -Xhelper "lua_dir=$PWD/lua_install,travis"
+  - busted -o gtest --exclude-tags=gpg,git,unit --verbose -Xhelper "lua_dir=$PWD/lua_install,travis,env=full"
+          
 jobs:
   include:
-    # Smoke tests
-    - stage: smoke
-      script: *smoke_script
-      os: linux
-      env:
-        - LUA="lua=5.3"
-    - stage: smoke
-      script: *smoke_script
-      os: osx
-      language: generic
-      env:
-        - LUA="luajit=2.1"
     # Unit tests for linux
     - stage: Unit on Linux
       script: *unit_script
diff --git a/appveyor.yml b/appveyor.yml
index e03c8bae..2117694c 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,4 +1,4 @@
-version: 3.1.2.{build}-test
+version: 3.0.0.{build}-test
 
 shallow_clone: true
 
@@ -6,7 +6,7 @@ matrix:
   fast_finish: true
 
 environment:
-  LUAROCKS_VER: 3.1.2
+  LUAROCKS_VER: 3.0.0
 
   matrix:
   # Lua 5.1 tests
diff --git a/configure b/configure
index 7ed58d3b..e64eac28 100755
--- a/configure
+++ b/configure
@@ -318,7 +318,7 @@ do
 done
 
 echo
-BLUE "Configuring LuaRocks version 3.1.2..."
+BLUE "Configuring LuaRocks version dev..."
 echo
 echo
 
diff --git a/install.bat b/install.bat
index 4d390785..43b18e1d 100644
--- a/install.bat
+++ b/install.bat
@@ -6,7 +6,7 @@ local vars = {}
 

 

 vars.PREFIX = nil

-vars.VERSION = "3.1"

+vars.VERSION = "3.0"

 vars.SYSCONFDIR = nil

 vars.SYSCONFFORCE = nil

 vars.CONFBACKUPDIR = nil

diff --git a/luarocks-3.1.2-1.rockspec b/luarocks-dev-1.rockspec
index 4a1b98cf..a1f30ef4 100644
--- a/luarocks-3.1.2-1.rockspec
+++ b/luarocks-dev-1.rockspec
@@ -1,9 +1,8 @@
 rockspec_format = "3.0"
 package = "luarocks"
-version = "3.1.2-1"
+version = "dev-1"
 source = {
    url = "git+https://github.com/luarocks/luarocks",
-   tag = "v3.1.2",
 }
 description = {
    summary = "A package manager for Lua modules.",
diff --git a/makedist b/makedist
index a66fe9bb..9675f7cd 100755
--- a/makedist
+++ b/makedist
@@ -95,7 +95,7 @@ mkdir "release-windows"
 mv "$out" "release-windows/$out-win32"
 
 cd "release-unix/$out"
-rm -rf makedist smoke_test.sh install.bat win32 .travis.yml .gitignore appveyor* .appveyor
+rm -rf makedist install.bat win32 .travis.yml .gitignore appveyor* .appveyor
 cd ..
 tar czvpf ../"$out.tar.gz" "$out"
 rm -f ../"$out.tar.gz.asc"
@@ -103,7 +103,7 @@ cd ..
 rm -rf "release-unix"
 
 cd "release-windows/$out-win32"
-rm -rf makedist smoke_test.sh Makefile GNUmakefile configure .travis.yml .gitignore test appveyor* .appveyor
+rm -rf makedist Makefile GNUmakefile configure .travis.yml .gitignore test appveyor* .appveyor
 cd ..
 zip -r ../"$out-win32.zip" "$out-win32"
 rm -f ../"$out-win32.zip.asc"
diff --git a/smoke_test.sh b/smoke_test.sh
deleted file mode 100755
index e57a8d02..00000000
--- a/smoke_test.sh
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/bin/sh -e
-
-tarball="$1"
-
-rm -rf smoketestdir
-mkdir smoketestdir
-cp "$tarball" smoketestdir
-cd smoketestdir
-
-tar zxvpf "$(basename "$tarball")"
-cd "$(basename "$tarball" .tar.gz)"
-./configure --prefix=foobar
-make
-./luarocks --verbose
-./luarocks --verbose install inspect
-./luarocks --verbose show inspect
-./lua -e 'print(assert(require("inspect")(_G)))'
-make install
-cd foobar
-bin/luarocks --verbose
-bin/luarocks --verbose install inspect
-bin/luarocks --verbose show inspect
-(
-   eval $(bin/luarocks path)
-   lua -e 'print(assert(require("inspect")(_G)))'
-)
-cd ..
-rm -rf foobar
-
-if [ "$2" = "binary" ]
-then
-   make binary
-   make install-binary
-   cd foobar
-   bin/luarocks
-   bin/luarocks install inspect
-   bin/luarocks show inspect
-   (
-      eval $(bin/luarocks path)
-      lua -e 'print(assert(require("inspect")(_G)))'
-   )
-   cd ..
-   rm -rf foobar
-fi
-
-if [ "$3" = "windows" ]
-then
-   make windows-binary
-fi
-
-cd ..
-rm -rf smoketestdir
-echo
-echo "Full test ran and nothing caught fire!"
-echo
diff --git a/src/luarocks/core/cfg.lua b/src/luarocks/core/cfg.lua
index 24e02222..02fb564b 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 = "3.1.2"
-local program_series = "3.1"
+local program_version = "dev"
+local program_series = "3.0"
 local major_version = (program_version:match("([^.]%.[^.])")) or program_series
 
 local is_windows = package.config:sub(1,1) == "\\"