Premake: Add include guard to make sure dependencies do not include themselves in an infinite chain when two components depend on each other

premake5.lua

@@ -19,6 +19,37 @@ function TestFolder()
 	return path.getrelative(os.getcwd(), _TestFolder)
 end
 
+-- Functions for including projects
+References = {
+    includeList = {},
+    linkList = {}
+}
+
+function References:include(name)
+    result = self.includeList[name] == nil
+
+    if result then
+        self.includeList[name] = true
+    end
+
+    return result
+end
+
+function References:link(name)
+    result = self.linkList[name] == nil
+
+    if result then
+        self.linkList[name] = true
+    end
+
+    return result
+end
+
+function References:reset()
+    self.includeList = {}
+    self.linkList = {}
+end
+
 -- Target Directories
 TargetDirectoryBin = "%{wks.location}/bin/%{cfg.buildcfg}_%{cfg.platform}"
 TargetDirectoryLib = "%{wks.location}/lib/%{cfg.buildcfg}_%{cfg.platform}"

src/Crypto.lua

@@ -1,23 +1,28 @@
 Crypto = {}
 
 function Crypto:include()
+	if References:include("Crypto") then
 		includedirs {
 			path.join(ProjectFolder(), "Crypto")
 		}
 	end
+end
 
 function Crypto:link()
+	if References:link("Crypto") then
 		libtomcrypt:link()
 		libtommath:link()
 		salsa20:link()
 		links "Crypto"
 	end
+end
 
 function Crypto:use()
 	
 end
 
 function Crypto:project()
+	References:reset()
 	local folder = ProjectFolder();
 
 	project "Crypto"

src/Linker.lua

@@ -1,10 +1,12 @@
 Linker = {}
 
 function Linker:include()
+	if References:include("Linker") then
 		includedirs {
 			path.join(ProjectFolder(), "Linker")
 		}
 	end
+end
 
 function Linker:link()
     
@@ -15,6 +17,7 @@ function Linker:use()
 end
 
 function Linker:project()
+	References:reset()
 	local folder = ProjectFolder();
 
 	project "Linker"

src/ObjCommon.lua

@@ -1,14 +1,17 @@
 ObjCommon = {}
 
 function ObjCommon:include()
+	if References:include("ObjCommon") then
 		ZoneCommon:include()
 		minizip:include()
 		includedirs {
 			path.join(ProjectFolder(), "ObjCommon")
 		}
 	end
+end
 
 function ObjCommon:link()
+	if References:link("ObjCommon") then
 		Utils:link()
 		ZoneCommon:link()
 		minizip:link()
@@ -16,12 +19,14 @@ function ObjCommon:link()
 			"ObjCommon"
 		}
 	end
+end
 
 function ObjCommon:use()
 	
 end
 
 function ObjCommon:project()
+	References:reset()
 	local folder = ProjectFolder();
 
 	project "ObjCommon"

src/ObjLoading.lua

@@ -1,14 +1,17 @@
 ObjLoading = {}
 
 function ObjLoading:include()
+	if References:include("ObjLoading") then
 		ObjCommon:include()
 		ZoneCommon:include()
 		includedirs {
 			path.join(ProjectFolder(), "ObjLoading")
 		}
 	end
+end
 
 function ObjLoading:link()
+	if References:link("ObjLoading") then
 		Utils:link()
 		ObjCommon:link()
 		ZoneCommon:link()
@@ -19,12 +22,14 @@ function ObjLoading:link()
 			"ObjLoading"
 		}
 	end
+end
 
 function ObjLoading:use()
 	
 end
 
 function ObjLoading:project()
+	References:reset()
 	local folder = ProjectFolder();
 
 	project "ObjLoading"

src/ObjWriting.lua

@@ -1,14 +1,17 @@
 ObjWriting = {}
 
 function ObjWriting:include()
+	if References:include("ObjWriting") then
 		ObjCommon:include()
 		ZoneCommon:include()
 		includedirs {
 			path.join(ProjectFolder(), "ObjWriting")
 		}
 	end
+end
 
 function ObjWriting:link()
+	if References:link("ObjWriting") then
 		Utils:link()
 		ObjCommon:link()
 		ZoneCommon:link()
@@ -18,12 +21,14 @@ function ObjWriting:link()
 			"ObjWriting"
 		}
 	end
+end
 
 function ObjWriting:use()
 	
 end
 
 function ObjWriting:project()
+	References:reset()
 	local folder = ProjectFolder();
 
 	project "ObjWriting"

src/Unlinker.lua

@@ -1,10 +1,12 @@
 Unlinker = {}
 
 function Unlinker:include()
