From a830430149b8df6ba55b4af7225d75669b749120 Mon Sep 17 00:00:00 2001
From: Joel Verhagen <joel.verhagen@gmail.com>
Date: Sat, 20 Jan 2024 16:37:22 -0500
Subject: [PATCH] Clean up build

---
 .github/workflows/ci.yml               | 30 +++++++++++++++-----------
 Directory.Build.props                  | 21 ++++++++++++++----
 src/FactorioTools/FactorioTools.csproj | 10 ++++-----
 src/lua/Invoke-LuaBuild.ps1            |  2 +-
 4 files changed, 41 insertions(+), 22 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 68d301fe..1a5e0075 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -68,20 +68,26 @@ jobs:
       - name: Restore dependencies
         run: dotnet restore
 
-      - name: Build debug, no shared instances
-        run: dotnet build --configuration Debug /p:UseSharedInstances=false
-
       - name: Build debug, no hash sets
         run: dotnet build --configuration Debug /p:UseHashSets=false
 
+      - name: Build debug, no bit array
+        run: dotnet build --configuration Debug /p:UseBitArray=false
+
+      - name: Build debug, location as class
+        run: dotnet build --configuration Debug /p:LocationAsStruct=false
+
+      - name: Build debug, no shared instances
+        run: dotnet build --configuration Debug /p:UseSharedInstances=false
+
       - name: Build debug, no vectors
         run: dotnet build --configuration Debug /p:UseVectors=false
 
       - name: Build debug, no stackalloc
         run: dotnet build --configuration Debug /p:UseStackalloc=false
 
-      - name: Build debug, no bit array
-        run: dotnet build --configuration Debug /p:UseBitArray=false
+      - name: Build debug, rent neighbors
+        run: dotnet build --configuration Debug /p:RentNeighbors=true
 
       - name: Build debug, allow dynamic FLUTE degree
         run: dotnet build --configuration Debug /p:AllowDynamicFluteDegree=true
@@ -89,19 +95,19 @@ jobs:
       - name: Build debug, no grid ToString
         run: dotnet build --configuration Debug /p:EnableGridToString=false
 
-      - name: Build debug, no defines at all
-        run: dotnet build --configuration Debug /p:UseDefines=false
+      - name: Build debug, with Lua settings
+        run: dotnet build --configuration Debug /p:UseLuaSettings=true
 
-      - name: Build release without defines
-        run: dotnet build --configuration Release /p:UseDefines=false
+      - name: Build debug, with Lua settings
+        run: dotnet build --configuration Release /p:UseLuaSettings=true
 
-      - name: Test without defines
+      - name: Test with Lua settings
         run: dotnet test --no-build --configuration Release --logger "console;verbosity=normal"
 
-      - name: Build release with defines
+      - name: Build release with default settings
         run: dotnet build --configuration Release
 
-      - name: Test with defines
+      - name: Test with default settings
         run: dotnet test --no-build --configuration Release --logger "console;verbosity=normal"
 
       - name: Publish
diff --git a/Directory.Build.props b/Directory.Build.props
index 5068e67a..add2a632 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,21 +1,34 @@
 <Project>
 
   <PropertyGroup>
-    <UseDefines Condition="'$(UseDefines)' == ''">true</UseDefines>
+    <UseLuaSettings Condition="'$(UseLuaSettings)' == ''">false</UseLuaSettings>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(UseLuaSettings)' == 'true'">
+    <UseHashSets>false</UseHashSets>
+    <UseBitArray>false</UseBitArray>
+    <LocationAsStruct>false</LocationAsStruct>
+    <UseSharedInstances>false</UseSharedInstances>
+    <UseVectors>false</UseVectors>
+    <UseStackalloc>false</UseStackalloc>
+    <RentNeighbors>true</RentNeighbors>
+    <EnableVisualizer>false</EnableVisualizer>
+    <EnableGridToString>true</EnableGridToString>
+    <AllowDynamicFluteDegree>false</AllowDynamicFluteDegree>
   </PropertyGroup>
   
   <PropertyGroup>
-    <UseHashSets Condition="'$(UseHashSets)' == ''">$(UseDefines)</UseHashSets>
+    <UseHashSets Condition="'$(UseHashSets)' == ''">true</UseHashSets>
     <DefineConstants Condition="$(UseHashSets) == 'true'">$(DefineConstants);USE_HASHSETS</DefineConstants>
   </PropertyGroup>
 
   <PropertyGroup>
