diff options
| author | V1K1NGbg <victor@ilchev.com> | 2024-07-22 21:27:40 +0300 |
|---|---|---|
| committer | V1K1NGbg <victor@ilchev.com> | 2024-08-05 20:49:17 +0300 |
| commit | 74960c88576c9e125d898ebb949e7bfada776c66 (patch) | |
| tree | 00e54408e7e84713b973fc844d79fe55be66ea0c | |
| parent | 0a1fd0aafb84212067c2a6454bad4aa5f3a154a9 (diff) | |
| download | luarocks-74960c88576c9e125d898ebb949e7bfada776c66.tar.gz luarocks-74960c88576c9e125d898ebb949e7bfada776c66.tar.bz2 luarocks-74960c88576c9e125d898ebb949e7bfada776c66.zip | |
fix attempt 1
| -rw-r--r-- | src/luarocks/type/rockspec.lua | 50 |
1 files changed, 29 insertions, 21 deletions
diff --git a/src/luarocks/type/rockspec.lua b/src/luarocks/type/rockspec.lua index 5ee944a4..63ceabf6 100644 --- a/src/luarocks/type/rockspec.lua +++ b/src/luarocks/type/rockspec.lua | |||
| @@ -135,27 +135,35 @@ local rockspec_formats, versions = type_check.declare_schemas({ | |||
| 135 | } | 135 | } |
| 136 | }) | 136 | }) |
| 137 | 137 | ||
| 138 | type_rockspec.order = { | 138 | type_rockspec.order = {"rockspec_format", "package", "version", |
| 139 | "rockspec_format", | 139 | { "source", { "url", "tag", "branch", "md5" } }, |
| 140 | "package", | 140 | { "description", {"summary", "detailed", "homepage", "license" } }, |
| 141 | "version", | 141 | "supported_platforms", "dependencies", "build_dependencies", "external_dependencies", |
| 142 | "source", | 142 | { "build", {"type", "modules", "copy_directories", "platforms"} }, |
| 143 | "description", | 143 | "test_dependencies", { "test", {"type"} }, |
| 144 | "supported_platforms", | 144 | "hooks"} |
| 145 | "dependencies", | 145 | |
| 146 | "build_dependencies", | 146 | -- type_rockspec.order = { |
| 147 | "external_dependencies", | 147 | -- "rockspec_format", |
| 148 | "build", | 148 | -- "package", |
| 149 | "test_dependencies", | 149 | -- "version", |
| 150 | "test", | 150 | -- "source", |
| 151 | "hooks", | 151 | -- "description", |
| 152 | sub_orders = { | 152 | -- "supported_platforms", |
| 153 | ["source"] = { "url", "tag", "branch", "md5" }, | 153 | -- "dependencies", |
| 154 | ["description"] = {"summary", "detailed", "homepage", "license" }, | 154 | -- "build_dependencies", |
| 155 | ["build"] = { "type", "modules", "copy_directories", "platforms" }, | 155 | -- "external_dependencies", |
| 156 | ["test"] = { "type" } | 156 | -- "build", |
| 157 | } | 157 | -- "test_dependencies", |
| 158 | } | 158 | -- "test", |
| 159 | -- "hooks", | ||
| 160 | -- sub_orders = { | ||
| 161 | -- ["source"] = { "url", "tag", "branch", "md5" }, | ||
| 162 | -- ["description"] = {"summary", "detailed", "homepage", "license" }, | ||
| 163 | -- ["build"] = { "type", "modules", "copy_directories", "platforms" }, | ||
| 164 | -- ["test"] = { "type" } | ||
| 165 | -- } | ||
| 166 | -- } | ||
| 159 | 167 | ||
| 160 | local function check_rockspec_using_version(rockspec, globals, version) | 168 | local function check_rockspec_using_version(rockspec, globals, version) |
| 161 | local schema = rockspec_formats[version] | 169 | local schema = rockspec_formats[version] |