From e0c09a553b7465a259b97decb1474d5adea5c0fc Mon Sep 17 00:00:00 2001 From: zeromus Date: Tue, 9 Dec 2014 19:20:22 +0000 Subject: [PATCH] redo how subwcrev stuff is done, so that the subwcrev process doesnt have to run for every project. improves build times. --- .../BizHawk.Client.Common.csproj | 10 ++-- .../Properties/AssemblyInfo.cs | 1 - .../Properties/AssemblyInfo.cs | 1 - .../BizHawk.Client.DiscoHawk.csproj | 9 +++- .../Properties/AssemblyInfo.cs | 1 - .../Properties/svnrev_template | 4 -- .../BizHawk.Client.EmuHawk.csproj | 18 +++----- .../Properties/AssemblyInfo.cs | 1 - .../Properties/svnrev_template | 4 -- BizHawk.Common/BizHawk.Common.csproj | 9 ++-- BizHawk.Common/Properties/AssemblyInfo.cs | 1 - BizHawk.Common/Properties/svnrev_template | 4 -- .../BizHawk.Emulation.Common.csproj | 9 ++-- .../Properties/AssemblyInfo.cs | 1 - .../Properties/svnrev_template | 4 -- .../BizHawk.Emulation.Cores.csproj | 17 ++++--- .../Properties/AssemblyInfo.cs | 1 - .../Properties/svnrev_template | 4 -- .../BizHawk.Emulation.DiscSystem.csproj | 9 ++-- .../Properties/AssemblyInfo.cs | 1 - .../Properties/svnrev_template | 4 -- BizHawk.sln | 35 ++++++++++++++ SubWCRev.bat => Version/SubWCRev.bat | 6 +-- SubWCRev.exe => Version/SubWCRev.exe | Bin VersionInfo.cs => Version/VersionInfo.cs | 0 intl3_tsvn32.dll => Version/intl3_tsvn32.dll | Bin .../libapr_tsvn32.dll | Bin .../libaprutil_tsvn32.dll | Bin libsasl32.dll => Version/libsasl32.dll | Bin .../libsvn_tsvn32.dll | Bin sed.exe => Version/sed.exe | Bin .../Properties => Version}/svnrev_template | 0 Version/version.csproj | 43 ++++++++++++++++++ 33 files changed, 130 insertions(+), 67 deletions(-) delete mode 100644 BizHawk.Client.DiscoHawk/Properties/svnrev_template delete mode 100644 BizHawk.Client.EmuHawk/Properties/svnrev_template delete mode 100644 BizHawk.Common/Properties/svnrev_template delete mode 100644 BizHawk.Emulation.Common/Properties/svnrev_template delete mode 100644 BizHawk.Emulation.Cores/Properties/svnrev_template delete mode 100644 BizHawk.Emulation.DiscSystem/Properties/svnrev_template rename SubWCRev.bat => Version/SubWCRev.bat (81%) rename SubWCRev.exe => Version/SubWCRev.exe (100%) rename VersionInfo.cs => Version/VersionInfo.cs (100%) rename intl3_tsvn32.dll => Version/intl3_tsvn32.dll (100%) rename libapr_tsvn32.dll => Version/libapr_tsvn32.dll (100%) rename libaprutil_tsvn32.dll => Version/libaprutil_tsvn32.dll (100%) rename libsasl32.dll => Version/libsasl32.dll (100%) rename libsvn_tsvn32.dll => Version/libsvn_tsvn32.dll (100%) rename sed.exe => Version/sed.exe (100%) rename {BizHawk.Client.Common/Properties => Version}/svnrev_template (100%) create mode 100644 Version/version.csproj diff --git a/BizHawk.Client.Common/BizHawk.Client.Common.csproj b/BizHawk.Client.Common/BizHawk.Client.Common.csproj index 5739526043..ed9008771c 100644 --- a/BizHawk.Client.Common/BizHawk.Client.Common.csproj +++ b/BizHawk.Client.Common/BizHawk.Client.Common.csproj @@ -60,7 +60,10 @@ - + + svnrev.cs + + VersionInfo.cs @@ -182,7 +185,6 @@ - @@ -228,10 +230,10 @@ BizHawk.Bizware.BizwareGL - - "$(SolutionDir)subwcrev.bat" "$(ProjectDir)" + + - + + svnrev.cs + + VersionInfo.cs @@ -104,7 +107,6 @@ ProgressDialog.cs - @@ -166,4 +168,7 @@ "$(SolutionDir)subwcrev.bat" "$(ProjectDir)" "$(SolutionDir)subwcrev.sh" "$(ProjectDir)" + + + \ No newline at end of file diff --git a/BizHawk.Client.DiscoHawk/Properties/AssemblyInfo.cs b/BizHawk.Client.DiscoHawk/Properties/AssemblyInfo.cs index a8d6a29df3..d5b3433be2 100644 --- a/BizHawk.Client.DiscoHawk/Properties/AssemblyInfo.cs +++ b/BizHawk.Client.DiscoHawk/Properties/AssemblyInfo.cs @@ -10,7 +10,6 @@ using System.Runtime.InteropServices; [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("BizHawk")] [assembly: AssemblyProduct("BizHawk.Client.DiscoHawk")] -[assembly: AssemblyCopyright("Copyright © 2013")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/BizHawk.Client.DiscoHawk/Properties/svnrev_template b/BizHawk.Client.DiscoHawk/Properties/svnrev_template deleted file mode 100644 index 31c5a95c9c..0000000000 --- a/BizHawk.Client.DiscoHawk/Properties/svnrev_template +++ /dev/null @@ -1,4 +0,0 @@ -static class SubWCRev -{ - public const string SVN_REV = "$WCREV$"; -} diff --git a/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj b/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj index cb28d204b5..1173f8f8c4 100644 --- a/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj +++ b/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj @@ -111,7 +111,10 @@ - + + svnrev.cs + + VersionInfo.cs @@ -1389,16 +1392,6 @@ WatchEditor.cs - - SettingsSingleFileGenerator - Settings.Designer.cs - - - True - Settings.settings - True - - Form @@ -1889,4 +1882,7 @@ "$(SolutionDir)subwcrev.bat" "$(ProjectDir)" "$(SolutionDir)subwcrev.sh" "$(ProjectDir)" + + + \ No newline at end of file diff --git a/BizHawk.Client.EmuHawk/Properties/AssemblyInfo.cs b/BizHawk.Client.EmuHawk/Properties/AssemblyInfo.cs index 2ada0c1b1e..29a2b0178f 100644 --- a/BizHawk.Client.EmuHawk/Properties/AssemblyInfo.cs +++ b/BizHawk.Client.EmuHawk/Properties/AssemblyInfo.cs @@ -10,7 +10,6 @@ using System.Runtime.InteropServices; [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("BizHawk")] [assembly: AssemblyProduct("BizHawk.Client.EmuHawk")] -[assembly: AssemblyCopyright("Copyright © 2013")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/BizHawk.Client.EmuHawk/Properties/svnrev_template b/BizHawk.Client.EmuHawk/Properties/svnrev_template deleted file mode 100644 index 31c5a95c9c..0000000000 --- a/BizHawk.Client.EmuHawk/Properties/svnrev_template +++ /dev/null @@ -1,4 +0,0 @@ -static class SubWCRev -{ - public const string SVN_REV = "$WCREV$"; -} diff --git a/BizHawk.Common/BizHawk.Common.csproj b/BizHawk.Common/BizHawk.Common.csproj index 782af816cd..58654dd1fa 100644 --- a/BizHawk.Common/BizHawk.Common.csproj +++ b/BizHawk.Common/BizHawk.Common.csproj @@ -44,7 +44,10 @@ - + + svnrev.cs + + VersionInfo.cs @@ -65,7 +68,6 @@ - @@ -77,7 +79,8 @@ - "$(SolutionDir)subwcrev.bat" "$(ProjectDir)" + + + \ No newline at end of file