-    <UseBitArray Condition="'$(UseBitArray)' == ''">$(UseDefines)</UseBitArray>
+    <UseBitArray Condition="'$(UseBitArray)' == ''">true</UseBitArray>
     <DefineConstants Condition="$(UseBitArray) == 'true'">$(DefineConstants);USE_BITARRAY</DefineConstants>
   </PropertyGroup>
 
   <PropertyGroup>
-    <LocationAsStruct Condition="'$(LocationAsStruct)' == ''">$(UseDefines)</LocationAsStruct>
+    <LocationAsStruct Condition="'$(LocationAsStruct)' == ''">true</LocationAsStruct>
     <DefineConstants Condition="$(LocationAsStruct) == 'true'">$(DefineConstants);LOCATION_AS_STRUCT</DefineConstants>
   </PropertyGroup>
   
diff --git a/src/FactorioTools/FactorioTools.csproj b/src/FactorioTools/FactorioTools.csproj
index 9834545b..72473c93 100644
--- a/src/FactorioTools/FactorioTools.csproj
+++ b/src/FactorioTools/FactorioTools.csproj
@@ -9,27 +9,27 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <UseSharedInstances Condition="'$(UseSharedInstances)' == ''">$(UseDefines)</UseSharedInstances>
+    <UseSharedInstances Condition="'$(UseSharedInstances)' == ''">true</UseSharedInstances>
     <DefineConstants Condition="$(UseSharedInstances) == 'true'">$(DefineConstants);USE_SHARED_INSTANCES</DefineConstants>
   </PropertyGroup>
 
   <PropertyGroup>
-    <UseVectors Condition="'$(UseVectors)' == ''">$(UseDefines)</UseVectors>
+    <UseVectors Condition="'$(UseVectors)' == ''">true</UseVectors>
     <DefineConstants Condition="$(UseVectors) == 'true'">$(DefineConstants);USE_VECTORS</DefineConstants>
   </PropertyGroup>
 
   <PropertyGroup>
-    <UseStackalloc Condition="'$(UseStackalloc)' == ''">$(UseDefines)</UseStackalloc>
+    <UseStackalloc Condition="'$(UseStackalloc)' == ''">true</UseStackalloc>
     <DefineConstants Condition="$(UseStackalloc) == 'true'">$(DefineConstants);USE_STACKALLOC</DefineConstants>
   </PropertyGroup>
 
   <PropertyGroup>
-    <RentNeighbors Condition="'$(RentNeighbors)' == ''">true</RentNeighbors>
+    <RentNeighbors Condition="'$(RentNeighbors)' == ''">false</RentNeighbors>
     <DefineConstants Condition="$(RentNeighbors) == 'true'">$(DefineConstants);RENT_NEIGHBORS</DefineConstants>
   </PropertyGroup>
 
   <PropertyGroup>
-    <EnableVisualizer Condition="'$(EnableVisualizer)' == '' and '$(Configuration)' == 'Debug'">$(UseDefines)</EnableVisualizer>
+    <EnableVisualizer Condition="'$(EnableVisualizer)' == '' and '$(Configuration)' == 'Debug'">true</EnableVisualizer>
     <EnableVisualizer Condition="'$(EnableVisualizer)' == '' and '$(Configuration)' != 'Debug'">false</EnableVisualizer>
     <DefineConstants Condition="$(EnableVisualizer) == 'true'">$(DefineConstants);ENABLE_VISUALIZER</DefineConstants>
   </PropertyGroup>
diff --git a/src/lua/Invoke-LuaBuild.ps1 b/src/lua/Invoke-LuaBuild.ps1
index 1441b554..5d964e05 100644
--- a/src/lua/Invoke-LuaBuild.ps1
+++ b/src/lua/Invoke-LuaBuild.ps1
@@ -75,7 +75,7 @@ function Publish-CompiledLua($projectDir, $referenceNames, $filesFirst) {
     $libArg = if ($references) { @("-l"; $references -join ";") } else { @() }
     $sourceList = ($files | ForEach-Object { $_.FullName } | Sort-Object) -join ";"
     
-    dotnet run --no-build --configuration Release --project $compilerDir -- -c -p -csc "-define:ENABLE_GRID_TOSTRING -define:RENT_NEIGHBORS" @libArg -s $sourceList -d $outputDir
+    dotnet run --no-build --configuration Release --project $compilerDir -- -c -p -csc "-define:RENT_NEIGHBORS -define:ENABLE_GRID_TOSTRING" @libArg -s $sourceList -d $outputDir
     if ($LASTEXITCODE -ne 0) {
         throw "The CSharp.lua compiler failed with exit code $LASTEXITCODE."
     }