Compiling WinCVS 2.0.2.4 (build4) with Visual Studio .NET 2003
"cristianadam" <[email protected]>
| Newsgroups | gmane.comp.version-control.cvs.gui.user |
|---|---|
| Message-ID | <[email protected]> |
Hi all,
I've compiled WinCVS 2.0.2.4 (build 4) with Visual Studio .NET 2003,
but the binary doesn't work correctly. I mean I don't get any cvs.exe
output.
Here are the changes I made in order to get it to compile:
Only in WinCvs2_0_2-4_Src.new/WinCvs/CJLib/CJLibrary: CJLibrary.vcproj
Only in WinCvs2_0_2-4_Src.new/WinCvs/CJLib/CJLibrary: Release
Only in WinCvs2_0_2-4_Src.new/WinCvs/CJLib/CJLibrary: Release_Unicode
Only in WinCvs2_0_2-4_Src.new/WinCvs/CJLib: lib
diff -aur WinCvs2_0_2-4_Src/WinCvs/GraphView.h
WinCvs2_0_2-4_Src.new/WinCvs/GraphView.h
--- WinCvs2_0_2-4_Src/WinCvs/GraphView.h Fri Jun 11 21:19:28 2004
+++ WinCvs2_0_2-4_Src.new/WinCvs/GraphView.h Fri Nov 10 02:08:00 2006
@@ -82,14 +82,14 @@
// Methods
inline CWinLogData* GetData(CLogNode* node);
- void CollectMergePointPairPass1(vector<pair<CWinLogData*,
CWinLogData*> >& mergePair);
- void CollectMergePointPairPass2(vector<pair<CWinLogData*,
CWinLogData*> >& mergePair);
+ void
CollectMergePointPairPass1(std::vector<std::pair<CWinLogData*,
CWinLogData*> >& mergePair);
+ void
CollectMergePointPairPass2(std::vector<std::pair<CWinLogData*,
CWinLogData*> >& mergePair);
virtual void UpdateSelf(CDC& dc, EntnodeData* entryInfo) = 0;
virtual CSize GetBoundsSelf(CDC& dc, EntnodeData* entryInfo) = 0;
- virtual void
CollectMergePointPairPass1Self(vector<pair<CWinLogData*, CWinLogData*>
>& mergePair);
- virtual void
CollectMergePointPairPass2Self(vector<pair<CWinLogData*, CWinLogData*>
>& mergePair);
+ virtual void
CollectMergePointPairPass1Self(std::vector<std::pair<CWinLogData*,
CWinLogData*> >& mergePair);
+ virtual void
CollectMergePointPairPass2Self(std::vector<std::pair<CWinLogData*,
CWinLogData*> >& mergePair);
public:
// Interface
@@ -144,8 +144,8 @@
virtual void UpdateSelf(CDC& dc, EntnodeData* entryInfo);
virtual CSize GetBoundsSelf(CDC& dc, EntnodeData* entryInfo);
- virtual void
CollectMergePointPairPass1Self(vector<pair<CWinLogData*, CWinLogData*>
>& mergePair);
- virtual void
CollectMergePointPairPass2Self(vector<pair<CWinLogData*, CWinLogData*>
>& mergePair);
+ virtual void
CollectMergePointPairPass1Self(std::vector<std::pair<CWinLogData*,
CWinLogData*> >& mergePair);
+ virtual void
CollectMergePointPairPass2Self(std::vector<std::pair<CWinLogData*,
CWinLogData*> >& mergePair);
};
/// Windows log tag node data
Only in WinCvs2_0_2-4_Src.new/WinCvs/HHelp: wincvs.chm
Only in WinCvs2_0_2-4_Src.new/WinCvs/HHelp: wincvs.h
Only in WinCvs2_0_2-4_Src.new/WinCvs/HHelp: wincvs.hm
Only in WinCvs2_0_2-4_Src.new/WinCvs/HHelp: wincvs.log
diff -aur WinCvs2_0_2-4_Src/WinCvs/HHelpSupport.cpp
WinCvs2_0_2-4_Src.new/WinCvs/HHelpSupport.cpp
--- WinCvs2_0_2-4_Src/WinCvs/HHelpSupport.cpp Mon Aug 15 02:21:24 2005
+++ WinCvs2_0_2-4_Src.new/WinCvs/HHelpSupport.cpp Fri Nov 10 17:57:54 2006
@@ -160,10 +160,10 @@
tHelpIDsData helpIDs;
CreateHelpIDsData(helpIDs);
- return HtmlHelp((HWND)pHelpInfo->hItemHandle,
+ return ::HtmlHelp((HWND)pHelpInfo->hItemHandle,
CHHelpSupport::GetHelpFilePath(),
HH_TP_HELP_WM_HELP,
- (DWORD)(LPVOID)helpIDs.begin()) != NULL;
+ (DWORD)(LPVOID)&*helpIDs.begin()) != NULL;
}
return TRUE;
@@ -202,7 +202,7 @@
HtmlHelp(pWnd->GetSafeHwnd(),
CHHelpSupport::GetHelpFilePath(),
HH_TP_HELP_CONTEXTMENU,
- (DWORD)(LPVOID)helpIDs.begin());
+ (DWORD)(LPVOID)&*helpIDs.begin());
}
}
diff -aur WinCvs2_0_2-4_Src/WinCvs/MainFrm.cpp
WinCvs2_0_2-4_Src.new/WinCvs/MainFrm.cpp
--- WinCvs2_0_2-4_Src/WinCvs/MainFrm.cpp Tue Jun 21 00:48:38 2005
+++ WinCvs2_0_2-4_Src.new/WinCvs/MainFrm.cpp Fri Nov 10 17:36:37 2006
@@ -1025,7 +1025,7 @@
/// WinHelp virtual override, call HTML Help instead of WinHelp
void CMainFrame::WinHelp(DWORD dwData, UINT nCmd)
{
- HtmlHelp(*GetDesktopWindow(), AfxGetApp()->m_pszHelpFilePath,
HH_HELP_CONTEXT, nCmd == HELP_CONTEXT ? dwData : 0);
+ ::HtmlHelp(*GetDesktopWindow(), AfxGetApp()->m_pszHelpFilePath,
HH_HELP_CONTEXT, nCmd == HELP_CONTEXT ? dwData : 0);
//CCJMDIFrameWnd::WinHelp(dwData, nCmd);
}
diff -aur WinCvs2_0_2-4_Src/WinCvs/wincvs.cpp
WinCvs2_0_2-4_Src.new/WinCvs/wincvs.cpp
--- WinCvs2_0_2-4_Src/WinCvs/wincvs.cpp Mon Aug 15 02:13:18 2005
+++ WinCvs2_0_2-4_Src.new/WinCvs/wincvs.cpp Fri Nov 10 17:15:59 2006
@@ -1394,7 +1394,7 @@
CStr cvsHelpPath = uppath;
cvsHelpPath += "cvs.chm";
- if( HtmlHelp(GetDesktopWindow(), cvsHelpPath, HH_DISPLAY_TOPIC, 0)
== NULL )
+ if( ::HtmlHelp(GetDesktopWindow(), cvsHelpPath,
HH_DISPLAY_TOPIC, 0) == NULL )
{
CvsAlert cvsAlert(kCvsAlertStopIcon,
_i18n("Unable to open CVS Documentation file."),
Only in WinCvs2_0_2-4_Src.new/WinCvs: wincvs.ncb
Only in WinCvs2_0_2-4_Src.new/WinCvs: wincvs.sln
Only in WinCvs2_0_2-4_Src.new/WinCvs: wincvs.suo
Only in WinCvs2_0_2-4_Src.new/WinCvs: wincvs.vcproj
diff -aur WinCvs2_0_2-4_Src/common/MultiString.cpp
WinCvs2_0_2-4_Src.new/common/MultiString.cpp
--- WinCvs2_0_2-4_Src/common/MultiString.cpp Sat Jul 17 03:32:26 2004
+++ WinCvs2_0_2-4_Src.new/common/MultiString.cpp Fri Nov 10 18:02:34 2006
@@ -151,7 +151,7 @@
\note The string classes have too many operators to use std::find
*/
template<class T>
-typename TMString<T>::list_t::const_iterator TMString<T>::Find(const
char* instr) const
+typename std::vector<T>::const_iterator TMString<T>::Find(const char*
instr) const
{
#if (__GNUC__ > 2)
// prevent compiler warnings if gcc 3.x is used
diff -aur WinCvs2_0_2-4_Src/common/MultiString.h
WinCvs2_0_2-4_Src.new/common/MultiString.h
--- WinCvs2_0_2-4_Src/common/MultiString.h Sat Jul 17 03:32:26 2004
+++ WinCvs2_0_2-4_Src.new/common/MultiString.h Fri Nov 10 02:04:49 2006
@@ -96,8 +96,14 @@
typename list_t::const_iterator Find(const char* instr) const;
inline const list_t& GetList(void) const;
- inline typename list_t::const_iterator begin() const;
- inline typename list_t::const_iterator end() const;
+ typename list_t::const_iterator begin() const
+ {
+ return GetList().begin();
+ }
+ typename list_t::const_iterator end() const
+ {
+ return GetList().end();
+ }
protected:
// Data members
@@ -250,18 +256,6 @@
inline const typename TMString<T>::list_t& TMString<T>::GetList(void)
const
{
return m_allStrs;
-}
-
-template<class T>
-inline typename TMString<T>::list_t::const_iterator
TMString<T>::begin() const
-{
- return GetList().begin();
-}
-
-template<class T>
-inline typename TMString<T>::list_t::const_iterator
TMString<T>::end() const
-{
- return GetList().end();
}
template<class T>
Only in WinCvs2_0_2-4_Src.new/cvstree: Release
Only in WinCvs2_0_2-4_Src.new/cvstree: cvstree.vcproj
diff -aur WinCvs2_0_2-4_Src/rf/ustr.cpp WinCvs2_0_2-4_Src.new/rf/ustr.cpp
--- WinCvs2_0_2-4_Src/rf/ustr.cpp Tue May 31 00:09:18 2005
+++ WinCvs2_0_2-4_Src.new/rf/ustr.cpp Fri Nov 10 18:03:08 2006
@@ -1056,3 +1056,9 @@
return *this;
}
+
+UStr operator + (const UStr& str, const char* addToStr)
+{
+ UStr newStr(str);
+ return newStr << addToStr;
+}
diff -aur WinCvs2_0_2-4_Src/rf/ustr.h WinCvs2_0_2-4_Src.new/rf/ustr.h
--- WinCvs2_0_2-4_Src/rf/ustr.h Thu Dec 9 09:15:14 2004
+++ WinCvs2_0_2-4_Src.new/rf/ustr.h Fri Nov 10 18:03:04 2006
@@ -220,6 +220,8 @@
UStr& trim (char c = ' ');
UStr& rtrim (char c);
UStr& rtrim (const char *MatchList);
+
+ friend UStr operator + (const UStr& str, const char* addToStr);
};
//////////////////////////////////////////////////////////////////////////