OSDN Git Service

TortoiseMerge Build Success
authorFrank Li <lznuaa@gmail.com>
Mon, 15 Dec 2008 14:09:00 +0000 (22:09 +0800)
committerFrank Li <lznuaa@gmail.com>
Mon, 15 Dec 2008 14:09:00 +0000 (22:09 +0800)
Signed-off-by: Frank Li <lznuaa@gmail.com>
src/TortoiseMerge/AppUtils.cpp
src/TortoiseMerge/DiffData.cpp
src/TortoiseMerge/MainFrm.cpp
src/TortoiseMerge/Patch.cpp
src/TortoiseMerge/SetMainPage.cpp
src/TortoiseMerge/TortoiseMerge.cpp
src/TortoiseMerge/TortoiseMerge.vcproj

index dc206ef..57b5476 100644 (file)
 #include "UnicodeUtils.h"\r
 #include "ProgressDlg.h"\r
 \r
-#include "svn_pools.h"\r
-#include "svn_io.h"\r
-#include "svn_path.h"\r
-#include "svn_diff.h"\r
-#include "svn_string.h"\r
-#include "svn_utf.h"\r
+//#include "svn_pools.h"\r
+//#include "svn_io.h"\r
+//#include "svn_path.h"\r
+//#include "svn_diff.h"\r
+//#include "svn_string.h"\r
+//#include "svn_utf.h"\r
 \r
 CAppUtils::CAppUtils(void)\r
 {\r
@@ -101,6 +101,7 @@ BOOL CAppUtils::GetVersionedFile(CString sPath, CString sVersion, CString sSaveP
 \r
 bool CAppUtils::CreateUnifiedDiff(const CString& orig, const CString& modified, const CString& output, bool bShowError)\r
 {\r
+#if 0\r
        apr_file_t * outfile = NULL;\r
        apr_pool_t * pool = svn_pool_create(NULL);\r
 \r
@@ -137,11 +138,13 @@ bool CAppUtils::CreateUnifiedDiff(const CString& orig, const CString& modified,
                return false;\r
        }\r
        svn_pool_destroy(pool);\r
+#endif\r
        return true;\r
 }\r
 \r
-CString CAppUtils::GetErrorString(svn_error_t * Err)\r
+CString CAppUtils::GetErrorString(git_error_t * Err)\r
 {\r
+#if 0\r
        CString msg;\r
        CString temp;\r
        char errbuf[256];\r
@@ -207,6 +210,7 @@ CString CAppUtils::GetErrorString(svn_error_t * Err)
                }\r
                return msg;\r
        }\r
+#endif\r
        return _T("");\r
 }\r
 \r
index ed078ec..d3c26ab 100644 (file)
@@ -37,9 +37,9 @@ int CDiffData::abort_on_pool_failure (int /*retcode*/)
 \r
 CDiffData::CDiffData(void)\r
 {\r
-       apr_initialize();\r
-       svn_dso_initialize();\r
-       g_SVNAdminDir.Init();\r
+//     apr_initialize();\r
+//     svn_dso_initialize();\r
+//     g_SVNAdminDir.Init();\r
 \r
        m_bBlame = false;\r
 \r
@@ -49,8 +49,8 @@ CDiffData::CDiffData(void)
 \r
 CDiffData::~CDiffData(void)\r
 {\r
-       g_SVNAdminDir.Close();\r
-       apr_terminate();\r
+////   g_SVNAdminDir.Close();\r
+//     apr_terminate();\r
 }\r
 \r
 int CDiffData::GetLineCount()\r
@@ -87,6 +87,7 @@ LPCTSTR CDiffData::GetLineChars(int index)
 \r
 BOOL CDiffData::Load()\r
 {\r
+#if 0\r
        CString sConvertedBaseFilename, sConvertedTheirFilename, sConvertedYourFilename;\r
        apr_pool_t * pool;\r
 \r
@@ -218,17 +219,20 @@ BOOL CDiffData::Load()
        }\r
 \r
        apr_pool_destroy (pool);                                        // free the allocated memory\r
+\r
+#endif\r
        return TRUE;\r
 }\r
 \r
 \r
 bool\r
