From 9c74b645d02e90716b49f01c77dd4332db116508 Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Tue, 12 Aug 2014 23:56:57 +0200 Subject: [PATCH] Drop Git project Signed-off-by: Sven Strickroth Signed-off-by: Sup Yut Sum --- src/Git/Git.vcxproj | 93 ---------------------- src/Git/Git.vcxproj.filters | 92 --------------------- src/Git/TGitPath.cpp | 2 +- src/Git/stdafx.cpp | 8 -- src/Git/stdafx.h | 56 ------------- src/TGitCache/TGitCache.vcxproj | 1 + src/TGitCache/TGitCache.vcxproj.filters | 5 +- src/TortoiseGit.sln | 10 --- src/TortoiseGitBlame/TortoiseGitBlame.vcxproj | 21 ++++- .../TortoiseGitBlame.vcxproj.filters | 45 +++++++++++ src/TortoiseMerge/TortoiseMerge.vcxproj | 19 ++++- src/TortoiseMerge/TortoiseMerge.vcxproj.filters | 27 +++++++ src/TortoiseMerge/stdafx.h | 7 ++ src/TortoiseProc/TortoiseProc.vcxproj | 23 +++++- src/TortoiseProc/TortoiseProc.vcxproj.filters | 57 +++++++++++++ test/Cache/Cache.vcxproj | 6 +- test/Cache/Cache.vcxproj.filters | 6 ++ 17 files changed, 201 insertions(+), 277 deletions(-) delete mode 100644 src/Git/Git.vcxproj delete mode 100644 src/Git/Git.vcxproj.filters delete mode 100644 src/Git/stdafx.cpp delete mode 100644 src/Git/stdafx.h diff --git a/src/Git/Git.vcxproj b/src/Git/Git.vcxproj deleted file mode 100644 index b3801c93a..000000000 --- a/src/Git/Git.vcxproj +++ /dev/null @@ -1,93 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {7CA5B1EB-8CC9-40A6-96D8-83649C1A870B} - Git - Win32Proj - - - - - StaticLibrary - Dynamic - Unicode - - - true - - - - - - - - - ..\TortoiseShell;..\utils;..\..\ext\gitdll;..\..\ext\libgit2\include;..\..\ext\zlib;%(AdditionalIncludeDirectories) - - - - - - - - - - - - - - Create - - - - - - - - - - - - - - - - - - - - - {2b4f366c-93ba-491e-87af-5ef7b37f75f7} - false - - - {5c6b6a95-2053-4593-9617-c4f176736d5a} - false - - - {4f0a55de-dafd-4a0b-a03d-2c14cb77e08f} - false - - - - - - \ No newline at end of file diff --git a/src/Git/Git.vcxproj.filters b/src/Git/Git.vcxproj.filters deleted file mode 100644 index 2b800f63e..000000000 --- a/src/Git/Git.vcxproj.filters +++ /dev/null @@ -1,92 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {b914a8d4-b03a-46d5-ab19-402a169a3dff} - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files\Utils - - - Source Files\Utils - - - Source Files - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Source Files\Utils - - - Source Files\Utils - - - Header Files - - - \ No newline at end of file diff --git a/src/Git/TGitPath.cpp b/src/Git/TGitPath.cpp index 47936a586..a01a8957d 100644 --- a/src/Git/TGitPath.cpp +++ b/src/Git/TGitPath.cpp @@ -25,7 +25,7 @@ #include "PathUtils.h" #include #include "Git.h" -#include "Globals.h" +#include "../TortoiseShell/Globals.h" #include "StringUtils.h" #include "../Resources/LoglistCommonResource.h" #include diff --git a/src/Git/stdafx.cpp b/src/Git/stdafx.cpp deleted file mode 100644 index 766f903db..000000000 --- a/src/Git/stdafx.cpp +++ /dev/null @@ -1,8 +0,0 @@ -// stdafx.cpp : source file that includes just the standard includes -// Git.pch will be the pre-compiled header -// stdafx.obj will contain the pre-compiled type information - -#include "stdafx.h" - -// reference any additional headers you need in STDAFX.H -// and not in this file diff --git a/src/Git/stdafx.h b/src/Git/stdafx.h deleted file mode 100644 index 7c3647581..000000000 --- a/src/Git/stdafx.h +++ /dev/null @@ -1,56 +0,0 @@ -// stdafx.h : include file for standard system include files, -// or project specific include files that are used frequently, but -// are changed infrequently -// - -#pragma once - -#define _CRT_SECURE_NO_WARNINGS - -#include "..\targetver.h" - -#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers -#define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS // some CString constructors will be explicit - -#ifndef VC_EXTRALEAN -#define VC_EXTRALEAN // Exclude rarely-used stuff from Windows headers -#endif - -#include -#include // MFC core and standard components - -#include -#include -#include - -#pragma warning(push) -#pragma warning(disable: 4702) // Unreachable code warnings in xtree -#include -#include -#include -#include -#include -#include -#pragma warning(pop) - - -#include // MFC support for Internet Explorer 4 Common Controls -#ifndef _AFX_NO_AFXCMN_SUPPORT -#include // MFC support for Windows Common Controls -#endif // _AFX_NO_AFXCMN_SUPPORT -#include -#include -#include -#include -#include // MFC extensions -#include // MFC support for ribbons and control bars - -#include -#include - -#include "DebugOutput.h" - -#pragma warning(push) -#include "git2.h" -#pragma warning(pop) -#include "SmartLibgit2Ref.h" diff --git a/src/TGitCache/TGitCache.vcxproj b/src/TGitCache/TGitCache.vcxproj index 0db6f047a..b6c536027 100644 --- a/src/TGitCache/TGitCache.vcxproj +++ b/src/TGitCache/TGitCache.vcxproj @@ -76,6 +76,7 @@ + diff --git a/src/TGitCache/TGitCache.vcxproj.filters b/src/TGitCache/TGitCache.vcxproj.filters index bc2df756c..097d90dc7 100644 --- a/src/TGitCache/TGitCache.vcxproj.filters +++ b/src/TGitCache/TGitCache.vcxproj.filters @@ -94,7 +94,7 @@ Source Files\Utils - Source Files + Source Files\Git @@ -173,6 +173,9 @@ Source Files\TortoiseShell + + Source Files\Git + diff --git a/src/TortoiseGit.sln b/src/TortoiseGit.sln index c564cd92b..25a7aae37 100644 --- a/src/TortoiseGit.sln +++ b/src/TortoiseGit.sln @@ -19,8 +19,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "CommonLibs", "CommonLibs", EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "CrashServerSDK", "CrashServerSDK", "{C8F4D789-D86F-4B0C-8C47-4B263027B1A6}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Git", "Git\Git.vcxproj", "{7CA5B1EB-8CC9-40A6-96D8-83649C1A870B}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TortoiseGitProc", "TortoiseProc\TortoiseProc.vcxproj", "{50797F06-39C5-4802-8E2B-7B7A4EF03214}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TortoiseGitUDiff", "TortoiseUDiff\TortoiseUDiff.vcxproj", "{BC5A5F3B-E41A-4C56-B16F-263D2C6D6475}" @@ -252,14 +250,6 @@ Global Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {7CA5B1EB-8CC9-40A6-96D8-83649C1A870B}.Debug|Win32.ActiveCfg = Debug|Win32 - {7CA5B1EB-8CC9-40A6-96D8-83649C1A870B}.Debug|Win32.Build.0 = Debug|Win32 - {7CA5B1EB-8CC9-40A6-96D8-83649C1A870B}.Debug|x64.ActiveCfg = Debug|x64 - {7CA5B1EB-8CC9-40A6-96D8-83649C1A870B}.Debug|x64.Build.0 = Debug|x64 - {7CA5B1EB-8CC9-40A6-96D8-83649C1A870B}.Release|Win32.ActiveCfg = Release|Win32 - {7CA5B1EB-8CC9-40A6-96D8-83649C1A870B}.Release|Win32.Build.0 = Release|Win32 - {7CA5B1EB-8CC9-40A6-96D8-83649C1A870B}.Release|x64.ActiveCfg = Release|x64 - {7CA5B1EB-8CC9-40A6-96D8-83649C1A870B}.Release|x64.Build.0 = Release|x64 {50797F06-39C5-4802-8E2B-7B7A4EF03214}.Debug|Win32.ActiveCfg = Debug|Win32 {50797F06-39C5-4802-8E2B-7B7A4EF03214}.Debug|Win32.Build.0 = Debug|Win32 {50797F06-39C5-4802-8E2B-7B7A4EF03214}.Debug|x64.ActiveCfg = Debug|x64 diff --git a/src/TortoiseGitBlame/TortoiseGitBlame.vcxproj b/src/TortoiseGitBlame/TortoiseGitBlame.vcxproj index 0666b3307..4e89a2858 100644 --- a/src/TortoiseGitBlame/TortoiseGitBlame.vcxproj +++ b/src/TortoiseGitBlame/TortoiseGitBlame.vcxproj @@ -51,6 +51,11 @@ + + + + + @@ -72,6 +77,7 @@ + @@ -99,6 +105,13 @@ + + + + + + + @@ -117,6 +130,7 @@ + @@ -161,6 +175,9 @@ + + {2b4f366c-93ba-491e-87af-5ef7b37f75f7} + {a5498556-ce09-4095-8335-08fc8370552d} false @@ -177,10 +194,6 @@ {4be529fb-c2f2-49f7-a897-054b955564cf} false - - {7ca5b1eb-8cc9-40a6-96d8-83649c1a870b} - false - diff --git a/src/TortoiseGitBlame/TortoiseGitBlame.vcxproj.filters b/src/TortoiseGitBlame/TortoiseGitBlame.vcxproj.filters index d562b1339..9a56cb673 100644 --- a/src/TortoiseGitBlame/TortoiseGitBlame.vcxproj.filters +++ b/src/TortoiseGitBlame/TortoiseGitBlame.vcxproj.filters @@ -25,6 +25,9 @@ {71418e14-7775-42a8-bdfa-f326d4f55c30} + + {b7150578-0071-4e14-894a-29dfdb7a646e} + @@ -159,6 +162,24 @@ Source Files\TortoiseGitProc + + Source Files\Utils + + + Source Files\Git + + + Source Files\Git + + + Source Files\Git + + + Source Files\Git + + + Source Files\Git + @@ -284,6 +305,30 @@ Source Files\Utils + + Source Files\Utils + + + Source Files\Git + + + Source Files\Git + + + Source Files\Git + + + Source Files\Git + + + Source Files\Git + + + Source Files\Git + + + Source Files\Git + diff --git a/src/TortoiseMerge/TortoiseMerge.vcxproj b/src/TortoiseMerge/TortoiseMerge.vcxproj index 9ca40a5df..6694aef12 100644 --- a/src/TortoiseMerge/TortoiseMerge.vcxproj +++ b/src/TortoiseMerge/TortoiseMerge.vcxproj @@ -51,10 +51,14 @@ + + + NotUsing + @@ -305,7 +309,12 @@ + + + + + @@ -422,14 +431,16 @@ {ae6aafba-9992-452a-9eb8-dd69402a4ace} false + + {5c6b6a95-2053-4593-9617-c4f176736d5a} + + + {4f0a55de-dafd-4a0b-a03d-2c14cb77e08f} + {4be529fb-c2f2-49f7-a897-054b955564cf} false - - {7ca5b1eb-8cc9-40a6-96d8-83649c1a870b} - false - diff --git a/src/TortoiseMerge/TortoiseMerge.vcxproj.filters b/src/TortoiseMerge/TortoiseMerge.vcxproj.filters index 667f7937a..a3265f98a 100644 --- a/src/TortoiseMerge/TortoiseMerge.vcxproj.filters +++ b/src/TortoiseMerge/TortoiseMerge.vcxproj.filters @@ -336,6 +336,18 @@ Utils\Source Files\MiscUI + + Git\Source Files + + + Utils\Source Files + + + Git\Source Files + + + Git\Source Files + @@ -533,6 +545,21 @@ Utils\Header Files\MiscUI + + Git\Header Files + + + Git\Header Files + + + Utils\Header Files + + + Git\Header Files + + + Git\Header Files + diff --git a/src/TortoiseMerge/stdafx.h b/src/TortoiseMerge/stdafx.h index f3372fd68..4c3bd09fe 100644 --- a/src/TortoiseMerge/stdafx.h +++ b/src/TortoiseMerge/stdafx.h @@ -53,6 +53,13 @@ #include "svn_error_codes.h" #pragma warning(pop) +#include "DebugOutput.h" + +#pragma warning(push) +#include "git2.h" +#pragma warning(pop) +#include "SmartLibgit2Ref.h" + #define USE_GDI_GRADIENT #define XMESSAGEBOX_APPREGPATH "Software\\TortoiseGitMerge\\" diff --git a/src/TortoiseProc/TortoiseProc.vcxproj b/src/TortoiseProc/TortoiseProc.vcxproj index 750f89c50..7673649d7 100644 --- a/src/TortoiseProc/TortoiseProc.vcxproj +++ b/src/TortoiseProc/TortoiseProc.vcxproj @@ -52,6 +52,13 @@ + + + + + + + @@ -92,6 +99,7 @@ + @@ -291,6 +299,16 @@ + + + + + + + + + + @@ -334,6 +352,7 @@ + @@ -698,10 +717,6 @@ {98e4e6d3-0ef6-4570-a29e-274dacf3b784} false - - {7ca5b1eb-8cc9-40a6-96d8-83649c1a870b} - false - {2c879469-db8f-4bf0-b016-ae864d2a7bbc} false diff --git a/src/TortoiseProc/TortoiseProc.vcxproj.filters b/src/TortoiseProc/TortoiseProc.vcxproj.filters index 271b0cbf6..fd34e2260 100644 --- a/src/TortoiseProc/TortoiseProc.vcxproj.filters +++ b/src/TortoiseProc/TortoiseProc.vcxproj.filters @@ -866,6 +866,30 @@ Utils\General + + Git + + + Git + + + Git + + + Git + + + Git + + + Git + + + Utils\General + + + Git + @@ -1576,6 +1600,39 @@ Utils\General + + Git + + + Git + + + Git + + + Git + + + Git + + + Git + + + Git + + + Git + + + Git + + + Utils\General + + + Git + diff --git a/test/Cache/Cache.vcxproj b/test/Cache/Cache.vcxproj index 887001343..2269f85af 100644 --- a/test/Cache/Cache.vcxproj +++ b/test/Cache/Cache.vcxproj @@ -42,6 +42,7 @@ + @@ -60,6 +61,7 @@ + @@ -88,10 +90,6 @@ {4f0a55de-dafd-4a0b-a03d-2c14cb77e08f} false - - {7ca5b1eb-8cc9-40a6-96d8-83649c1a870b} - false - diff --git a/test/Cache/Cache.vcxproj.filters b/test/Cache/Cache.vcxproj.filters index 7e1a2fdcb..4f5766ab2 100644 --- a/test/Cache/Cache.vcxproj.filters +++ b/test/Cache/Cache.vcxproj.filters @@ -57,6 +57,9 @@ Source Files + + Source Files + @@ -89,6 +92,9 @@ Header Files + + Header Files + -- 2.11.4.GIT