[Monotone-commits-diffs] net.venge.monotone.source-tree-cleanup: 5f7e4f9edf0a1ec26926f82c35ed27777bd01c8d

[code]

revision:            5f7e4f9edf0a1ec26926f82c35ed27777bd01c8d
date:                2011-01-03T02:22:00
author:              address@hidden
branch:              net.venge.monotone.source-tree-cleanup
changelog:
Fix compilation issues on Win32; all tests pass

* Makefile.am (po/$(PACKAGE).pot): add 'mkdir -p po'

* src/sanity.cc: boost/circular_buffer.hpp is in local include path for Boost 
1.34

* src/win32/ssh_agent_platform.hh: fix include path for numeric_vocab.hh

manifest:
format_version "1"

new_manifest [7d5b2b5f996304815b405c08bfc5fe561d491708]

old_revision [5bcf9e7e7d0bf502ee3d21f63b5c0eabc1094ea4]

patch "Makefile.am"
 from [a82e2b163643b509496a79129231ceb3e0a1193a]
   to [6e44bb441c83d3cd7b352a83a5a2817e002fa762]

patch "src/sanity.cc"
 from [6ea2aba0cee2ff0feaf6eacb93327e340fcc982b]
   to [17e9e70774f064cfb8ef4e25075a1f493b63cd78]

patch "src/win32/ssh_agent_platform.hh"
 from [5b62f5f8d1e4158a47839d3b0005531d4d5a3c83]
   to [c5c3bc374ef21c09fa89bc5831cb9579505e51ec]
============================================================
--- Makefile.am	a82e2b163643b509496a79129231ceb3e0a1193a
+++ Makefile.am	6e44bb441c83d3cd7b352a83a5a2817e002fa762
@@ -455,6 +455,7 @@ po/$(PACKAGE).pot: $(POTFILES)
 	src/monotone.cc src/std_hooks.lua
 
 po/$(PACKAGE).pot: $(POTFILES)
+	[ -d po ] || mkdir -p po
 	$(V_xgettext)$(XGETTEXT) -o$@ -D. -D$(top_srcdir) -cTRANSLATORS: \
 	  --copyright-holder='$(COPYRIGHT_HOLDER)' \
 	  --msgid-bugs-address='$(MSGID_BUGS_ADDRESS)' \
============================================================
--- src/sanity.cc	6ea2aba0cee2ff0feaf6eacb93327e340fcc982b
+++ src/sanity.cc	17e9e70774f064cfb8ef4e25075a1f493b63cd78
@@ -15,8 +15,10 @@
 #include "vector.hh"
 
 #include <boost/format.hpp>
-#include <boost/circular_buffer.hpp>
 
+// circular_buffer is not in Boost 1.34; it's in monotone/boost.
+#include "boost/circular_buffer.hpp"
+
 #include "lexical_cast.hh"
 #include "constants.hh"
 #include "platform.hh"
============================================================
--- src/win32/ssh_agent_platform.hh	5b62f5f8d1e4158a47839d3b0005531d4d5a3c83
+++ src/win32/ssh_agent_platform.hh	c5c3bc374ef21c09fa89bc5831cb9579505e51ec
@@ -10,7 +10,7 @@
 #ifndef __SSH_AGENT_PLATFORM_HH__
 #define __SSH_AGENT_PLATFORM_HH__
 
-#include "numeric_vocab.hh"
+#include "../numeric_vocab.hh"
 #define WIN32_LEAN_AND_MEAN // no gui definitions
 #include <windows.h>