Remove platform-specific intermediate objects on clean

CHANGES.txt

@@ -11,6 +11,7 @@
 
 - Use libtool instead of ar for Mac OS X Universal static libraries
 - Fixed Xbox 360 linker settings in Visual Studio
+- Remove platform-specific intermediate objects on clean
 - Bug 2819232: Buildoptions not used when creating Makefile for C#
 - Bug 2813297: OS X universal config should be "univ" (William Burnson)
 - Bug 2814179: Xbox 360 precompiled headers not working

src/actions/clean/_clean.lua

@@ -36,11 +36,17 @@
 			local function rebase(parent, dir)
 				return path.getabsolute(path.rebase(dir, parent.location, cwd))
 			end
-				
+
 			-- Walk the tree. Build a list of object names to pass to the cleaners,
 			-- and delete any toolset agnostic files along the way.
 			for _,sln in ipairs(_SOLUTIONS) do
 				table.insert(solutions, path.join(sln.location, sln.name))
+				
+				-- build a list of supported target platforms that also includes a generic build
+				local platforms = sln.platforms or { }
+				if not table.contains(platforms, "Native") then
+					platforms = table.join(platforms, { "Native" })
+				end
 
 				for prj in premake.eachproject(sln) do
 					table.insert(projects, path.join(prj.location, prj.name))
@@ -49,23 +55,26 @@
 						os.rmdir(rebase(prj, prj.objectsdir))
 					end
 
-					for cfg in premake.eachconfig(prj) do			
-						table.insert(targets, path.join(rebase(cfg, cfg.buildtarget.directory), cfg.buildtarget.basename))
+					for _, platform in ipairs(platforms) do
+						for cfg in premake.eachconfig(prj, platform) do
+							table.insert(targets, path.join(rebase(cfg, cfg.buildtarget.directory), cfg.buildtarget.basename))
 
-						-- remove all possible permutations of the target binary
-						os.remove(rebase(cfg, premake.gettarget(cfg, "build", "posix", "windows", "windows").fullpath))
-						os.remove(rebase(cfg, premake.gettarget(cfg, "build", "posix", "posix", "linux").fullpath))
-						os.remove(rebase(cfg, premake.gettarget(cfg, "build", "posix", "posix", "macosx").fullpath))
-						os.remove(rebase(cfg, premake.gettarget(cfg, "build", "posix", "PS3", "windows").fullpath))
-						if (cfg.kind == "WindowedApp") then
-							os.rmdir(rebase(cfg, premake.gettarget(cfg, "build", "posix", "posix", "linux").fullpath .. ".app"))
+							-- remove all possible permutations of the target binary
+							os.remove(rebase(cfg, premake.gettarget(cfg, "build", "posix", "windows", "windows").fullpath))
+							os.remove(rebase(cfg, premake.gettarget(cfg, "build", "posix", "posix", "linux").fullpath))
+							os.remove(rebase(cfg, premake.gettarget(cfg, "build", "posix", "posix", "macosx").fullpath))
+							os.remove(rebase(cfg, premake.gettarget(cfg, "build", "posix", "PS3", "windows").fullpath))
+							if (cfg.kind == "WindowedApp") then
+								os.rmdir(rebase(cfg, premake.gettarget(cfg, "build", "posix", "posix", "linux").fullpath .. ".app"))
+							end
+
+							-- if there is an import library, remove that too
+							os.remove(rebase(cfg, premake.gettarget(cfg, "link", "windows", "windows", "windows").fullpath))
+							os.remove(rebase(cfg, premake.gettarget(cfg, "link", "posix", "posix", "linux").fullpath))
+
+							-- remove the associated objects directory
+							os.rmdir(rebase(cfg, cfg.objectsdir))
 						end
-
-						-- if there is an import library, remove that too
-						os.remove(rebase(cfg, premake.gettarget(cfg, "link", "windows", "windows", "windows").fullpath))
-						os.remove(rebase(cfg, premake.gettarget(cfg, "link", "posix", "posix", "linux").fullpath))
-
-						os.rmdir(rebase(cfg, cfg.objectsdir))
 					end
 				end
 			end

tests/actions/test_clean.lua

@@ -152,3 +152,17 @@
 		test.contains(removed, "MyProject.lib")
 		test.contains(removed, "libMyProject.a")
 	end
+
+
+	function T.clean.PlatformObjects()
+		platforms { "Native", "x32" }
+		prj = project "MyProject"
+		language "C++"
+		kind "ConsoleApp"
+		prepare()
+		for _,v in ipairs(removed) do if v:startswith("obj/") then print(v) end end
+		test.contains(removed, "obj/Debug")
+		test.contains(removed, "obj/Release")
+		test.contains(removed, "obj/x32/Debug")
+		test.contains(removed, "obj/x32/Release")
+	end