From 1dfb8c41e8a7e689959baeaf2961437db9615f74 Mon Sep 17 00:00:00 2001 From: Peter Melnichenko Date: Fri, 16 Mar 2018 02:38:32 +0300 Subject: Replace rockspecs/ with a single scm rockspec (#108) There is no need to keep rockspecs for older versions - it's enough to ensure that `luarocks make` builds currently checked out version. `luarocks new-version --tag=` generates rockspecs for releases. Use `scm` instead of `dev` as LuaRocks 2 thinks that `dev` versions are less than normal versions like 1.6.3, making it tricky to use bleeding-edge version as a dependency with a constraint such as `luafilesystem >= 1.6.3`. --- .travis.yml | 2 +- appveyor.yml | 2 +- luafilesystem-scm-1.rockspec | 28 ++++++++++++++++++ rockspecs/luafilesystem-1.3.0-1.rockspec | 27 ------------------ rockspecs/luafilesystem-1.4.0-1.rockspec | 27 ------------------ rockspecs/luafilesystem-1.4.0-2.rockspec | 43 ---------------------------- rockspecs/luafilesystem-1.4.1-1.rockspec | 43 ---------------------------- rockspecs/luafilesystem-1.4.1rc1-1.rockspec | 43 ---------------------------- rockspecs/luafilesystem-1.4.2-1.rockspec | 26 ----------------- rockspecs/luafilesystem-1.5.0-1.rockspec | 27 ------------------ rockspecs/luafilesystem-1.6.0-1.rockspec | 27 ------------------ rockspecs/luafilesystem-1.6.1-1.rockspec | 27 ------------------ rockspecs/luafilesystem-1.6.2-1.rockspec | 27 ------------------ rockspecs/luafilesystem-1.6.3-1.rockspec | 28 ------------------ rockspecs/luafilesystem-1.7.0-1.rockspec | 28 ------------------ rockspecs/luafilesystem-1.7.0-2.rockspec | 28 ------------------ rockspecs/luafilesystem-cvs-1.rockspec | 44 ----------------------------- rockspecs/luafilesystem-cvs-2.rockspec | 26 ----------------- rockspecs/luafilesystem-cvs-3.rockspec | 27 ------------------ 19 files changed, 30 insertions(+), 500 deletions(-) create mode 100644 luafilesystem-scm-1.rockspec delete mode 100644 rockspecs/luafilesystem-1.3.0-1.rockspec delete mode 100644 rockspecs/luafilesystem-1.4.0-1.rockspec delete mode 100644 rockspecs/luafilesystem-1.4.0-2.rockspec delete mode 100644 rockspecs/luafilesystem-1.4.1-1.rockspec delete mode 100644 rockspecs/luafilesystem-1.4.1rc1-1.rockspec delete mode 100644 rockspecs/luafilesystem-1.4.2-1.rockspec delete mode 100644 rockspecs/luafilesystem-1.5.0-1.rockspec delete mode 100644 rockspecs/luafilesystem-1.6.0-1.rockspec delete mode 100644 rockspecs/luafilesystem-1.6.1-1.rockspec delete mode 100644 rockspecs/luafilesystem-1.6.2-1.rockspec delete mode 100644 rockspecs/luafilesystem-1.6.3-1.rockspec delete mode 100644 rockspecs/luafilesystem-1.7.0-1.rockspec delete mode 100644 rockspecs/luafilesystem-1.7.0-2.rockspec delete mode 100644 rockspecs/luafilesystem-cvs-1.rockspec delete mode 100644 rockspecs/luafilesystem-cvs-2.rockspec delete mode 100644 rockspecs/luafilesystem-cvs-3.rockspec diff --git a/.travis.yml b/.travis.yml index 38086ba..22430d4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,7 +20,7 @@ before_install: - luarocks install luacov-coveralls --server=https://luarocks.org/dev --deps-mode=none install: - - luarocks make rockspecs/luafilesystem-cvs-3.rockspec CFLAGS="-O2 -fPIC -ftest-coverage -fprofile-arcs" LIBFLAG="-shared --coverage" + - luarocks make CFLAGS="-O2 -fPIC -ftest-coverage -fprofile-arcs" LIBFLAG="-shared --coverage" script: - lua -lluacov tests/test.lua diff --git a/appveyor.yml b/appveyor.yml index 29e6442..95dcb58 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -30,7 +30,7 @@ before_build: - echo "Installing external deps" build_script: -- luarocks make rockspecs/luafilesystem-cvs-3.rockspec +- luarocks make before_test: diff --git a/luafilesystem-scm-1.rockspec b/luafilesystem-scm-1.rockspec new file mode 100644 index 0000000..71cf19b --- /dev/null +++ b/luafilesystem-scm-1.rockspec @@ -0,0 +1,28 @@ +package = "luafilesystem" +version = "scm-1" +source = { + url = "git://github.com/keplerproject/luafilesystem" +} +description = { + summary = "File System Library for the Lua Programming Language", + detailed = [[ + LuaFileSystem is a Lua library developed to complement the set of + functions related to file systems offered by the standard Lua + distribution. LuaFileSystem offers a portable way to access the + underlying directory structure and file attributes. + ]], + license = "MIT/X11" +} +dependencies = { + "lua >= 5.1" +} +build = { + type = "builtin", + modules = { + lfs = "src/lfs.c" + }, + copy_directories = { + "doc", + "tests" + } +} diff --git a/rockspecs/luafilesystem-1.3.0-1.rockspec b/rockspecs/luafilesystem-1.3.0-1.rockspec deleted file mode 100644 index d4d484f..0000000 --- a/rockspecs/luafilesystem-1.3.0-1.rockspec +++ /dev/null @@ -1,27 +0,0 @@ -package = "LuaFileSystem" -version = "1.3.0-1" -source = { - url = "http://luaforge.net/frs/download.php/2679/luafilesystem-1.3.0.tar.gz" -} -description = { - summary = "File System Library for the Lua Programming Language", - detailed = [[ - LuaFileSystem is a Lua library developed to complement the set of - functions related to file systems offered by the standard Lua - distribution. LuaFileSystem offers a portable way to access the - underlying directory structure and file attributes. - ]] -} -dependencies = { - "lua >= 5.1" -} -build = { - type = "make", - build_variables = { - LUA_INC = "$(LUA_INCDIR)", - LIB_OPTION = "$(LIBFLAG)" - }, - install_variables = { - LUA_LIBDIR = "$(LIBDIR)" - } -} diff --git a/rockspecs/luafilesystem-1.4.0-1.rockspec b/rockspecs/luafilesystem-1.4.0-1.rockspec deleted file mode 100644 index b693618..0000000 --- a/rockspecs/luafilesystem-1.4.0-1.rockspec +++ /dev/null @@ -1,27 +0,0 @@ -package = "LuaFileSystem" -version = "1.4.0-1" -source = { - url = "http://luaforge.net/frs/download.php/3158/luafilesystem-1.4.0.tar.gz" -} -description = { - summary = "File System Library for the Lua Programming Language", - detailed = [[ - LuaFileSystem is a Lua library developed to complement the set of - functions related to file systems offered by the standard Lua - distribution. LuaFileSystem offers a portable way to access the - underlying directory structure and file attributes. - ]] -} -dependencies = { - "lua >= 5.1" -} -build = { - type = "make", - build_variables = { - LUA_INC = "$(LUA_INCDIR)", - LIB_OPTION = "$(LIBFLAG)" - }, - install_variables = { - LUA_LIBDIR = "$(LIBDIR)" - } -} diff --git a/rockspecs/luafilesystem-1.4.0-2.rockspec b/rockspecs/luafilesystem-1.4.0-2.rockspec deleted file mode 100644 index f7ed871..0000000 --- a/rockspecs/luafilesystem-1.4.0-2.rockspec +++ /dev/null @@ -1,43 +0,0 @@ -package = "LuaFileSystem" -version = "1.4.0-2" -source = { - url = "http://luaforge.net/frs/download.php/3158/luafilesystem-1.4.0.tar.gz" -} -description = { - summary = "File System Library for the Lua Programming Language", - detailed = [[ - LuaFileSystem is a Lua library developed to complement the set of - functions related to file systems offered by the standard Lua - distribution. LuaFileSystem offers a portable way to access the - underlying directory structure and file attributes. - ]] -} -dependencies = { - "lua >= 5.1" -} -build = { - platforms = { - unix = { - type = "make", - build_variables = { - LIB_OPTION = "$(LIBFLAG)", - CFLAGS = "$(CFLAGS) -I$(LUA_INCDIR)", - }, - install_variables = { - LUA_LIBDIR = "$(LIBDIR)" - } - }, - win32 = { - type = "make", - build_variables = { - LUA_LIB = "$(LUA_LIBDIR)\\lua5.1.lib", - CFLAGS = "/MD $(CFLAGS) /I$(LUA_INCDIR)", - }, - install_variables = { - LUA_LIBDIR = "$(LIBDIR)", - LUA_DIR = "$(LUADIR)", - BIN_DIR = "$(BINDIR)" - } - } - } -} \ No newline at end of file diff --git a/rockspecs/luafilesystem-1.4.1-1.rockspec b/rockspecs/luafilesystem-1.4.1-1.rockspec deleted file mode 100644 index db3a3eb..0000000 --- a/rockspecs/luafilesystem-1.4.1-1.rockspec +++ /dev/null @@ -1,43 +0,0 @@ -package = "LuaFileSystem" -version = "1.4.1-1" -source = { - url = "http://luaforge.net/frs/download.php/3345/luafilesystem-1.4.1.tar.gz", -} -description = { - summary = "File System Library for the Lua Programming Language", - detailed = [[ - LuaFileSystem is a Lua library developed to complement the set of - functions related to file systems offered by the standard Lua - distribution. LuaFileSystem offers a portable way to access the - underlying directory structure and file attributes. - ]] -} -dependencies = { - "lua >= 5.1" -} -build = { - platforms = { - unix = { - type = "make", - build_variables = { - LIB_OPTION = "$(LIBFLAG)", - CFLAGS = "$(CFLAGS) -I$(LUA_INCDIR) $(STAT64)", - }, - install_variables = { - LUA_LIBDIR = "$(LIBDIR)" - } - }, - win32 = { - type = "make", - build_variables = { - LUA_LIB = "$(LUA_LIBDIR)\\lua5.1.lib", - CFLAGS = "/MD $(CFLAGS) /I$(LUA_INCDIR)", - }, - install_variables = { - LUA_LIBDIR = "$(LIBDIR)", - LUA_DIR = "$(LUADIR)", - BIN_DIR = "$(BINDIR)" - } - } - } -} diff --git a/rockspecs/luafilesystem-1.4.1rc1-1.rockspec b/rockspecs/luafilesystem-1.4.1rc1-1.rockspec deleted file mode 100644 index 1194711..0000000 --- a/rockspecs/luafilesystem-1.4.1rc1-1.rockspec +++ /dev/null @@ -1,43 +0,0 @@ -package = "LuaFileSystem" -version = "1.4.1rc1-1" -source = { - url = "http://luafilesystem.luaforge.net/luafilesystem-1.4.1rc1.tar.gz", -} -description = { - summary = "File System Library for the Lua Programming Language", - detailed = [[ - LuaFileSystem is a Lua library developed to complement the set of - functions related to file systems offered by the standard Lua - distribution. LuaFileSystem offers a portable way to access the - underlying directory structure and file attributes. - ]] -} -dependencies = { - "lua >= 5.1" -} -build = { - platforms = { - unix = { - type = "make", - build_variables = { - LIB_OPTION = "$(LIBFLAG)", - CFLAGS = "$(CFLAGS) -I$(LUA_INCDIR) $(STAT64)", - }, - install_variables = { - LUA_LIBDIR = "$(LIBDIR)" - } - }, - win32 = { - type = "make", - build_variables = { - LUA_LIB = "$(LUA_LIBDIR)\\lua5.1.lib", - CFLAGS = "/MD $(CFLAGS) /I$(LUA_INCDIR)", - }, - install_variables = { - LUA_LIBDIR = "$(LIBDIR)", - LUA_DIR = "$(LUADIR)", - BIN_DIR = "$(BINDIR)" - } - } - } -} diff --git a/rockspecs/luafilesystem-1.4.2-1.rockspec b/rockspecs/luafilesystem-1.4.2-1.rockspec deleted file mode 100644 index 7cfe92b..0000000 --- a/rockspecs/luafilesystem-1.4.2-1.rockspec +++ /dev/null @@ -1,26 +0,0 @@ -package = "LuaFileSystem" - -version = "1.4.2-1" - -source = { - url = "http://luaforge.net/frs/download.php/3931/luafilesystem-1.4.2.tar.gz", -} - -description = { - summary = "File System Library for the Lua Programming Language", - detailed = [[ - LuaFileSystem is a Lua library developed to complement the set of - functions related to file systems offered by the standard Lua - distribution. LuaFileSystem offers a portable way to access the - underlying directory structure and file attributes. - ]] -} - -dependencies = { - "lua >= 5.1" -} - -build = { - type = "module", - modules = { lfs = "src/lfs.c" } -} \ No newline at end of file diff --git a/rockspecs/luafilesystem-1.5.0-1.rockspec b/rockspecs/luafilesystem-1.5.0-1.rockspec deleted file mode 100644 index 1170ad2..0000000 --- a/rockspecs/luafilesystem-1.5.0-1.rockspec +++ /dev/null @@ -1,27 +0,0 @@ -package = "LuaFileSystem" - -version = "1.5.0-1" - -source = { - url = "http://cloud.github.com/downloads/keplerproject/luafilesystem/luafilesystem-1.5.0.tar.gz", -} - -description = { - summary = "File System Library for the Lua Programming Language", - detailed = [[ - LuaFileSystem is a Lua library developed to complement the set of - functions related to file systems offered by the standard Lua - distribution. LuaFileSystem offers a portable way to access the - underlying directory structure and file attributes. - ]] -} - -dependencies = { - "lua >= 5.1" -} - -build = { - type = "module", - modules = { lfs = "src/lfs.c" }, - copy_directories = { "doc", "tests" } -} diff --git a/rockspecs/luafilesystem-1.6.0-1.rockspec b/rockspecs/luafilesystem-1.6.0-1.rockspec deleted file mode 100644 index 82d349c..0000000 --- a/rockspecs/luafilesystem-1.6.0-1.rockspec +++ /dev/null @@ -1,27 +0,0 @@ -package = "LuaFileSystem" - -version = "1.6.0-1" - -source = { - url = "https://github.com/downloads/keplerproject/luafilesystem/luafilesystem-1.6.0.tar.gz", -} - -description = { - summary = "File System Library for the Lua Programming Language", - detailed = [[ - LuaFileSystem is a Lua library developed to complement the set of - functions related to file systems offered by the standard Lua - distribution. LuaFileSystem offers a portable way to access the - underlying directory structure and file attributes. - ]] -} - -dependencies = { - "lua >= 5.1" -} - -build = { - type = "builtin", - modules = { lfs = "src/lfs.c" }, - copy_directories = { "doc", "tests" } -} diff --git a/rockspecs/luafilesystem-1.6.1-1.rockspec b/rockspecs/luafilesystem-1.6.1-1.rockspec deleted file mode 100644 index 7f45e33..0000000 --- a/rockspecs/luafilesystem-1.6.1-1.rockspec +++ /dev/null @@ -1,27 +0,0 @@ -package = "LuaFileSystem" - -version = "1.6.1-1" - -source = { - url = "https://github.com/downloads/keplerproject/luafilesystem/luafilesystem-1.6.1.tar.gz", -} - -description = { - summary = "File System Library for the Lua Programming Language", - detailed = [[ - LuaFileSystem is a Lua library developed to complement the set of - functions related to file systems offered by the standard Lua - distribution. LuaFileSystem offers a portable way to access the - underlying directory structure and file attributes. - ]] -} - -dependencies = { - "lua >= 5.1" -} - -build = { - type = "builtin", - modules = { lfs = "src/lfs.c" }, - copy_directories = { "doc", "tests" } -} diff --git a/rockspecs/luafilesystem-1.6.2-1.rockspec b/rockspecs/luafilesystem-1.6.2-1.rockspec deleted file mode 100644 index 1c11efc..0000000 --- a/rockspecs/luafilesystem-1.6.2-1.rockspec +++ /dev/null @@ -1,27 +0,0 @@ -package = "LuaFileSystem" - -version = "1.6.2-1" - -source = { - url = "https://github.com/downloads/keplerproject/luafilesystem/luafilesystem-1.6.2.tar.gz", -} - -description = { - summary = "File System Library for the Lua Programming Language", - detailed = [[ - LuaFileSystem is a Lua library developed to complement the set of - functions related to file systems offered by the standard Lua - distribution. LuaFileSystem offers a portable way to access the - underlying directory structure and file attributes. - ]] -} - -dependencies = { - "lua >= 5.1" -} - -build = { - type = "builtin", - modules = { lfs = "src/lfs.c" }, - copy_directories = { "doc", "tests" } -} diff --git a/rockspecs/luafilesystem-1.6.3-1.rockspec b/rockspecs/luafilesystem-1.6.3-1.rockspec deleted file mode 100644 index 89b25d4..0000000 --- a/rockspecs/luafilesystem-1.6.3-1.rockspec +++ /dev/null @@ -1,28 +0,0 @@ -package = "LuaFileSystem" -version = "1.6.3-1" -source = { - url = "git://github.com/keplerproject/luafilesystem", - tag = "v_1_6_3", -} -description = { - summary = "File System Library for the Lua Programming Language", - detailed = [[ - LuaFileSystem is a Lua library developed to complement the set of - functions related to file systems offered by the standard Lua - distribution. LuaFileSystem offers a portable way to access the - underlying directory structure and file attributes. - ]], - license = "MIT/X11", -} -dependencies = { - "lua >= 5.1" -} -build = { - type = "builtin", - modules = { - lfs = "src/lfs.c" - }, - copy_directories = { - "doc", "tests" - } -} diff --git a/rockspecs/luafilesystem-1.7.0-1.rockspec b/rockspecs/luafilesystem-1.7.0-1.rockspec deleted file mode 100644 index c1c0ecc..0000000 --- a/rockspecs/luafilesystem-1.7.0-1.rockspec +++ /dev/null @@ -1,28 +0,0 @@ -package = "LuaFileSystem" -version = "1.7.0-1" -source = { - url = "git://github.com/keplerproject/luafilesystem", - tag = "v1_7_0", -} -description = { - summary = "File System Library for the Lua Programming Language", - detailed = [[ - LuaFileSystem is a Lua library developed to complement the set of - functions related to file systems offered by the standard Lua - distribution. LuaFileSystem offers a portable way to access the - underlying directory structure and file attributes. - ]], - license = "MIT/X11", -} -dependencies = { - "lua >= 5.1" -} -build = { - type = "builtin", - modules = { - lfs = "src/lfs.c" - }, - copy_directories = { - "doc", "tests" - } -} diff --git a/rockspecs/luafilesystem-1.7.0-2.rockspec b/rockspecs/luafilesystem-1.7.0-2.rockspec deleted file mode 100644 index 4aa2425..0000000 --- a/rockspecs/luafilesystem-1.7.0-2.rockspec +++ /dev/null @@ -1,28 +0,0 @@ -package = "LuaFileSystem" -version = "1.7.0-2" -source = { - url = "git://github.com/keplerproject/luafilesystem", - tag = "v1_7_0_2", -} -description = { - summary = "File System Library for the Lua Programming Language", - detailed = [[ - LuaFileSystem is a Lua library developed to complement the set of - functions related to file systems offered by the standard Lua - distribution. LuaFileSystem offers a portable way to access the - underlying directory structure and file attributes. - ]], - license = "MIT/X11", -} -dependencies = { - "lua >= 5.1" -} -build = { - type = "builtin", - modules = { - lfs = "src/lfs.c" - }, - copy_directories = { - "doc", "tests" - } -} diff --git a/rockspecs/luafilesystem-cvs-1.rockspec b/rockspecs/luafilesystem-cvs-1.rockspec deleted file mode 100644 index a02d4f1..0000000 --- a/rockspecs/luafilesystem-cvs-1.rockspec +++ /dev/null @@ -1,44 +0,0 @@ -package = "LuaFileSystem" -version = "cvs-1" -source = { - url = "cvs://:pserver:anonymous:@cvs.luaforge.net:/cvsroot/luafilesystem", - cvs_tag = "HEAD" -} -description = { - summary = "File System Library for the Lua Programming Language", - detailed = [[ - LuaFileSystem is a Lua library developed to complement the set of - functions related to file systems offered by the standard Lua - distribution. LuaFileSystem offers a portable way to access the - underlying directory structure and file attributes. - ]] -} -dependencies = { - "lua >= 5.1" -} -build = { - platforms = { - unix = { - type = "make", - build_variables = { - LIB_OPTION = "$(LIBFLAG)", - CFLAGS = "$(CFLAGS) -I$(LUA_INCDIR)", - }, - install_variables = { - LUA_LIBDIR = "$(LIBDIR)" - } - }, - win32 = { - type = "make", - build_variables = { - LUA_LIB = "$(LUA_LIBDIR)\\lua5.1.lib", - CFLAGS = "$(CFLAGS) /I$(LUA_INCDIR)", - }, - install_variables = { - LUA_LIBDIR = "$(LIBDIR)", - LUA_DIR = "$(LUADIR)", - BIN_DIR = "$(BINDIR)" - } - } - } -} diff --git a/rockspecs/luafilesystem-cvs-2.rockspec b/rockspecs/luafilesystem-cvs-2.rockspec deleted file mode 100644 index 651c7cf..0000000 --- a/rockspecs/luafilesystem-cvs-2.rockspec +++ /dev/null @@ -1,26 +0,0 @@ -package = "LuaFileSystem" - -version = "cvs-2" - -source = { - url = "git://github.com/keplerproject/luafilesystem.git", -} - -description = { - summary = "File System Library for the Lua Programming Language", - detailed = [[ - LuaFileSystem is a Lua library developed to complement the set of - functions related to file systems offered by the standard Lua - distribution. LuaFileSystem offers a portable way to access the - underlying directory structure and file attributes. - ]] -} - -dependencies = { - "lua >= 5.1" -} - -build = { - type = "module", - modules = { lfs = "src/lfs.c" } -} diff --git a/rockspecs/luafilesystem-cvs-3.rockspec b/rockspecs/luafilesystem-cvs-3.rockspec deleted file mode 100644 index a4388cd..0000000 --- a/rockspecs/luafilesystem-cvs-3.rockspec +++ /dev/null @@ -1,27 +0,0 @@ -package = "LuaFileSystem" - -version = "cvs-3" - -source = { - url = "git://github.com/keplerproject/luafilesystem.git", -} - -description = { - summary = "File System Library for the Lua Programming Language", - detailed = [[ - LuaFileSystem is a Lua library developed to complement the set of - functions related to file systems offered by the standard Lua - distribution. LuaFileSystem offers a portable way to access the - underlying directory structure and file attributes. - ]] -} - -dependencies = { - "lua >= 5.1, < 5.4" -} - -build = { - type = "builtin", - modules = { lfs = "src/lfs.c" }, - copy_directories = { "doc", "tests" } -} -- cgit v1.2.3-55-g6feb