diff options
| author | Renato Maia <maia.renato@gmail.com> | 2025-04-21 11:16:38 -0300 |
|---|---|---|
| committer | Hisham Muhammad <hisham@gobolinux.org> | 2025-05-19 11:30:51 -0300 |
| commit | 4d7b546602b906f924ac91a01276cd3b2569ca9f (patch) | |
| tree | 6bf4b9927c543723d42c8777459e02e278d37896 /src | |
| parent | 9b4ab564387e925a830e24b35dee46621a842f39 (diff) | |
| download | luarocks-4d7b546602b906f924ac91a01276cd3b2569ca9f.tar.gz luarocks-4d7b546602b906f924ac91a01276cd3b2569ca9f.tar.bz2 luarocks-4d7b546602b906f924ac91a01276cd3b2569ca9f.zip | |
feat: add LUA_VERSION build variable for rockspecs
Diffstat (limited to 'src')
| -rw-r--r-- | src/luarocks/rockspecs.lua | 3 | ||||
| -rw-r--r-- | src/luarocks/rockspecs.tl | 3 | ||||
| -rw-r--r-- | src/luarocks/type/rockspec.lua | 5 | ||||
| -rw-r--r-- | src/luarocks/type/rockspec.tl | 7 |
4 files changed, 15 insertions, 3 deletions
diff --git a/src/luarocks/rockspecs.lua b/src/luarocks/rockspecs.lua index 6a9a376c..8a1a528e 100644 --- a/src/luarocks/rockspecs.lua +++ b/src/luarocks/rockspecs.lua | |||
| @@ -83,6 +83,9 @@ local function configure_paths(rockspec) | |||
| 83 | vars.CONFDIR = path.conf_dir(name, version) | 83 | vars.CONFDIR = path.conf_dir(name, version) |
| 84 | vars.BINDIR = path.bin_dir(name, version) | 84 | vars.BINDIR = path.bin_dir(name, version) |
| 85 | vars.DOCDIR = path.doc_dir(name, version) | 85 | vars.DOCDIR = path.doc_dir(name, version) |
| 86 | if rockspec:format_is_at_least("3.1") then | ||
| 87 | vars.LUA_VERSION = cfg.lua_version | ||
| 88 | end | ||
| 86 | rockspec.variables = vars | 89 | rockspec.variables = vars |
| 87 | end | 90 | end |
| 88 | 91 | ||
diff --git a/src/luarocks/rockspecs.tl b/src/luarocks/rockspecs.tl index a34c0dbf..9f12649c 100644 --- a/src/luarocks/rockspecs.tl +++ b/src/luarocks/rockspecs.tl | |||
| @@ -83,6 +83,9 @@ local function configure_paths(rockspec: Rockspec) | |||
| 83 | vars.CONFDIR = path.conf_dir(name, version) | 83 | vars.CONFDIR = path.conf_dir(name, version) |
| 84 | vars.BINDIR = path.bin_dir(name, version) | 84 | vars.BINDIR = path.bin_dir(name, version) |
| 85 | vars.DOCDIR = path.doc_dir(name, version) | 85 | vars.DOCDIR = path.doc_dir(name, version) |
| 86 | if rockspec:format_is_at_least("3.1") then | ||
| 87 | vars.LUA_VERSION = cfg.lua_version | ||
| 88 | end | ||
| 86 | rockspec.variables = vars | 89 | rockspec.variables = vars |
| 87 | end | 90 | end |
| 88 | 91 | ||
diff --git a/src/luarocks/type/rockspec.lua b/src/luarocks/type/rockspec.lua index cd4044f6..10b06690 100644 --- a/src/luarocks/type/rockspec.lua +++ b/src/luarocks/type/rockspec.lua | |||
| @@ -11,7 +11,7 @@ local type_check = require("luarocks.type_check") | |||
| 11 | 11 | ||
| 12 | 12 | ||
| 13 | 13 | ||
| 14 | type_rockspec.rockspec_format = "3.0" | 14 | type_rockspec.rockspec_format = "3.1" |
| 15 | 15 | ||
| 16 | 16 | ||
| 17 | 17 | ||
| @@ -174,6 +174,9 @@ local rockspec_formats, versions = type_check.declare_schemas({ | |||
| 174 | }, | 174 | }, |
| 175 | }, | 175 | }, |
| 176 | }, | 176 | }, |
| 177 | |||
| 178 | ["3.1"] = {}, | ||
| 179 | |||
| 177 | }) | 180 | }) |
| 178 | 181 | ||
| 179 | 182 | ||
diff --git a/src/luarocks/type/rockspec.tl b/src/luarocks/type/rockspec.tl index 599c13ce..52ad7909 100644 --- a/src/luarocks/type/rockspec.tl +++ b/src/luarocks/type/rockspec.tl | |||
| @@ -11,7 +11,7 @@ local type_check = require("luarocks.type_check") | |||
| 11 | 11 | ||
| 12 | -- local type TableSchema = type_check.TableSchema | 12 | -- local type TableSchema = type_check.TableSchema |
| 13 | 13 | ||
| 14 | type_rockspec.rockspec_format = "3.0" | 14 | type_rockspec.rockspec_format = "3.1" |
| 15 | 15 | ||
| 16 | -- Syntax for type-checking tables: | 16 | -- Syntax for type-checking tables: |
| 17 | -- | 17 | -- |
| @@ -173,7 +173,10 @@ local rockspec_formats, versions = type_check.declare_schemas({ | |||
| 173 | _more = true, | 173 | _more = true, |
| 174 | }, | 174 | }, |
| 175 | } | 175 | } |
| 176 | } | 176 | }, |
| 177 | |||
| 178 | ["3.1"] = {}, | ||
| 179 | |||
| 177 | }) | 180 | }) |
| 178 | 181 | ||
| 179 | -- type_rockspec.order = {"rockspec_format", "package", "version", | 182 | -- type_rockspec.order = {"rockspec_format", "package", "version", |
