fix: enforce correct order of arguments to compiler and linker

Author: luau-project

.github/workflows/CI.yaml

@@ -29,7 +29,7 @@ jobs:
             arch: x86
             os: windows-latest
 
-          - lua-version: 5.4.7
+          - lua-version: 5.4.8
             arch: x86
             os: windows-latest
 
@@ -45,7 +45,7 @@ jobs:
             arch: x64
             os: windows-latest
 
-          - lua-version: 5.4.7
+          - lua-version: 5.4.8
             arch: x64
             os: windows-latest
 
@@ -61,7 +61,7 @@ jobs:
             arch: arm64
             os: windows-11-arm
 
-          - lua-version: 5.4.7
+          - lua-version: 5.4.8
             arch: arm64
             os: windows-11-arm
 
@@ -79,7 +79,7 @@ jobs:
           - 5.1.5
           - 5.2.4
           - 5.3.6
-          - 5.4.7
+          - 5.4.8
         gtk-major-version:
           - 3
           - 4

.github/workflows/lfs.yaml

@@ -14,7 +14,7 @@ on:
         type: string
 
 env:
-  LUAROCKS_VERSION: 3.11.1
+  LUAROCKS_VERSION: 3.12.2
 
 jobs:
   build:

LuaInstaller.Console/Program.cs

@@ -135,12 +135,12 @@ source code matching the architecture (x86, x64 or ARM64)
 
     LuaInstaller.Console.exe install
 
-2) Installs Lua 5.4.7 in the current directory,
+2) Installs Lua 5.4.8 in the current directory,
 using the latest versions of Visual Studio and
 Windows SDK, building the source code for x64
 platforms:
 
-    LuaInstaller.Console.exe install version=5.4.7 arch=x64
+    LuaInstaller.Console.exe install version=5.4.8 arch=x64
 
 3) Installs Lua 5.1.5 in the folder
 'C:\Program Files (x86)\Lua',

LuaInstaller.Core/CompilerOption.cs

@@ -1,11 +1,25 @@
-namespace LuaInstaller.Core
+using System;
+
+namespace LuaInstaller.Core
 {
     /// <summary>
     /// Represents an option for a
     /// given compiler.
     /// </summary>
-    public abstract class CompilerOption
+    public abstract class CompilerOption : IComparable<CompilerOption>
     {
+        public const int SortOrderCFLAGS = 0;
+        public const int SortOrderPREPROCESSORMACRO = 1;
+        public const int SortOrderINCLUDEDIR = 2;
+        public const int SortOrderSOURCEFILE = 3;
+
+        public abstract int CommandLineSortOrder { get; }
+
+        public int CompareTo(CompilerOption other)
+        {
+            return ((other == null) ? 1 : (CommandLineSortOrder - other.CommandLineSortOrder));
+        }
+
         public override abstract string ToString();
     }
 }

LuaInstaller.Core/ILinker.cs

@@ -6,6 +6,7 @@ public interface ILinker
         string BuildDirectory { get; set; }
         void AddLibPath(string path);
         void AddInputFile(string path);
+        void AddLibInputFile(string path);
         void AddLinkerOption(LinkerOption option);
 
         int Execute();

LuaInstaller.Core/InstallationManager.cs

@@ -194,7 +194,7 @@ private void BuildDll(string executionDir, string srcDir, string outputFile, Vis
                 }
 
                 DirectoryInfo srcDirInfo = new DirectoryInfo(srcDir);
-                foreach (string srcFile in srcDirInfo.EnumerateFiles("*.c").Where(f => f.Name != "luac.c" && f.Name != "lua.c").Select(f => f.FullName))
+                foreach (string srcFile in srcDirInfo.EnumerateFiles("l*.c").Where(f => f.Name != "luac.c" && f.Name != "lua.c").Select(f => f.FullName))
                 {
                     _compiler.AddSourceFile(srcFile);
                 }

LuaInstaller.Core/LinkerOption.cs