+	if References:include("Unlinker") then
 		includedirs {
 			path.join(ProjectFolder(), "Unlinker")
 		}
 	end
+end
 
 function Unlinker:link()
     
@@ -15,6 +17,7 @@ function Unlinker:use()
 end
 
 function Unlinker:project()
+	References:reset()
 	local folder = ProjectFolder();
 
 	project "Unlinker"

src/Utils.lua

@@ -1,20 +1,25 @@
 Utils = {}
 
 function Utils:include()
+	if References:include("Utils") then
 		includedirs {
 			path.join(ProjectFolder(), "Utils")
 		}
 	end
+end
 
 function Utils:link()
+	if References:link("Utils") then
 		links "Utils"
 	end
+end
 
 function Utils:use()
 	
 end
 
 function Utils:project()
+	References:reset()
 	local folder = ProjectFolder();
 
 	project "Utils"

src/ZoneCode.lua

@@ -108,11 +108,13 @@ function ZoneCode:allWriteFiles()
 end
 
 function ZoneCode:include()
+	if References:include("ZoneCode") then
         includedirs {
             path.join(ProjectFolder(), "ZoneCode"),
             "%{wks.location}/src/ZoneCode"
         }
     end
+end
 
 function ZoneCode:link()
     
@@ -123,6 +125,7 @@ function ZoneCode:use()
 end
 
 function ZoneCode:project()
+    References:reset()
 	local folder = ProjectFolder();
 
 	project "ZoneCode"

src/ZoneCodeGenerator.lua

@@ -5,14 +5,17 @@ function ZoneCodeGenerator:include()
 end
 
 function ZoneCodeGenerator:link()
+	if References:link("ZoneCodeGenerator") then
         links "ZoneCodeGenerator"
     end
+end
 
 function ZoneCodeGenerator:use()
     dependson "ZoneCodeGenerator"
 end
 
 function ZoneCodeGenerator:project()
+    References:reset()
 	local folder = ProjectFolder();
 
 	project "ZoneCodeGenerator"

src/ZoneCommon.lua

@@ -1,24 +1,31 @@
 ZoneCommon = {}
 
 function ZoneCommon:include()
+	if References:include("ZoneCommon") then
 		Utils:include()
+		ObjCommon:include()
 		includedirs {
 			path.join(ProjectFolder(), "ZoneCommon")
 		}
 	end
+end
 
 function ZoneCommon:link()
+	if References:link("ZoneCommon") then
 		Utils:link()
+		ObjCommon:link()
 		links {
 			"ZoneCommon"
 		}
 	end
+end
 
 function ZoneCommon:use()
 	
 end
 
 function ZoneCommon:project()
+	References:reset()
 	local folder = ProjectFolder();
 
 	project "ZoneCommon"

src/ZoneLoading.lua

@@ -1,13 +1,16 @@
 ZoneLoading = {}
 
 function ZoneLoading:include()
+	if References:include("ZoneLoading") then
 		ZoneCommon:include()
 		includedirs {
 			path.join(ProjectFolder(), "ZoneLoading")
 		}
 	end
+end
 
 function ZoneLoading:link()
+	if References:link("ZoneLoading") then
 		Crypto:link()
 		Utils:link()
 		ZoneCommon:link()
@@ -16,12 +19,14 @@ function ZoneLoading:link()
 			"ZoneLoading"
 		}
 	end
+end
 
 function ZoneLoading:use()
 	
 end
 
 function ZoneLoading:project()
+	References:reset()
 	local folder = ProjectFolder();
 
 	project "ZoneLoading"

src/ZoneWriting.lua

@@ -1,13 +1,16 @@
 ZoneWriting = {}
 
 function ZoneWriting:include()
+	if References:include("ZoneWriting") then
 		ZoneCommon:include()
 		includedirs {
 			path.join(ProjectFolder(), "ZoneWriting")
 		}
 	end
+end
 
 function ZoneWriting:link()
+	if References:link("ZoneWriting") then
 		Crypto:link()
 		Utils:link()
 		ZoneCommon:link()
@@ -16,12 +19,14 @@ function ZoneWriting:link()
 			"ZoneWriting"
 		}
 	end
+end
 
 function ZoneWriting:use()
 	
 end
 
 function ZoneWriting:project()
+	References:reset()
 	local folder = ProjectFolder();
 
 	project "ZoneWriting"

test/ZoneCodeGeneratorTests.lua

@@ -5,7 +5,9 @@ function ZoneCodeGeneratorTests:include()
 end
 
 function ZoneCodeGeneratorTests:link()
