From f2beb5ee1fd2c54d59a43f4f2a8fe0f7a1701daa Mon Sep 17 00:00:00 2001
From: Hisham <hisham@gobolinux.org>
Date: Thu, 30 Jun 2016 01:15:01 -0300
Subject: Core modules reorganization.

Isolate all modules used by luarocks.loader in a
luarocks.core.* namespace. Core modules can only require
other core modules, and they only use require() at the
top-level chunk. In other words, after luarocks.loader
is setup, package.path can be altered at will and it
should not affect the ability of luarocks.loader to run,
and the luarocks.loader modules should not interfere
with modules loaded later.

This was motivated by @robooo's GSoC work on porting
the LuaRocks test suite to Lua using Busted. Busted itself
runs using luarocks.loader, and we need to ensure that
the modules loaded by the tests do not conflict with
the ones used by luarocks.loader.

A circular dependency between luarocks.manif and
luarocks.search was removed by creating a separate
luarocks.manif.writer module.

Also, luarocks-admin commands were moved to a
luarocks.admin.* namespace.
---
 makedist | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'makedist')

diff --git a/makedist b/makedist
index fb41b981..05da40a8 100755
--- a/makedist
+++ b/makedist
@@ -20,9 +20,9 @@ grep -q "\"$1\"" rockspec || {
    exit 1
 }
 
-grep -q "program_version = \"$1\"" src/luarocks/cfg.lua || {
+grep -q "program_version = \"$1\"" src/luarocks/core/cfg.lua || {
    echo
-   echo "program_version in src/luarocks/cfg.lua is incorrect. Please fix it."
+   echo "program_version in src/luarocks/core/cfg.lua is incorrect. Please fix it."
    exit 1
 }
 
@@ -41,9 +41,9 @@ grep -q "LUAROCKS_VER: $1" appveyor.yml || {
 # e.g. if $1 is "2.3.0", $program_series is "2.3"
 program_series=${1%.*}
 
-grep -q "program_series = \"$program_series\"" src/luarocks/cfg.lua || {
+grep -q "program_series = \"$program_series\"" src/luarocks/core/cfg.lua || {
    echo
-   echo "program_series in src/luarocks/cfg.lua is incorrect. Please fix it."
+   echo "program_series in src/luarocks/core/cfg.lua is incorrect. Please fix it."
    exit 1
 }
 
-- 
cgit v1.2.3-55-g6feb


From 5b8651369fae1d302442e7c60d07b109e1bb2339 Mon Sep 17 00:00:00 2001
From: Hisham <hisham@gobolinux.org>
Date: Mon, 14 Nov 2016 15:18:07 -0200
Subject: Remove outdated file from list, and automate check for the future

---
 Makefile.setup.inc |  2 +-
 makedist           | 15 +++++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

(limited to 'makedist')

diff --git a/Makefile.setup.inc b/Makefile.setup.inc
index 0a34429c..0167b55c 100644
--- a/Makefile.setup.inc
+++ b/Makefile.setup.inc
@@ -14,7 +14,7 @@ cmd/make.lua cmd/list.lua cmd/show.lua cmd/path.lua cmd/new_version.lua \
 cmd/pack.lua cmd/download.lua cmd/doc.lua cmd/remove.lua tools/patch.lua \
 tools/zip.lua tools/tar.lua manif/writer.lua build/cmake.lua build/make.lua \
 build/command.lua build/builtin.lua fetch.lua path.lua util.lua deps.lua \
-pack.lua download.lua core/dir.lua core/path.lua core/util.lua core/deps.lua \
+pack.lua download.lua core/dir.lua core/path.lua core/util.lua \
 core/cfg.lua core/type_check.lua core/persist.lua core/manif.lua \
 type_check.lua persist.lua require.lua manif.lua admin/cache.lua \
 admin/cmd/make_manifest.lua admin/cmd/add.lua admin/cmd/remove.lua \
diff --git a/makedist b/makedist
index 05da40a8..5e22b688 100755
--- a/makedist
+++ b/makedist
@@ -80,6 +80,21 @@ then
    exit 1
 fi
 
+cat Makefile.setup.inc | tr ' \\' '\n\n' | grep 'lua$' | while read i
+do
+   if [ ! -e src/luarocks/$i ]
+   then
+      echo "Ref in Makefile.setup.inc for file that no longer exists: $i"
+      touch "outdated_ref"
+      exit 1
+   fi
+done
+if [ -e "outdated_ref" ]
+then
+   rm -f "outdated_ref"
+   exit 1
+fi
+
 rm -rf "release-unix" "release-windows" "$out.tar.gz" "$out-win32.zip"
 
 mkdir "release-unix"
-- 
cgit v1.2.3-55-g6feb