From ebf96c4e30fd06b893afcbadea401b76fb34ab20 Mon Sep 17 00:00:00 2001 From: Yermalayeu Ihar Date: Thu, 4 Jan 2018 09:09:55 +0300 Subject: [PATCH] *updated AntiDupl.NET.csproj. --- src/AntiDupl/AntiDupl.NET/AntiDupl.NET.csproj | 3 +- src/AntiDupl/AntiDupl.NET/External.cmd | 19 +++------- .../AntiDupl.NET/StringsDefaultEnglish.cs | 6 +-- .../AntiDupl.NET/StringsDefaultRussian.cs | 6 +-- src/AntiDupl/AntiDupl.sln | 37 +++++++++++++++++++ src/AntiDupl/AntiDupl/adExternal.cmd | 5 +-- src/Prop.csproj | 8 ++++ 7 files changed, 60 insertions(+), 24 deletions(-) create mode 100644 src/Prop.csproj diff --git a/src/AntiDupl/AntiDupl.NET/AntiDupl.NET.csproj b/src/AntiDupl/AntiDupl.NET/AntiDupl.NET.csproj index 3251d9ab..98dd7171 100644 --- a/src/AntiDupl/AntiDupl.NET/AntiDupl.NET.csproj +++ b/src/AntiDupl/AntiDupl.NET/AntiDupl.NET.csproj @@ -1,5 +1,6 @@ п»ї - + + Debug AnyCPU diff --git a/src/AntiDupl/AntiDupl.NET/External.cmd b/src/AntiDupl/AntiDupl.NET/External.cmd index a2ebef05..81c007eb 100644 --- a/src/AntiDupl/AntiDupl.NET/External.cmd +++ b/src/AntiDupl/AntiDupl.NET/External.cmd @@ -1,21 +1,14 @@ @echo off -echo Try to estimate SVN revision: +echo Generate External.cs file: set PROJECT_DIR=%1 -set SUBWCREV_EXE=SubWCRev.exe -set TRUNK_DIR=%PROJECT_DIR%\..\..\.. -set SOLUTION_DIR=%TRUNK_DIR%\src\AntiDupl +set ROOT_DIR=%PROJECT_DIR%\..\..\.. +set SOLUTION_DIR=%ROOT_DIR%\src\AntiDupl set EXTERNAL_FILE=%PROJECT_DIR%\External.cs set VERSION_FILE=%SOLUTION_DIR%\version.txt -for %%X in (%SUBWCREV_EXE%) do (set SUBWCREV_EXE_FOUND=%%~$PATH:X) -if not defined SUBWCREV_EXE_FOUND ( -echo Execution file "%SUBWCREV_EXE%" is not found! -exit 0 -) - if not exist %VERSION_FILE% ( echo Can't find "%VERSION_FILE%" file! exit 0 @@ -27,7 +20,7 @@ for /f "delims=" %%i in ('type %VERSION_FILE%') do set VERSION=%%i echo /*>%EXTERNAL_FILE% echo * AntiDupl.NET Program.>>%EXTERNAL_FILE% echo *>>%EXTERNAL_FILE% -echo * Copyright (c) 2002-2015 Yermalayeu Ihar.>>%EXTERNAL_FILE% +echo * Copyright (c) 2002-2018 Yermalayeu Ihar.>>%EXTERNAL_FILE% echo *>>%EXTERNAL_FILE% echo * Permission is hereby granted, free of charge, to any person obtaining a copy>>%EXTERNAL_FILE% echo * of this software and associated documentation files (the "Software"), to deal>>%EXTERNAL_FILE% @@ -59,11 +52,9 @@ echo namespace AntiDupl.NET>>%EXTERNAL_FILE% echo {>>%EXTERNAL_FILE% echo static public class External>>%EXTERNAL_FILE% echo {>>%EXTERNAL_FILE% -echo public const string Version = "%VERSION%.$WCREV$";>>%EXTERNAL_FILE% +echo public const string Version = "%VERSION%";>>%EXTERNAL_FILE% echo }>>%EXTERNAL_FILE% echo }>>%EXTERNAL_FILE% echo.>>%EXTERNAL_FILE% -%SUBWCREV_EXE% %TRUNK_DIR% %EXTERNAL_FILE% %EXTERNAL_FILE% -if ERRORLEVEL 1 exit 0 diff --git a/src/AntiDupl/AntiDupl.NET/StringsDefaultEnglish.cs b/src/AntiDupl/AntiDupl.NET/StringsDefaultEnglish.cs index ed55f057..e6828ff8 100644 --- a/src/AntiDupl/AntiDupl.NET/StringsDefaultEnglish.cs +++ b/src/AntiDupl/AntiDupl.NET/StringsDefaultEnglish.cs @@ -1,7 +1,7 @@ /* * AntiDupl.NET Program. * -* Copyright (c) 2002-2015 Yermalayeu Ihar, 2013-2015 Borisov Dmitry. +* Copyright (c) 2002-2018 Yermalayeu Ihar, 2013-2018 Borisov Dmitry. * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -43,8 +43,8 @@ static public void CopyTo(Strings s) s.WarningMessage_ChangeFileExtension = "Do you really want to change file extension?"; - s.AboutProgramPanel_CopyrightLabel0_Text = "Copyright (c) 2002-2015 Yermalayeu Ihar, "; - s.AboutProgramPanel_CopyrightLabel1_Text = "2013-2015 Borisov Dmitry."; + s.AboutProgramPanel_CopyrightLabel0_Text = "Copyright (c) 2002-2018 Yermalayeu Ihar, "; + s.AboutProgramPanel_CopyrightLabel1_Text = "2013-2018 Borisov Dmitry."; s.AboutProgramPanel_ComponentLabel_Text = "Component"; s.AboutProgramPanel_VersionLabel_Text = "Version"; diff --git a/src/AntiDupl/AntiDupl.NET/StringsDefaultRussian.cs b/src/AntiDupl/AntiDupl.NET/StringsDefaultRussian.cs index 1adf5691..a6197907 100644 --- a/src/AntiDupl/AntiDupl.NET/StringsDefaultRussian.cs +++ b/src/AntiDupl/AntiDupl.NET/StringsDefaultRussian.cs @@ -1,7 +1,7 @@ /* * AntiDupl.NET Program. * -* Copyright (c) 2002-2015 Yermalayeu Ihar, 2013-2015 Borisov Dmitry. +* Copyright (c) 2002-2018 Yermalayeu Ihar, 2013-2018 Borisov Dmitry. * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -43,8 +43,8 @@ static public void CopyTo(Strings s) s.WarningMessage_ChangeFileExtension = "Вы действительно хотите изменить расширение файла?"; - s.AboutProgramPanel_CopyrightLabel0_Text = "Copyright (c) 2002-2015 Ермолаев Игорь,"; - s.AboutProgramPanel_CopyrightLabel1_Text = "2013-2015 Борисов Дмитрий."; + s.AboutProgramPanel_CopyrightLabel0_Text = "Copyright (c) 2002-2018 Ермолаев Игорь,"; + s.AboutProgramPanel_CopyrightLabel1_Text = "2013-2018 Борисов Дмитрий."; s.AboutProgramPanel_ComponentLabel_Text = "Компонент"; s.AboutProgramPanel_VersionLabel_Text = "Версия"; diff --git a/src/AntiDupl/AntiDupl.sln b/src/AntiDupl/AntiDupl.sln index 831ade8a..1ec10a4e 100644 --- a/src/AntiDupl/AntiDupl.sln +++ b/src/AntiDupl/AntiDupl.sln @@ -29,76 +29,112 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AntiDupl32", "AntiDupl\Anti EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AntiDupl64", "AntiDupl\AntiDupl64.vcxproj", "{064909D6-CA38-45EA-ABC8-9DF202E600C9}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AntiDupl.NET", "AntiDupl.NET\AntiDupl.NET.csproj", "{394E0C8E-33D5-44B5-8056-5AD2B1C3C56A}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU Debug|x64 = Debug|x64 Debug|x86 = Debug|x86 + Release|Any CPU = Release|Any CPU Release|x64 = Release|x64 Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution + {1622C4EF-06A4-4DAA-9631-5D71B32858A2}.Debug|Any CPU.ActiveCfg = Debug|Win32 {1622C4EF-06A4-4DAA-9631-5D71B32858A2}.Debug|x64.ActiveCfg = Debug|Win32 {1622C4EF-06A4-4DAA-9631-5D71B32858A2}.Debug|x86.ActiveCfg = Debug|Win32 {1622C4EF-06A4-4DAA-9631-5D71B32858A2}.Debug|x86.Build.0 = Debug|Win32 + {1622C4EF-06A4-4DAA-9631-5D71B32858A2}.Release|Any CPU.ActiveCfg = Release|Win32 {1622C4EF-06A4-4DAA-9631-5D71B32858A2}.Release|x64.ActiveCfg = Release|Win32 {1622C4EF-06A4-4DAA-9631-5D71B32858A2}.Release|x86.ActiveCfg = Release|Win32 {1622C4EF-06A4-4DAA-9631-5D71B32858A2}.Release|x86.Build.0 = Release|Win32 + {1622C4EF-06A4-4DAA-9631-5D71B32858A3}.Debug|Any CPU.ActiveCfg = Debug|x64 {1622C4EF-06A4-4DAA-9631-5D71B32858A3}.Debug|x64.ActiveCfg = Debug|x64 {1622C4EF-06A4-4DAA-9631-5D71B32858A3}.Debug|x64.Build.0 = Debug|x64 {1622C4EF-06A4-4DAA-9631-5D71B32858A3}.Debug|x86.ActiveCfg = Debug|x64 {1622C4EF-06A4-4DAA-9631-5D71B32858A3}.Debug|x86.Build.0 = Debug|x64 + {1622C4EF-06A4-4DAA-9631-5D71B32858A3}.Release|Any CPU.ActiveCfg = Release|x64 {1622C4EF-06A4-4DAA-9631-5D71B32858A3}.Release|x64.ActiveCfg = Release|x64 {1622C4EF-06A4-4DAA-9631-5D71B32858A3}.Release|x64.Build.0 = Release|x64 {1622C4EF-06A4-4DAA-9631-5D71B32858A3}.Release|x86.ActiveCfg = Release|x64 {1622C4EF-06A4-4DAA-9631-5D71B32858A3}.Release|x86.Build.0 = Release|x64 + {1622C4EF-06A4-4DAA-9631-5D71B32858A4}.Debug|Any CPU.ActiveCfg = Debug|Win32 {1622C4EF-06A4-4DAA-9631-5D71B32858A4}.Debug|x64.ActiveCfg = Debug|Win32 {1622C4EF-06A4-4DAA-9631-5D71B32858A4}.Debug|x86.ActiveCfg = Debug|Win32 {1622C4EF-06A4-4DAA-9631-5D71B32858A4}.Debug|x86.Build.0 = Debug|Win32 + {1622C4EF-06A4-4DAA-9631-5D71B32858A4}.Release|Any CPU.ActiveCfg = Release|Win32 {1622C4EF-06A4-4DAA-9631-5D71B32858A4}.Release|x64.ActiveCfg = Release|Win32 {1622C4EF-06A4-4DAA-9631-5D71B32858A4}.Release|x86.ActiveCfg = Release|Win32 {1622C4EF-06A4-4DAA-9631-5D71B32858A4}.Release|x86.Build.0 = Release|Win32 + {B6080B9D-6F8C-417C-AF11-9853C47BA665}.Debug|Any CPU.ActiveCfg = Debug|x64 {B6080B9D-6F8C-417C-AF11-9853C47BA665}.Debug|x64.ActiveCfg = Debug|x64 {B6080B9D-6F8C-417C-AF11-9853C47BA665}.Debug|x64.Build.0 = Debug|x64 {B6080B9D-6F8C-417C-AF11-9853C47BA665}.Debug|x86.ActiveCfg = Debug|x64 + {B6080B9D-6F8C-417C-AF11-9853C47BA665}.Release|Any CPU.ActiveCfg = Release|x64 {B6080B9D-6F8C-417C-AF11-9853C47BA665}.Release|x64.ActiveCfg = Release|x64 {B6080B9D-6F8C-417C-AF11-9853C47BA665}.Release|x64.Build.0 = Release|x64 {B6080B9D-6F8C-417C-AF11-9853C47BA665}.Release|x86.ActiveCfg = Release|x64 + {1B11B527-4299-4551-8D47-6FD6191BCF48}.Debug|Any CPU.ActiveCfg = Debug|Win32 {1B11B527-4299-4551-8D47-6FD6191BCF48}.Debug|x64.ActiveCfg = Debug|Win32 {1B11B527-4299-4551-8D47-6FD6191BCF48}.Debug|x86.ActiveCfg = Debug|Win32 {1B11B527-4299-4551-8D47-6FD6191BCF48}.Debug|x86.Build.0 = Debug|Win32 + {1B11B527-4299-4551-8D47-6FD6191BCF48}.Release|Any CPU.ActiveCfg = Release|Win32 {1B11B527-4299-4551-8D47-6FD6191BCF48}.Release|x64.ActiveCfg = Release|Win32 {1B11B527-4299-4551-8D47-6FD6191BCF48}.Release|x86.ActiveCfg = Release|Win32 {1B11B527-4299-4551-8D47-6FD6191BCF48}.Release|x86.Build.0 = Release|Win32 + {6837F395-46E9-4E87-8637-8F75C26D4608}.Debug|Any CPU.ActiveCfg = Debug|x64 {6837F395-46E9-4E87-8637-8F75C26D4608}.Debug|x64.ActiveCfg = Debug|x64 {6837F395-46E9-4E87-8637-8F75C26D4608}.Debug|x64.Build.0 = Debug|x64 {6837F395-46E9-4E87-8637-8F75C26D4608}.Debug|x86.ActiveCfg = Debug|x64 + {6837F395-46E9-4E87-8637-8F75C26D4608}.Release|Any CPU.ActiveCfg = Release|x64 {6837F395-46E9-4E87-8637-8F75C26D4608}.Release|x64.ActiveCfg = Release|x64 {6837F395-46E9-4E87-8637-8F75C26D4608}.Release|x64.Build.0 = Release|x64 {6837F395-46E9-4E87-8637-8F75C26D4608}.Release|x86.ActiveCfg = Release|x64 + {44F4252D-8C3C-4981-B11B-B6008646A4EA}.Debug|Any CPU.ActiveCfg = Debug|Win32 {44F4252D-8C3C-4981-B11B-B6008646A4EA}.Debug|x64.ActiveCfg = Debug|Win32 {44F4252D-8C3C-4981-B11B-B6008646A4EA}.Debug|x86.ActiveCfg = Debug|Win32 {44F4252D-8C3C-4981-B11B-B6008646A4EA}.Debug|x86.Build.0 = Debug|Win32 + {44F4252D-8C3C-4981-B11B-B6008646A4EA}.Release|Any CPU.ActiveCfg = Release|Win32 {44F4252D-8C3C-4981-B11B-B6008646A4EA}.Release|x64.ActiveCfg = Release|Win32 {44F4252D-8C3C-4981-B11B-B6008646A4EA}.Release|x86.ActiveCfg = Release|Win32 {44F4252D-8C3C-4981-B11B-B6008646A4EA}.Release|x86.Build.0 = Release|Win32 + {F8244CC3-B74E-44EC-AC54-6904561A6D0C}.Debug|Any CPU.ActiveCfg = Debug|x64 {F8244CC3-B74E-44EC-AC54-6904561A6D0C}.Debug|x64.ActiveCfg = Debug|x64 {F8244CC3-B74E-44EC-AC54-6904561A6D0C}.Debug|x64.Build.0 = Debug|x64 {F8244CC3-B74E-44EC-AC54-6904561A6D0C}.Debug|x86.ActiveCfg = Debug|x64 + {F8244CC3-B74E-44EC-AC54-6904561A6D0C}.Release|Any CPU.ActiveCfg = Release|x64 {F8244CC3-B74E-44EC-AC54-6904561A6D0C}.Release|x64.ActiveCfg = Release|x64 {F8244CC3-B74E-44EC-AC54-6904561A6D0C}.Release|x64.Build.0 = Release|x64 {F8244CC3-B74E-44EC-AC54-6904561A6D0C}.Release|x86.ActiveCfg = Release|x64 + {7C8C9359-ED04-4415-BB91-9947B59BC71E}.Debug|Any CPU.ActiveCfg = Debug|Win32 {7C8C9359-ED04-4415-BB91-9947B59BC71E}.Debug|x64.ActiveCfg = Debug|Win32 {7C8C9359-ED04-4415-BB91-9947B59BC71E}.Debug|x86.ActiveCfg = Debug|Win32 {7C8C9359-ED04-4415-BB91-9947B59BC71E}.Debug|x86.Build.0 = Debug|Win32 + {7C8C9359-ED04-4415-BB91-9947B59BC71E}.Release|Any CPU.ActiveCfg = Release|Win32 {7C8C9359-ED04-4415-BB91-9947B59BC71E}.Release|x64.ActiveCfg = Release|Win32 {7C8C9359-ED04-4415-BB91-9947B59BC71E}.Release|x86.ActiveCfg = Release|Win32 {7C8C9359-ED04-4415-BB91-9947B59BC71E}.Release|x86.Build.0 = Release|Win32 + {064909D6-CA38-45EA-ABC8-9DF202E600C9}.Debug|Any CPU.ActiveCfg = Debug|x64 {064909D6-CA38-45EA-ABC8-9DF202E600C9}.Debug|x64.ActiveCfg = Debug|x64 {064909D6-CA38-45EA-ABC8-9DF202E600C9}.Debug|x64.Build.0 = Debug|x64 {064909D6-CA38-45EA-ABC8-9DF202E600C9}.Debug|x86.ActiveCfg = Debug|x64 + {064909D6-CA38-45EA-ABC8-9DF202E600C9}.Release|Any CPU.ActiveCfg = Release|x64 {064909D6-CA38-45EA-ABC8-9DF202E600C9}.Release|x64.ActiveCfg = Release|x64 {064909D6-CA38-45EA-ABC8-9DF202E600C9}.Release|x64.Build.0 = Release|x64 {064909D6-CA38-45EA-ABC8-9DF202E600C9}.Release|x86.ActiveCfg = Release|x64 + {394E0C8E-33D5-44B5-8056-5AD2B1C3C56A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {394E0C8E-33D5-44B5-8056-5AD2B1C3C56A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {394E0C8E-33D5-44B5-8056-5AD2B1C3C56A}.Debug|x64.ActiveCfg = Debug|Any CPU + {394E0C8E-33D5-44B5-8056-5AD2B1C3C56A}.Debug|x64.Build.0 = Debug|Any CPU + {394E0C8E-33D5-44B5-8056-5AD2B1C3C56A}.Debug|x86.ActiveCfg = Debug|Any CPU + {394E0C8E-33D5-44B5-8056-5AD2B1C3C56A}.Debug|x86.Build.0 = Debug|Any CPU + {394E0C8E-33D5-44B5-8056-5AD2B1C3C56A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {394E0C8E-33D5-44B5-8056-5AD2B1C3C56A}.Release|Any CPU.Build.0 = Release|Any CPU + {394E0C8E-33D5-44B5-8056-5AD2B1C3C56A}.Release|x64.ActiveCfg = Release|Any CPU + {394E0C8E-33D5-44B5-8056-5AD2B1C3C56A}.Release|x64.Build.0 = Release|Any CPU + {394E0C8E-33D5-44B5-8056-5AD2B1C3C56A}.Release|x86.ActiveCfg = Release|Any CPU + {394E0C8E-33D5-44B5-8056-5AD2B1C3C56A}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -114,5 +150,6 @@ Global {F8244CC3-B74E-44EC-AC54-6904561A6D0C} = {9F665747-6A6F-412C-BDB6-09DA776D7BF0} {7C8C9359-ED04-4415-BB91-9947B59BC71E} = {97926356-D6D6-4B4D-9B17-18688468EF8B} {064909D6-CA38-45EA-ABC8-9DF202E600C9} = {9F665747-6A6F-412C-BDB6-09DA776D7BF0} + {394E0C8E-33D5-44B5-8056-5AD2B1C3C56A} = {F75878C9-56D7-4344-9DAF-4C09BD154ED1} EndGlobalSection EndGlobal diff --git a/src/AntiDupl/AntiDupl/adExternal.cmd b/src/AntiDupl/AntiDupl/adExternal.cmd index bff227e4..267bc5e5 100644 --- a/src/AntiDupl/AntiDupl/adExternal.cmd +++ b/src/AntiDupl/AntiDupl/adExternal.cmd @@ -2,8 +2,8 @@ echo Generate adExternal.h file: -set TRUNK_DIR=..\..\.. -set SOLUTION_DIR=%TRUNK_DIR%\src\AntiDupl +set ROOT_DIR=..\..\.. +set SOLUTION_DIR=%ROOT_DIR%\src\AntiDupl set PROJECT_DIR=%SOLUTION_DIR%\AntiDupl set EXTERNAL_FILE=%PROJECT_DIR%\adExternal.h set VERSION_FILE=%SOLUTION_DIR%\version.txt @@ -55,5 +55,4 @@ echo.>>%EXTERNAL_FILE% echo #endif//__adExternal_h__>>%EXTERNAL_FILE% echo.>>%EXTERNAL_FILE% -if ERRORLEVEL 1 exit 0 diff --git a/src/Prop.csproj b/src/Prop.csproj new file mode 100644 index 00000000..5355ef24 --- /dev/null +++ b/src/Prop.csproj @@ -0,0 +1,8 @@ +п»ї + + + $(SolutionDir)\..\..\bin\$(Configuration) + $(SolutionDir)..\..\obj\$(Configuration)\$(MSBuildProjectName) + $(SolutionDir)..\..\obj\$(Configuration)\$(MSBuildProjectName) + + \ No newline at end of file