From 7dad65ff88f0560b4b2621d6ad805b0c57a8710c Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Mon, 3 Feb 2014 20:44:32 +0200 Subject: [PATCH] Use the built UpdateAssemblyDescription.exe instead of the pre-built one. --- .gitignore | 4 +++- UpdateAssemblyDescription.exe | Bin 7680 -> 0 bytes src/SubtitleEdit.csproj | 2 +- src/SubtitleEdit.sln | 9 +++++++++ update_rev.bat | 19 ++----------------- 5 files changed, 15 insertions(+), 19 deletions(-) delete mode 100644 UpdateAssemblyDescription.exe diff --git a/.gitignore b/.gitignore index ff6ca2c16..6313237be 100644 --- a/.gitignore +++ b/.gitignore @@ -1,9 +1,11 @@ /installer/SubtitleEdit-*-setup.exe +/src/*.suo /src/bin /src/obj -/src/*.suo /src/Properties/AssemblyInfo.cs /src/Test/bin /src/Test/obj +/src/UpdateAssemblyDescription/bin +/src/UpdateAssemblyDescription/obj /SE*.zip /SubtitleEdit-*-setup.exe diff --git a/UpdateAssemblyDescription.exe b/UpdateAssemblyDescription.exe deleted file mode 100644 index 242c9bb8053c3987d984128f93f21f1704be6b4e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7680 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 - "$(ProjectDir)..\UpdateAssemblyDescription.exe" "$(ProjectDir)Properties\AssemblyInfo.cs.template" "$(ProjectDir)Properties\AssemblyInfo.cs" + "$(ProjectDir)..\update_rev.bat" COPY /Y /V "$(ProjectDir)Dlls\Hunspellx86.dll" "$(TargetDir)" diff --git a/src/SubtitleEdit.sln b/src/SubtitleEdit.sln index 736fdb897..0002d9a3d 100644 --- a/src/SubtitleEdit.sln +++ b/src/SubtitleEdit.sln @@ -1,6 +1,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2012 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SubtitleEdit", "SubtitleEdit.csproj", "{511A5B59-1C35-4719-8536-23B19AF9B21A}" + ProjectSection(ProjectDependencies) = postProject + {DBD4656C-5F40-4067-A70B-C4460DE20F77} = {DBD4656C-5F40-4067-A70B-C4460DE20F77} + EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{766101A0-80D5-4560-BFF7-73F1559B4C47}" ProjectSection(SolutionItems) = preProject @@ -11,6 +14,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Test", "Test\Test.csproj", "{7BE5B8E8-9469-4C7C-89D7-E8C884DEFC0E}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UpdateAssemblyDescription", "UpdateAssemblyDescription\UpdateAssemblyDescription.csproj", "{DBD4656C-5F40-4067-A70B-C4460DE20F77}" +EndProject Global GlobalSection(TestCaseManagementSettings) = postSolution CategoryFile = SubtitleEdit.vsmdi @@ -28,6 +33,10 @@ Global {7BE5B8E8-9469-4C7C-89D7-E8C884DEFC0E}.Debug|Any CPU.Build.0 = Debug|Any CPU {7BE5B8E8-9469-4C7C-89D7-E8C884DEFC0E}.Release|Any CPU.ActiveCfg = Release|Any CPU {7BE5B8E8-9469-4C7C-89D7-E8C884DEFC0E}.Release|Any CPU.Build.0 = Release|Any CPU + {DBD4656C-5F40-4067-A70B-C4460DE20F77}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {DBD4656C-5F40-4067-A70B-C4460DE20F77}.Debug|Any CPU.Build.0 = Debug|Any CPU + {DBD4656C-5F40-4067-A70B-C4460DE20F77}.Release|Any CPU.ActiveCfg = Release|Any CPU + {DBD4656C-5F40-4067-A70B-C4460DE20F77}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/update_rev.bat b/update_rev.bat index 7b372b55e..23739d76e 100644 --- a/update_rev.bat +++ b/update_rev.bat @@ -3,11 +3,7 @@ SETLOCAL PUSHD %~dp0 -IF EXIST "SubWCRev.exe" SET "SUBWCREV=SubWCRev.exe" -FOR %%A IN (SubWCRev.exe) DO (SET SUBWCREV=%%~$PATH:A) -IF NOT DEFINED SUBWCREV GOTO SubNoSubWCRev - -"%SUBWCREV%" . "src\Properties\AssemblyInfo.cs.in" "src\Properties\AssemblyInfo.cs" -f +"src\UpdateAssemblyDescription\bin\Release\UpdateAssemblyDescription.exe" "src\Properties\AssemblyInfo.cs.template" "src\Properties\AssemblyInfo.cs" IF %ERRORLEVEL% NEQ 0 GOTO SubError @@ -16,17 +12,6 @@ POPD ENDLOCAL EXIT /B - -:SubNoSubWCRev -ECHO. & ECHO SubWCRev, which is part of TortoiseSVN, wasn't found! -ECHO You should (re)install TortoiseSVN. -GOTO SubCommon - :SubError ECHO Something went wrong when generating the revision number. - -:SubCommon -ECHO I'll use VERSION_REV=0 for now. - -TYPE "src\Properties\AssemblyInfo.cs.template" > "src\Properties\AssemblyInfo.cs" -GOTO END +EXIT /B