-    links "ZoneCommonTests"
+	if References:link("ZoneCodeGeneratorTests") then
+		links "ZoneCodeGeneratorTests"
+	end
 end
 
 function ZoneCodeGeneratorTests:use()
@@ -13,6 +15,7 @@ function ZoneCodeGeneratorTests:use()
 end
 
 function ZoneCodeGeneratorTests:project()
+	References:reset()
 	local folder = TestFolder();
 
 	project "ZoneCodeGeneratorTests"

test/ZoneCommonTests.lua

@@ -5,14 +5,17 @@ function ZoneCommonTests:include()
 end
 
 function ZoneCommonTests:link()
+	if References:link("ZoneCommonTests") then
 		links "ZoneCommonTests"
 	end
+end
 
 function ZoneCommonTests:use()
 	
 end
 
 function ZoneCommonTests:project()
+	References:reset()
 	local folder = TestFolder();
 
 	project "ZoneCommonTests"

thirdparty/libtomcrypt.lua

@@ -1,6 +1,7 @@
 libtomcrypt = {}
 
 function libtomcrypt:include()
+	if References:include("libtomcrypt") then
 		defines{
 			"LTM_DESC"
 		}
@@ -9,16 +10,20 @@ function libtomcrypt:include()
 			path.join(ThirdPartyFolder(), "libtomcrypt/src/headers")
 		}
 	end
+end
 
 function libtomcrypt:link()
+	if References:link("libtomcrypt") then
 		links "libtomcrypt"
 	end
+end
 
 function libtomcrypt:use()
 	
 end
 
 function libtomcrypt:project()
+	References:reset()
 	local folder = ThirdPartyFolder();
 
 	project "libtomcrypt"

thirdparty/libtommath.lua

@@ -1,20 +1,25 @@
 libtommath = {}
 
 function libtommath:include()
+	if References:include("libtommath") then
 		includedirs {
 			path.join(ThirdPartyFolder(), "libtommath")
 		}
 	end
+end
 
 function libtommath:link()
+	if References:link("libtommath") then
 		links "libtommath"
 	end
+end
 
 function libtommath:use()
 	
 end
 
 function libtommath:project()
+	References:reset()
 	local folder = ThirdPartyFolder();
 
 	project "libtommath"

thirdparty/minilzo.lua

@@ -1,20 +1,25 @@
 minilzo = {}
 
 function minilzo:include()
+	if References:include("minilzo") then
 		includedirs {
 			path.join(ThirdPartyFolder(), "minilzo")
 		}
 	end
+end
 
 function minilzo:link()
+	if References:link("minilzo") then
 		links "minilzo"
 	end
+end
 
 function minilzo:use()
 	
 end
 
 function minilzo:project()
+	References:reset()
 	local folder = ThirdPartyFolder();
 
 	project "minilzo"

thirdparty/minizip.lua

@@ -1,22 +1,27 @@
 minizip = {}
 
 function minizip:include()
+	if References:include("minizip") then
 		zlib:include()
 		includedirs {
 			path.join(ThirdPartyFolder(), "zlib/contrib/minizip")
 		}
 	end
+end
 
 function minizip:link()
+	if References:link("minizip") then
 		zlib:link()
 		links "minizip"
 	end
+end
 
 function minizip:use()
 	
 end
 
 function minizip:project()
+	References:reset()
 	local folder = ThirdPartyFolder();
 
 	project "minizip"

thirdparty/salsa20.lua

@@ -1,20 +1,25 @@
 salsa20 = {}
 
 function salsa20:include()
+	if References:include("salsa20") then
 		includedirs {
 			path.join(ThirdPartyFolder(), "salsa20")
 		}
 	end
+end
 
 function salsa20:link()
+	if References:link("salsa20") then
 		links "salsa20"
 	end
+end
 
 function salsa20:use()
 	
 end
 
 function salsa20:project()
+	References:reset()
 	local folder = ThirdPartyFolder();
 
 	project "salsa20"

thirdparty/zlib.lua

@@ -1,7 +1,7 @@
 zlib = {}
 
 function zlib:include()
-
+	if References:include("zlib") then
 		defines {
 			"ZLIB_CONST"
 		}
@@ -10,16 +10,20 @@ function zlib:include()
 			path.join(ThirdPartyFolder(), "zlib")
 		}
 	end
+end
 
 function zlib:link()
+	if References:link("zlib") then
 		links "zlib"
 	end
+end
 
 function zlib:use()
 	
 end
 
 function zlib:project()
+	References:reset()
 	local folder = ThirdPartyFolder();
 
 	project "zlib"