Merge pull request #2066 from Jarod42/improve_include_error_message

Improve error message of `include`
premake · Aug 9, 2023 · bcbe8ea · bcbe8ea
2 parents c135248 + 33e2a66
commit bcbe8ea
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/src/base/_foundation.lua b/src/base/_foundation.lua
@@ -238,7 +238,15 @@
 --
 
 	function premake.findProjectScript(fname)
-		return os.locate(fname, fname .. ".lua", path.join(fname, "premake5.lua"), path.join(fname, "premake4.lua"))
+		local with_ext = fname .. ".lua"
+		local p5 = path.join(fname, "premake5.lua")
+		local p4 = path.join(fname, "premake4.lua")
+
+		local res = os.locate(fname, with_ext, p5, p4)
+		if res == nil then
+			premake.error("Cannot find either " .. table.implode({fname, with_ext, p5, p4}, "", "", " or "))
+		end
+		return res
 	end
 
 

diff --git a/src/base/api.lua b/src/base/api.lua
@@ -81,10 +81,9 @@
 ---
 
 	function includeexternal(fname)
-		local fullPath = p.findProjectScript(fname)
+		fname = p.findProjectScript(fname)
 		local wasIncludingExternal = api._isIncludingExternal
 		api._isIncludingExternal = true
-		fname = fullPath or fname
 		dofile(fname)
 		api._isIncludingExternal = wasIncludingExternal
 	end

diff --git a/src/base/globals.lua b/src/base/globals.lua
@@ -48,8 +48,7 @@
 	io._includedFiles = {}
 
 	function include(fname)
-		local fullPath = premake.findProjectScript(fname)
-		fname = fullPath or fname
+		fname = premake.findProjectScript(fname)
 		if not io._includedFiles[fname] then
 			io._includedFiles[fname] = true
 			return dofile(fname)