-CDiffData::DoTwoWayDiff(const CString& sBaseFilename, const CString& sYourFilename, DWORD dwIgnoreWS, bool bIgnoreEOL, apr_pool_t * pool)\r
+CDiffData::DoTwoWayDiff(const CString& sBaseFilename, const CString& sYourFilename, DWORD dwIgnoreWS, bool bIgnoreEOL)\r
 {\r
        // convert CString filenames (UTF-16 or ANSI) to UTF-8\r
        CStringA sBaseFilenameUtf8 = CUnicodeUtils::GetUTF8(sBaseFilename);\r
        CStringA sYourFilenameUtf8 = CUnicodeUtils::GetUTF8(sYourFilename);\r
 \r
+#if 0\r
        svn_diff_t * diffYourBase = NULL;\r
        svn_error_t * svnerr = NULL;\r
        svn_diff_file_options_t * options = svn_diff_file_options_create(pool);\r
@@ -453,17 +457,18 @@ CDiffData::DoTwoWayDiff(const CString& sBaseFilename, const CString& sYourFilena
                tempdiff = tempdiff->next;\r
        }\r
        TRACE(_T("done with 2-way diff\n"));\r
-\r
+#endif\r
        return true;\r
 }\r
 \r
 bool\r
-CDiffData::DoThreeWayDiff(const CString& sBaseFilename, const CString& sYourFilename, const CString& sTheirFilename, DWORD dwIgnoreWS, bool bIgnoreEOL, bool bIgnoreCase, apr_pool_t * pool)\r
+CDiffData::DoThreeWayDiff(const CString& sBaseFilename, const CString& sYourFilename, const CString& sTheirFilename, DWORD dwIgnoreWS, bool bIgnoreEOL, bool bIgnoreCase)\r
 {\r
        // convert CString filenames (UTF-16 or ANSI) to UTF-8\r
        CStringA sBaseFilenameUtf8  = CUnicodeUtils::GetUTF8(sBaseFilename);\r
        CStringA sYourFilenameUtf8  = CUnicodeUtils::GetUTF8(sYourFilename);\r
        CStringA sTheirFilenameUtf8 = CUnicodeUtils::GetUTF8(sTheirFilename);\r
+#if 0\r
        svn_diff_t * diffTheirYourBase = NULL;\r
        svn_diff_file_options_t * options = svn_diff_file_options_create(pool);\r
        options->ignore_eol_style = bIgnoreEOL;\r
@@ -866,7 +871,7 @@ CDiffData::DoThreeWayDiff(const CString& sBaseFilename, const CString& sYourFile
        }\r
        ASSERT(m_Diff3.GetCount() == m_YourBaseBoth.GetCount());\r
        ASSERT(m_TheirBaseBoth.GetCount() == m_YourBaseBoth.GetCount());\r
-\r
+#endif\r
        TRACE(_T("done with 3-way diff\n"));\r
        return true;\r
 }\r
index f707372..cd2bd3d 100644 (file)
@@ -553,10 +553,10 @@ void CMainFrame::OnFileOpen()
        m_Data.m_sDiffFile = dlg.m_sUnifiedDiffFile;\r
        m_Data.m_sPatchPath = dlg.m_sPatchDirectory;\r
        m_Data.m_mergedFile.SetOutOfUse();\r
