From 166e45e9af4c0d40e17ac80a021197bb44a14751 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Matos?= <joao@tritao.eu>
Date: Thu, 5 Sep 2024 02:02:57 +0100
Subject: [PATCH] Simplify build output directory to not contain the
 architecture. (#1869)

---
 Directory.Build.props    | 2 +-
 build/Helpers.lua        | 2 +-
 build/build.sh           | 2 +-
 tests/emscripten/test.sh | 2 +-
 tests/napi/test.sh       | 2 +-
 tests/quickjs/test.sh    | 3 +--
 tests/ts/test.sh         | 2 +-
 7 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index 0dc6c392c..c3a4d2e58 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -23,7 +23,7 @@
     <GlobalTargetFramework>$(TargetFramework)</GlobalTargetFramework>
     <BaseIntermediateOutputPath>$(ObjDir)$(MSBuildProjectName)\</BaseIntermediateOutputPath>
     <BaseOutputPath>$(RootDir)bin\</BaseOutputPath>
-    <OutputPath>$(BaseOutputPath)$(Configuration)_$(PlatformTarget)\</OutputPath>
+    <OutputPath>$(BaseOutputPath)$(Configuration)\</OutputPath>
     <ActionDir>$(BuildDir)$(PremakeAction)\</ActionDir>
     <NativeProjectsDir>$(ActionDir)projects\</NativeProjectsDir>
     <PackageDir>$(RootDir)artifacts\package\</PackageDir>
diff --git a/build/Helpers.lua b/build/Helpers.lua
index 96a323547..468d383e4 100644
--- a/build/Helpers.lua
+++ b/build/Helpers.lua
@@ -59,7 +59,7 @@ bindir = path.join(rootdir, "bin")
 objsdir = path.join(builddir, "obj");
 gendir = path.join(builddir, "gen");
 actionbuilddir = path.join(builddir, _ACTION == "gmake2" and "gmake" or (_ACTION and _ACTION or ""));
-bindircfg = path.join(bindir, "%{cfg.buildcfg}_%{cfg.platform}");
+bindircfg = path.join(bindir, "%{cfg.buildcfg}");
 prjobjdir = path.join(objsdir, "%{prj.name}", "%{cfg.buildcfg}")
 
 msvc_buildflags = { "/MP", "/wd4267" }
diff --git a/build/build.sh b/build/build.sh
index 2255b02e7..d53f103eb 100755
--- a/build/build.sh
+++ b/build/build.sh
@@ -99,7 +99,7 @@ pack()
 
 test()
 {
-  dotnet test {"$bindir/${configuration}_$platform","$gendir"/*}/*.Tests*.dll --nologo
+  dotnet test {"$bindir/${configuration}","$gendir"/*}/*.Tests*.dll --nologo
 }
 
 clean()
diff --git a/tests/emscripten/test.sh b/tests/emscripten/test.sh
index 8058474b1..fd1e687ad 100755
--- a/tests/emscripten/test.sh
+++ b/tests/emscripten/test.sh
@@ -30,7 +30,7 @@ generate=true
 
 if [ $generate = true ]; then
     echo "${green}Generating bindings${reset}"
-    dotnet $rootdir/bin/${dotnet_configuration}_${platform}/CppSharp.CLI.dll \
+    dotnet $rootdir/bin/${dotnet_configuration}/CppSharp.CLI.dll \
         --gen=emscripten --platform=emscripten --arch=wasm32 \
         -I$dir/.. -I$rootdir/include -o $dir/gen -m tests $dir/../*.h
 fi
diff --git a/tests/napi/test.sh b/tests/napi/test.sh
index 66b8e7d11..2f85fa34b 100755
--- a/tests/napi/test.sh
+++ b/tests/napi/test.sh
@@ -16,7 +16,7 @@ else
 fi
 
 echo "${green}Generating bindings${reset}"
-dotnet $rootdir/bin/${configuration}_${platform}/CppSharp.CLI.dll \
+dotnet $rootdir/bin/${configuration}/CppSharp.CLI.dll \
  --gen=napi -I$dir/.. -o $dir/gen -m tests $dir/../*.h
 
 echo "${green}Building generated binding files${reset}"
diff --git a/tests/quickjs/test.sh b/tests/quickjs/test.sh
index 50c818cbf..2891d0c4e 100755
--- a/tests/quickjs/test.sh
+++ b/tests/quickjs/test.sh
@@ -4,7 +4,6 @@ dir=$(cd "$(dirname "$0")"; pwd)
 rootdir="$dir/../.."
 dotnet_configuration=Release
 configuration=debug
-platform=x64
 jsinterp="$dir/runtime/build/qjs"
 
 cd $dir
@@ -23,7 +22,7 @@ generate=true
 
 if [ $generate = true ]; then
     echo "${green}Generating bindings${reset}"
-    dotnet $rootdir/bin/${dotnet_configuration}_${platform}/CppSharp.CLI.dll \
+    dotnet $rootdir/bin/${dotnet_configuration}/CppSharp.CLI.dll \
     $dir/bindings.lua
 fi
 
diff --git a/tests/ts/test.sh b/tests/ts/test.sh
index bf3de8dea..c4d39ba6a 100755
--- a/tests/ts/test.sh
+++ b/tests/ts/test.sh
@@ -21,7 +21,7 @@ generate=true
 
 if [ $generate = true ]; then
     echo "${green}Generating bindings${reset}"
-    dotnet $rootdir/bin/${dotnet_configuration}_${platform}/CppSharp.CLI.dll \
+    dotnet $rootdir/bin/${dotnet_configuration}/CppSharp.CLI.dll \
         --gen=ts -I$dir/.. -I$rootdir/include -o $dir/gen -m tests $dir/../*.h
 fi