Merge master -> feature/ninja-exporter

Author: nickclark2016

.github/workflows/ci-workflow.yml

@@ -177,7 +177,7 @@ jobs:
     - name: Checkout
       uses: actions/checkout@v5
     - name: Start FreeBSD VM
-      uses: vmactions/[email protected].3
+      uses: vmactions/[email protected].4
       with:
         usesh: true
         sync: sshfs
@@ -255,7 +255,7 @@ jobs:
     - name: Checkout
       uses: actions/checkout@v5
     - name: Build on NetBSD VM
-      uses: vmactions/netbsd-vm@v1.1.9
+      uses: vmactions/netbsd-vm@v1.2.0
       with:
         usesh: true
         prepare: |

BUILD.txt

@@ -39,9 +39,15 @@ BUILDING FROM THE REPOSITORY
 
 Alternatively, you may call the Makefile directly:
 
-    $ make -f Bootstrap.mak PLATFORM
+    $ make -f Bootstrap.mak HOST_PLATFORM
+
+ Where HOST_PLATFORM can be osx or linux.
+
+ The target architecture for the Makefile defaults to x86. If you are building
+ for something else you can set PLATFORM explicitly e.g. for Apple Silicon:
+
+    $ make -f Bootstrap.mak osx PLATFORM=ARM64
 
- Where PLATFORM can be osx or linux.
  On Windows with Visual Studio use nmake:
 
     $ nmake -f Bootstrap.mak windows

Bootstrap.sh

@@ -14,6 +14,12 @@ done
 PLATFORM_ARG=""
 CONFIG_ARG=""
 PREMAKE_OPTS_ARG=""
+SYSTEM=$(uname -s)
+
+# If the user has not explicitly selected an architecture, select one automatically
+if [ -z "$PLATFORM" ] && [ "$SYSTEM" = "Darwin" ] && [ "$(uname -m)" = "arm64" ]; then
+  PLATFORM="ARM64"
+fi
 
 if [ -n "$PLATFORM" ]; then
   PLATFORM_ARG="PLATFORM=$PLATFORM"
@@ -29,7 +35,6 @@ else
   PREMAKE_OPTS_ARG="PREMAKE_OPTS="
 fi
 
-SYSTEM=$(uname -s)
 case "${SYSTEM}" in
    Linux)
      NPROC=$(nproc --all)

modules/gmake/gmake_cpp.lua

@@ -58,25 +58,33 @@
 	function cpp.initialize()
 		rule 'cpp'
 			fileExtension { ".cc", ".cpp", ".cxx", ".mm" }
-			buildoutputs  { "$(OBJDIR)/%{file.objname}.o" }
+			buildoutputs  { "$(OBJDIR)/%{file.objname}%{premake.modules.gmake.cpp.gettooloutputext('cxx', cfg)}" }
 			buildmessage  '$(notdir $<)'
 			buildcommands {'$(CXX) %{premake.modules.gmake.cpp.fileFlags(cfg, file)} $(FORCE_INCLUDE) -o "$@" -MF "$(@:%.o=%.d)" -c "$<"'}
 
 		rule 'cc'
 			fileExtension {".c", ".s", ".m"}
-			buildoutputs  { "$(OBJDIR)/%{file.objname}.o" }
+			buildoutputs  { "$(OBJDIR)/%{file.objname}%{premake.modules.gmake.cpp.gettooloutputext('cc', cfg)}" }
 			buildmessage  '$(notdir $<)'
 			buildcommands {'$(CC) %{premake.modules.gmake.cpp.fileFlags(cfg, file)} $(FORCE_INCLUDE) -o "$@" -MF "$(@:%.o=%.d)" -c "$<"'}
 
 		rule 'resource'
 			fileExtension ".rc"
-			buildoutputs  { "$(OBJDIR)/%{file.objname}.res" }
+			buildoutputs  { "$(OBJDIR)/%{file.objname}%{premake.modules.gmake.cpp.gettooloutputext('rc', cfg)}" }
 			buildmessage  '$(notdir $<)'
 			buildcommands {'$(RESCOMP) $< -O coff -o "$@" $(ALL_RESFLAGS)'}
 
 		global(nil)
 	end
 
+	function cpp.gettooloutputext(tool, cfg)
+		local toolset = gmake.getToolSet(cfg)
+		if toolset.gettooloutputext ~= nil then
+			return toolset.gettooloutputext(tool)
+		end
+
+		return iif(tool == "rc", ".res", ".o")
+	end
 
 	function cpp.createRuleTable(prj)
 		local rules = {}
@@ -690,7 +698,7 @@
 		_p('\t$(SILENT) rm -rf $(OBJDIR)')
 		_p('else')
 		_p('\t$(SILENT) if exist $(subst /,\\\\,$(TARGET)) del $(subst /,\\\\,$(TARGET))')
-		_p('\t$(SILENT) if exist $(subst /,\\\\,$(GENERATED)) del /s /q $(subst /,\\\\,$(GENERATED))')
+		_p('\t$(SILENT) $(foreach f,$(subst /,\\\\,$(GENERATED)),if exist $(f) del /s /q $(f) >nul &)')
 		_p('\t$(SILENT) if exist $(subst /,\\\\,$(OBJDIR)) rmdir /s /q $(subst /,\\\\,$(OBJDIR))')
 		_p('endif')
 		_p('')