-       g_crasher.AddFile((LPCSTR)(LPCTSTR)dlg.m_sBaseFile, (LPCSTR)(LPCTSTR)_T("Basefile"));\r
-       g_crasher.AddFile((LPCSTR)(LPCTSTR)dlg.m_sTheirFile, (LPCSTR)(LPCTSTR)_T("Theirfile"));\r
-       g_crasher.AddFile((LPCSTR)(LPCTSTR)dlg.m_sYourFile, (LPCSTR)(LPCTSTR)_T("Yourfile"));\r
-       g_crasher.AddFile((LPCSTR)(LPCTSTR)dlg.m_sUnifiedDiffFile, (LPCSTR)(LPCTSTR)_T("Difffile"));\r
+//     g_crasher.AddFile((LPCSTR)(LPCTSTR)dlg.m_sBaseFile, (LPCSTR)(LPCTSTR)_T("Basefile"));\r
+//     g_crasher.AddFile((LPCSTR)(LPCTSTR)dlg.m_sTheirFile, (LPCSTR)(LPCTSTR)_T("Theirfile"));\r
+//     g_crasher.AddFile((LPCSTR)(LPCTSTR)dlg.m_sYourFile, (LPCSTR)(LPCTSTR)_T("Yourfile"));\r
+//     g_crasher.AddFile((LPCSTR)(LPCTSTR)dlg.m_sUnifiedDiffFile, (LPCSTR)(LPCTSTR)_T("Difffile"));\r
        \r
        if (!m_Data.IsBaseFileInUse() && m_Data.IsTheirFileInUse() && m_Data.IsYourFileInUse())\r
        {\r
index 36ad2f4..bd4c69b 100644 (file)
@@ -62,7 +62,7 @@ BOOL CPatch::OpenUnifiedDiffFile(const CString& filename)
        EOL ending = EOL_NOENDING;\r
        INT_PTR nIndex = 0;\r
        INT_PTR nLineCount = 0;\r
-       g_crasher.AddFile((LPCSTR)(LPCTSTR)filename, (LPCSTR)(LPCTSTR)_T("unified diff file"));\r
+//     g_crasher.AddFile((LPCSTR)(LPCTSTR)filename, (LPCSTR)(LPCTSTR)_T("unified diff file"));\r
 \r
        CFileTextLines PatchLines;\r
        if (!PatchLines.Load(filename))\r
@@ -531,7 +531,7 @@ BOOL CPatch::PatchFile(const CString& sPath, const CString& sSavePath, const CSt
        CString sPatchFile = sBaseFile.IsEmpty() ? sPath : sBaseFile;\r
        if (PathFileExists(sPatchFile))\r
        {\r
-               g_crasher.AddFile((LPCSTR)(LPCTSTR)sPatchFile, (LPCSTR)(LPCTSTR)_T("File to patch"));\r
+//             g_crasher.AddFile((LPCSTR)(LPCTSTR)sPatchFile, (LPCSTR)(LPCTSTR)_T("File to patch"));\r
        }\r
        CFileTextLines PatchLines;\r
        CFileTextLines PatchLinesResult;\r
@@ -674,6 +674,7 @@ CString     CPatch::CheckPatchPath(const CString& path)
        bool isDir = false;\r
        CString subpath;\r
        CDirFileEnum filefinder(path);\r
+#if 0\r
        while (filefinder.NextFile(subpath, &isDir))\r
        {\r
                if (!isDir)\r
@@ -683,6 +684,7 @@ CString     CPatch::CheckPatchPath(const CString& path)
                if (CountMatches(subpath) > (GetNumberOfFiles()/3))\r
                        return subpath;\r
        }\r
+#endif\r
        \r
        // if a patch file only contains newly added files\r
        // we can't really find the correct path.\r
index 1541657..0e13672 100644 (file)
@@ -19,7 +19,7 @@
 #include "stdafx.h"\r
 #include "TortoiseMerge.h"\r
 #include "DirFileEnum.h"\r
-#include "version.h"\r
+#include "..\\version.h"\r
 #include "AppUtils.h"\r
 #include "PathUtils.h"\r
 #include "SetMainPage.h"\r
index 68f5131..f478f0b 100644 (file)
@@ -22,7 +22,7 @@
 #include "MainFrm.h"\r
 #include "AboutDlg.h"\r
 #include "CmdLineParser.h"\r
-#include "version.h"\r
+#include "..\\version.h"\r
 #include "AppUtils.h"\r
 #include "PathUtils.h"\r
 #include "BrowseFolder.h"\r
@@ -47,7 +47,7 @@ CTortoiseMergeApp::CTortoiseMergeApp()
 \r
 // The one and only CTortoiseMergeApp object\r
 CTortoiseMergeApp theApp;\r
-CCrashReport g_crasher("crashreports@tortoisesvn.tigris.org", "Crash Report for TortoiseMerge " APP_X64_STRING " : " STRPRODUCTVER, TRUE);\r
+//CCrashReport g_crasher("crashreports@tortoisesvn.tigris.org", "Crash Report for TortoiseMerge " APP_X64_STRING " : " STRPRODUCTVER, TRUE);\r
 \r
 // CTortoiseMergeApp initialization\r
 BOOL CTortoiseMergeApp::InitInstance()\r
index e3223ba..de2ff97 100644 (file)
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="Crypt32.lib shlwapi.lib Version.lib ../../ext/Subversion\release_win32\libsvn_diff-nonet.lib ../../ext/Subversion\release_win32\libsvn_subr-nonet.lib ../../ext/Subversion\release_win32\libsvn_client-nonet.lib ../../ext/apr\release_win32\libapr_tsvn.lib ../../ext/apr-util\release_win32\libaprutil_tsvn.lib ../../ext/libintl/libintl3-win32/lib/intl3_tsvn.lib ../../ext/Subversion\release_win32\libsvn_wc-nonet.lib ../../ext/Subversion\release_win32\libsvn_delta-nonet.lib ../../ext/apr-util\xml\expat\lib\release_win32\xml.lib"\r
+                               AdditionalDependencies="Crypt32.lib shlwapi.lib Version.lib"\r
                                LinkIncremental="1"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r