Build the specific version tl uses

2 files changed, 14 insertions, 9 deletions

diff --git a/init b/init
index f5e9155..5ffad4d 100755
--- a/init
+++ b/init
@@ -1,13 +1,13 @@
 #!/bin/sh -ex
 
 cd lua-compat-5.3
-cp rockspecs/compat53-scm-1.rockspec .
-cp rockspecs/bit32-scm-1.rockspec .
+cp rockspecs/compat53-$packver.rockspec .
+cp rockspecs/bit32-$packver.rockspec .
 luarocks config variables.CFLAGS " $CFLAGS"
-luarocks make --pack-binary-rock compat53-scm-1.rockspec
-luarocks make --pack-binary-rock bit32-scm-1.rockspec
-obj1="compat53-scm-1.$(luarocks config arch).rock"
-obj2="bit32-scm-1.$(luarocks config arch).rock"
+luarocks make --pack-binary-rock compat53-$packver.rockspec
+luarocks make --pack-binary-rock bit32-$packver.rockspec
+obj1="compat53-$packver.$(luarocks config arch).rock"
+obj2="bit32-$packver.$(luarocks config arch).rock"
 cp $obj1 /root
 cp $obj2 /root
 cd /root
diff --git a/meta.lua b/meta.lua
index 06a5eef..d1841c4 100644
--- a/meta.lua
+++ b/meta.lua
@@ -1,3 +1,7 @@
+local package_versions = {
+        ["scm-1"] = true,
+        ["0.12.1-1"] = true
+}
 local lua_versions = {
         ["51"] = true,
         ["52"] = true,
@@ -20,7 +24,7 @@ local debug = {
 local compilers = {--[["mingw32",]]"mingw64"--[[,"clang32","clang64"]]}
 
 local builds = {}
-for version, _, name, optimization, rel, flag, _, image in cartesian(lua_versions, optimizations, debug, compilers) do
+for package_version, _, version, _, name, optimization, rel, flag, _, image in cartesian(package_versions, lua_versions, optimizations, debug, compilers) do
         local buildname = "lua-compat-53-" .. version .. "-" .. name .. "-" .. rel .. "-" .. image
         builds[buildname] = {
                 image = "image-luarocks-" .. version.. "-" .. image,
@@ -30,11 +34,12 @@ for version, _, name, optimization, rel, flag, _, image in cartesian(lua_version
                         {"cicd","lua" .. version .. "-" .. name .. "-" .. rel .. "-" .. image .. ":lua" .. version .. ".dll"},
                 },
                 produces = {
-                        ["compat53-scm-1.mingw32-x86_64.rock"] = {"luarocks.sh", "compat53", image, version, name, rel},
-                        ["bit32-scm-1.mingw32-x86_64.rock"] = {"luarocks.sh", "bit32", image, version, name, rel},
+                        ["compat53-" .. package_version .. ".mingw32-x86_64.rock"] = {"luarocks.sh", "compat53", image, version, name, rel},
+                        ["bit32-" .. package_version .. ".mingw32-x86_64.rock"] = {"luarocks.sh", "bit32", image, version, name, rel},
                 },
                 env = {
                         CFLAGS = optimization .. " " .. flag,
+                        packver = package_version,
                         rockver = version:gsub("(%d)(%d)$","%1.%2"),
                         version = version
                 },