From 31d4662ab67bb866ec83254a0470fe5b24ab1a0f Mon Sep 17 00:00:00 2001
From: YoshiRulz <OSSYoshiRulz@gmail.com>
Date: Mon, 4 May 2020 07:07:49 +1000
Subject: [PATCH] Change executables' build paths and names

---
 Build/copy_assets_and_emuhawk_to_output.bat           | 11 -----------
 Build/copy_assets_and_emuhawk_to_output.sh            |  6 ------
 Build/copy_discohawk_to_output.bat                    |  9 ---------
 Build/copy_discohawk_to_output.sh                     |  5 -----
 Build/postbuild_emuhawk.bat                           |  3 +++
 Build/postbuild_emuhawk.sh                            |  3 +++
 .../BizHawk.Client.DiscoHawk.csproj                   |  8 +++-----
 .../BizHawk.Client.EmuHawk.csproj                     |  8 +++++---
 8 files changed, 14 insertions(+), 39 deletions(-)
 delete mode 100644 Build/copy_assets_and_emuhawk_to_output.bat
 delete mode 100755 Build/copy_assets_and_emuhawk_to_output.sh
 delete mode 100644 Build/copy_discohawk_to_output.bat
 delete mode 100755 Build/copy_discohawk_to_output.sh
 create mode 100755 Build/postbuild_emuhawk.bat
 create mode 100755 Build/postbuild_emuhawk.sh
 mode change 100644 => 100755 src/BizHawk.Client.DiscoHawk/BizHawk.Client.DiscoHawk.csproj
 mode change 100644 => 100755 src/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj

diff --git a/Build/copy_assets_and_emuhawk_to_output.bat b/Build/copy_assets_and_emuhawk_to_output.bat
deleted file mode 100644
index 02d4f2779a..0000000000
--- a/Build/copy_assets_and_emuhawk_to_output.bat
+++ /dev/null
@@ -1,11 +0,0 @@
-CHDIR "%~dp0\.."
-
-ROBOCOPY /E Assets output
-
-FOR /D %%D IN (src\BizHawk.Client.EmuHawk\bin\*) DO (
-	ROBOCOPY %%D output
-	RENAME output\BizHawk.Client.EmuHawk.exe EmuHawk.exe
-	RENAME output\BizHawk.Client.EmuHawk.exe.config EmuHawk.exe.config
-	goto end
-)
-:end
diff --git a/Build/copy_assets_and_emuhawk_to_output.sh b/Build/copy_assets_and_emuhawk_to_output.sh
deleted file mode 100755
index 15915f9163..0000000000
--- a/Build/copy_assets_and_emuhawk_to_output.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-cd "$(dirname "$0")/.."
-cp -f -r Assets/* output || printf ""
-cd src/BizHawk.Client.EmuHawk/bin && for d in *; do
-	cp -f $d/* ../../../output && cd ../../../output && mv BizHawk.Client.EmuHawk.exe EmuHawk.exe && mv BizHawk.Client.EmuHawk.exe.config EmuHawk.exe.config && exit 0
-done
diff --git a/Build/copy_discohawk_to_output.bat b/Build/copy_discohawk_to_output.bat
deleted file mode 100644
index dec5f2981a..0000000000
--- a/Build/copy_discohawk_to_output.bat
+++ /dev/null
@@ -1,9 +0,0 @@
-CHDIR "%~dp0\.."
-
-FOR /D %%D IN (src\BizHawk.Client.DiscoHawk\bin\*) DO (
-	ROBOCOPY %%D output
-	RENAME output\BizHawk.Client.DiscoHawk.exe DiscoHawk.exe
-	RENAME output\BizHawk.Client.DiscoHawk.exe.config DiscoHawk.exe.config
-	goto end
-)
-:end
diff --git a/Build/copy_discohawk_to_output.sh b/Build/copy_discohawk_to_output.sh
deleted file mode 100755
index 00512028e9..0000000000
--- a/Build/copy_discohawk_to_output.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-cd "$(dirname "$0")/.."
-cd src/BizHawk.Client.DiscoHawk/bin && for d in *; do
-	cp -f $d/* ../../../output && cd ../../../output && mv BizHawk.Client.DiscoHawk.exe DiscoHawk.exe && mv BizHawk.Client.DiscoHawk.exe.config DiscoHawk.exe.config && exit 0
-done
diff --git a/Build/postbuild_emuhawk.bat b/Build/postbuild_emuhawk.bat
new file mode 100755
index 0000000000..1273275739
--- /dev/null
+++ b/Build/postbuild_emuhawk.bat
@@ -0,0 +1,3 @@
+@CHDIR "%~dp0\.."
+@ROBOCOPY /E Assets output
+@EXIT 0
diff --git a/Build/postbuild_emuhawk.sh b/Build/postbuild_emuhawk.sh
new file mode 100755
index 0000000000..47db6a60a6
--- /dev/null
+++ b/Build/postbuild_emuhawk.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+cd "$(dirname "$0")/.."
+cp -f -r Assets/* output || printf ""
diff --git a/src/BizHawk.Client.DiscoHawk/BizHawk.Client.DiscoHawk.csproj b/src/BizHawk.Client.DiscoHawk/BizHawk.Client.DiscoHawk.csproj
old mode 100644
new mode 100755
index 2296c2fedc..f57cd5467c
--- a/src/BizHawk.Client.DiscoHawk/BizHawk.Client.DiscoHawk.csproj
+++ b/src/BizHawk.Client.DiscoHawk/BizHawk.Client.DiscoHawk.csproj
@@ -1,11 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<Import Project="../MainSlnCommon.props" />
 	<PropertyGroup>
+		<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
 		<ApplicationIcon>discohawk.ico</ApplicationIcon>
 		<DefineConstants>$(DefineConstants);WINDOWS</DefineConstants>
-		<OutputPath>$(ProjectDir)bin</OutputPath>
+		<OutputPath>$(ProjectDir)../../output</OutputPath>
 		<OutputType>Exe</OutputType>
 		<TargetFramework>net48</TargetFramework>
+		<TargetName>DiscoHawk</TargetName>
 	</PropertyGroup>
 <!--
 	<PropertyGroup>
@@ -82,8 +84,4 @@
 		<EmbeddedResource Update="MainDiscoForm.resx" DependentUpon="MainDiscoForm.cs" SubType="Designer" />
 -->
 	</ItemGroup>
-	<Target Name="PostBuild" AfterTargets="PostBuildEvent">
-		<Exec Command='"$(ProjectDir)..\..\Build\copy_discohawk_to_output.bat"' Condition=" '$(OS)' == 'Windows_NT' " />
-		<Exec Command='"$(ProjectDir)../../Build/copy_discohawk_to_output.sh"' Condition=" '$(OS)' != 'Windows_NT' " />
-	</Target>
 </Project>
diff --git a/src/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj b/src/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
old mode 100644
new mode 100755
index b5f8bfb18b..af59ccdf6d
--- a/src/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
+++ b/src/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
@@ -2,12 +2,14 @@
 	<Import Project="../MainSlnCommon.props" />
 	<PropertyGroup>
 		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+		<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
 		<ApplicationIcon>images/logo.ico</ApplicationIcon>
 		<ApplicationManifest>app.manifest</ApplicationManifest>
 		<DefineConstants>$(DefineConstants);EXE_PROJECT</DefineConstants>
-		<OutputPath>$(ProjectDir)bin</OutputPath>
+		<OutputPath>$(ProjectDir)../../output</OutputPath>
 		<OutputType>WinExe</OutputType>
 		<TargetFramework>net48</TargetFramework>
+		<TargetName>EmuHawk</TargetName>
 	</PropertyGroup>
 <!--
 	<PropertyGroup>
@@ -638,7 +640,7 @@
 		<Compile Update="UpdateChecker.cs" SubType="Code" />
 	</ItemGroup>
 	<Target Name="PostBuild" AfterTargets="PostBuildEvent">
-		<Exec Command='"$(ProjectDir)..\..\Build\copy_assets_and_emuhawk_to_output.bat"' Condition=" '$(OS)' == 'Windows_NT' " />
-		<Exec Command='"$(ProjectDir)../../Build/copy_assets_and_emuhawk_to_output.sh"' Condition=" '$(OS)' != 'Windows_NT' " />
+		<Exec Command='"$(ProjectDir)..\..\Build\postbuild_emuhawk.bat"' Condition=" '$(OS)' == 'Windows_NT' " />
+		<Exec Command='"$(ProjectDir)../../Build/postbuild_emuhawk.sh"' Condition=" '$(OS)' != 'Windows_NT' " />
 	</Target>
 </Project>