@@ -1,11 +1,27 @@
-namespace LuaInstaller.Core
+using System;
+
+namespace LuaInstaller.Core
 {
     /// <summary>
     /// Represents an option for a
     /// given linker.
     /// </summary>
-    public abstract class LinkerOption
+    public abstract class LinkerOption : IComparable<LinkerOption>
     {
+        public const int SortOrderLDFLAGS = 0;
+        public const int SortOrderLIBDIR = 1;
+        public const int SortOrderOUTPUTFILE = 2;
+        public const int SortOrderOBJECTFILE = 3;
+        public const int SortOrderLIBFILE = 4;
+        public const int SortOrderDEPENDENTLIB = 5;
+
+        public abstract int CommandLineSortOrder { get; }
+
+        public int CompareTo(LinkerOption other)
+        {
+            return ((other == null) ? 1 : (CommandLineSortOrder - other.CommandLineSortOrder));
+        }
+
         public override abstract string ToString();
     }
 }

LuaInstaller.Core/LuaInstaller.Core.csproj

@@ -22,7 +22,7 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Microsoft.VisualStudio.Setup.Configuration.Interop" Version="3.11.2177" />
+		<PackageReference Include="Microsoft.VisualStudio.Setup.Configuration.Interop" Version="3.14.2075" />
 		<PackageReference Include="Microsoft.Win32.Registry" Version="5.0.0" />
 		<PackageReference Include="SharpZipLib" Version="1.4.2" />
 	</ItemGroup>

LuaInstaller.Core/VisualStudioCompileOnlyCompilerOption.cs

@@ -5,6 +5,7 @@
     /// </summary>
     public sealed class VisualStudioCompileOnlyCompilerOption : CompilerOption
     {
+        public override int CommandLineSortOrder { get { return CompilerOption.SortOrderCFLAGS; } }
         public override string ToString()
         {
             return "/c";

LuaInstaller.Core/VisualStudioCompiler.cs

@@ -2,15 +2,15 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
+using System.Text;
 
 namespace LuaInstaller.Core
 {
     public sealed class VisualStudioCompiler : ICompiler
     {
         private string _buildDirectory;
         private readonly string _path;
-        private readonly ICollection<CompilerOption> _options;
-        private readonly ICollection<CompilerOption> _sourceFiles;
+        private readonly IDictionary<int, Queue<CompilerOption>> _options;
 
         public VisualStudioCompiler(string path)
         {
@@ -20,8 +20,7 @@ public VisualStudioCompiler(string path)
             }
 
             _path = path;
-            _options = new List<CompilerOption>();
-            _sourceFiles = new List<CompilerOption>();
+            _options = new Dictionary<int, Queue<CompilerOption>>();
         }
 
         public string BuildDirectory
@@ -78,15 +77,13 @@ public void AddCompilerOption(CompilerOption option)
             {
                 throw new ArgumentNullException();
             }
-
-            if (option is VisualStudioSourceFileCompilerOption)
-            {
-                _sourceFiles.Add(option);
-            }
-            else
+            Queue<CompilerOption> queue;
+            if (!_options.TryGetValue(option.CommandLineSortOrder, out queue))
             {
-                _options.Add(option);
+                queue = new Queue<CompilerOption>();
+                _options.Add(option.CommandLineSortOrder, queue);
             }
+            queue.Enqueue(option);
         }
 
         private static string FormatCompilerOption(CompilerOption option)
@@ -98,11 +95,22 @@ public int Execute()
         {
             int result = 1;
 
-            string arguments = string.Format(
-                "{0} {1}",
-                string.Join(" ", _options.Select(FormatCompilerOption).ToArray()),
-                string.Join(" ", _sourceFiles.Select(FormatCompilerOption).ToArray())
-            );
+            int key;
+            ICollection<int> keys = _options.Keys;
+            int[] orderedKeys = new int[keys.Count];
+            keys.CopyTo(orderedKeys, 0);
+            Array.Sort<int>(orderedKeys);
+            StringBuilder argumentsBuilder = new StringBuilder(Math.Max(2 * orderedKeys.Length - 1, 4));
+            for (int i = 0; i < orderedKeys.Length; i++)
+            {
+                key = orderedKeys[i];
+                argumentsBuilder.Append(string.Join(" ", _options[key].Select(FormatCompilerOption)));
+                if (i < orderedKeys.Length - 1)
+                {
+                    argumentsBuilder.Append(" ");
+                }
+            }
+            string arguments = argumentsBuilder.ToString();
 
             ProcessStartInfo compilePsi = new ProcessStartInfo();
             compilePsi.UseShellExecute = false;
@@ -127,7 +135,6 @@ public void Reset()
         {
             _buildDirectory = null;
             _options.Clear();
-            _sourceFiles.Clear();
         }
     }
 }