modules/gmake/tests/test_gmake_file_rules.lua

@@ -81,6 +81,46 @@
 	end
 
 
+--
+-- Object filenames use correct extension based on toolset
+--
+
+	function suite.objectNameExtensions_onDefault()
+		files { "src/hello.cpp", "src/test.c" }
+		prepare()
+		test.capture [[
+# File Rules
+# #############################################
+
+$(OBJDIR)/hello.o: src/hello.cpp
+	@echo "$(notdir $<)"
+	$(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -MF "$(@:%.o=%.d)" -c "$<"
+$(OBJDIR)/test.o: src/test.c
+	@echo "$(notdir $<)"
+	$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF "$(@:%.o=%.d)" -c "$<"
+
+]]
+	end
+
+	function suite.objectNameExtensions_onMSC()
+		toolset "msc"
+		files { "src/hello.cpp", "src/test.c" }
+		prepare()
+		test.capture [[
+# File Rules
+# #############################################
+
+$(OBJDIR)/hello.obj: src/hello.cpp
+	@echo "$(notdir $<)"
+	$(SILENT) $(CXX) $(ALL_CXXFLAGS) $(FORCE_INCLUDE) -o "$@" -MF "$(@:%.o=%.d)" -c "$<"
+$(OBJDIR)/test.obj: src/test.c
+	@echo "$(notdir $<)"
+	$(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF "$(@:%.o=%.d)" -c "$<"
+
+]]
+	end
+
+
 --
 -- Two files with the same base name should have different object files.
 --

modules/gmake/tests/test_gmake_tools.lua

@@ -59,3 +59,19 @@ endif
 RESCOMP = windres
 		]]
 	end
+
+	function suite.usesCorrectTools_msc()
+		gmake.cpp.tools(cfg, p.tools.msc)
+		test.capture [[
+ifeq ($(origin CC), default)
+  CC = cl
+endif
+ifeq ($(origin CXX), default)
+  CXX = cl
+endif
+ifeq ($(origin AR), default)
+  AR = lib
+endif
+RESCOMP = rc
+		]]
+	end

src/base/_foundation.lua

@@ -41,6 +41,7 @@
 	premake.MACOSX      = "macosx"
 	premake.MAKEFILE    = "Makefile"
 	premake.MBCS        = "MBCS"
+	premake.MSC         = "msc"
 	premake.NONE        = "None"
 	premake.DEFAULT     = "Default"
 	premake.OBJECTIVEC   = "Objective-C"

src/tools/clang.lua

@@ -364,3 +364,7 @@
 		end
 		return value
 	end
+
+	function clang.gettooloutputext(tool)
+		return gcc.gettooloutputext(tool)
+	end

src/tools/gcc.lua

@@ -724,3 +724,7 @@
 		end
 		return (cfg.gccprefix or "") .. gcc.tools[tool] .. version
 	end
+
+	function gcc.gettooloutputext(tool)
+		return iif(tool == "rc", ".res", ".o")
+	end

src/tools/msc.lua

@@ -308,15 +308,15 @@
 		local result = {}
 		for _, dir in ipairs(dirs) do
 			dir = p.tools.getrelative(cfg.project, dir)
-			table.insert(result, '-I' ..  p.quoted(dir))
+			table.insert(result, '/I' ..  p.quoted(dir))
 		end
 
 		for _, dir in ipairs(extdirs or {}) do
 			dir = p.tools.getrelative(cfg.project, dir)
 			if isVersionGreaterOrEqualTo(cfg.toolset, "msc-v142") then
 				table.insert(result, '/external:I' ..  p.quoted(dir))
 			else
-				table.insert(result, '-I' ..  p.quoted(dir))
+				table.insert(result, '/I' ..  p.quoted(dir))
 			end
 		end
 
@@ -325,7 +325,7 @@
 			if isVersionGreaterOrEqualTo(cfg.toolset, "msc-v142") then
 				table.insert(result, '/external:I' ..  p.quoted(dir))
 			else
-				table.insert(result, '-I' ..  p.quoted(dir))
+				table.insert(result, '/I' ..  p.quoted(dir))
 			end
 		end
 
@@ -467,6 +467,13 @@
 	end
 
 
+	msc.tools = {
+		cc = "cl",
+		cxx = "cl",
+		ar = "lib",
+		rc = "rc"
+	}
+
 --
 -- Retrieves the executable command name for a tool, based on the
 -- provided configuration and the operating environment.
@@ -481,18 +488,17 @@
 --    default value should be used.
 --
 
-	msc.tools = {
-		cc = "cl",
-		cxx = "cl",
-		ar = "lib",
-		rc = "rc",
-	}
-
 	function msc.gettoolname(cfg, tool)
+		local toolset, version = p.tools.canonical(cfg.toolset or p.MSC)
+		-- TODO: Support versioning?
 		return msc.tools[tool]
 	end
 
 
+	function msc.gettooloutputext(tool)
+		return iif(tool == "rc", ".res", ".obj")
+	end
+
 
 	function msc.getwarnings(cfg)
 		local result = {}