Boost logo

Boost-Commit :

Subject: [Boost-commit] svn:boost r64767 - in sandbox/SOC/2010/process: boost/process/detail libs/process/test libs/process/test/inclusion
From: boris_at_[hidden]
Date: 2010-08-12 14:07:31


Author: bschaeling
Date: 2010-08-12 14:07:21 EDT (Thu, 12 Aug 2010)
New Revision: 64767
URL: http://svn.boost.org/trac/boost/changeset/64767

Log:
Added inclusion test cases
Added:
   sandbox/SOC/2010/process/libs/process/test/inclusion/
   sandbox/SOC/2010/process/libs/process/test/inclusion/child.cpp (contents, props changed)
   sandbox/SOC/2010/process/libs/process/test/inclusion/config.cpp (contents, props changed)
   sandbox/SOC/2010/process/libs/process/test/inclusion/context.cpp (contents, props changed)
   sandbox/SOC/2010/process/libs/process/test/inclusion/detail_basic_status.cpp (contents, props changed)
   sandbox/SOC/2010/process/libs/process/test/inclusion/detail_basic_status_service.cpp (contents, props changed)
   sandbox/SOC/2010/process/libs/process/test/inclusion/detail_posix_helpers.cpp (contents, props changed)
   sandbox/SOC/2010/process/libs/process/test/inclusion/detail_status_impl.cpp (contents, props changed)
   sandbox/SOC/2010/process/libs/process/test/inclusion/detail_systembuf.cpp (contents, props changed)
   sandbox/SOC/2010/process/libs/process/test/inclusion/detail_windows_helpers.cpp (contents, props changed)
   sandbox/SOC/2010/process/libs/process/test/inclusion/environment.cpp (contents, props changed)
   sandbox/SOC/2010/process/libs/process/test/inclusion/handle.cpp (contents, props changed)
   sandbox/SOC/2010/process/libs/process/test/inclusion/operations.cpp (contents, props changed)
   sandbox/SOC/2010/process/libs/process/test/inclusion/pid_type.cpp (contents, props changed)
   sandbox/SOC/2010/process/libs/process/test/inclusion/pipe.cpp (contents, props changed)
   sandbox/SOC/2010/process/libs/process/test/inclusion/pistream.cpp (contents, props changed)
   sandbox/SOC/2010/process/libs/process/test/inclusion/postream.cpp (contents, props changed)
   sandbox/SOC/2010/process/libs/process/test/inclusion/process.cpp (contents, props changed)
   sandbox/SOC/2010/process/libs/process/test/inclusion/self.cpp (contents, props changed)
   sandbox/SOC/2010/process/libs/process/test/inclusion/status.cpp (contents, props changed)
   sandbox/SOC/2010/process/libs/process/test/inclusion/stream_behavior.cpp (contents, props changed)
Text files modified:
   sandbox/SOC/2010/process/boost/process/detail/basic_status_service.hpp | 19 ++++++++++---------
   sandbox/SOC/2010/process/boost/process/detail/status_impl.hpp | 8 +++++---
   sandbox/SOC/2010/process/libs/process/test/Jamfile.jam | 5 +++++
   3 files changed, 20 insertions(+), 12 deletions(-)

Modified: sandbox/SOC/2010/process/boost/process/detail/basic_status_service.hpp
==============================================================================
--- sandbox/SOC/2010/process/boost/process/detail/basic_status_service.hpp (original)
+++ sandbox/SOC/2010/process/boost/process/detail/basic_status_service.hpp 2010-08-12 14:07:21 EDT (Thu, 12 Aug 2010)
@@ -21,6 +21,16 @@
 #define BOOST_PROCESS_DETAIL_BASIC_STATUS_SERVICE_HPP
 
 #include <boost/process/config.hpp>
+
+#if defined(BOOST_POSIX_API)
+# include <sys/types.h>
+# include <sys/wait.h>
+#elif defined(BOOST_WINDOWS_API)
+# include <windows.h>
+#else
+# error "Unsupported platform."
+#endif
+
 #include <boost/process/pid_type.hpp>
 #include <boost/process/detail/status_impl.hpp>
 #include <boost/asio.hpp>
@@ -34,15 +44,6 @@
 #include <vector>
 #include <algorithm>
 
-#if defined(BOOST_POSIX_API)
-# include <sys/types.h>
-# include <sys/wait.h>
-#elif defined(BOOST_WINDOWS_API)
-# include <windows.h>
-#else
-# error "Unsupported platform."
-#endif
-
 namespace boost {
 namespace process {
 namespace detail {

Modified: sandbox/SOC/2010/process/boost/process/detail/status_impl.hpp
==============================================================================
--- sandbox/SOC/2010/process/boost/process/detail/status_impl.hpp (original)
+++ sandbox/SOC/2010/process/boost/process/detail/status_impl.hpp 2010-08-12 14:07:21 EDT (Thu, 12 Aug 2010)
@@ -21,9 +21,6 @@
 #define BOOST_PROCESS_DETAIL_STATUS_IMPL_HPP
 
 #include <boost/process/config.hpp>
-#include <boost/system/error_code.hpp>
-#include <boost/ptr_container/ptr_unordered_map.hpp>
-#include <algorithm>
 
 #if defined(BOOST_POSIX_API)
 # include <sys/types.h>
@@ -34,6 +31,11 @@
 # error "Unsupported platform."
 #endif
 
+#include <boost/process/pid_type.hpp>
+#include <boost/system/error_code.hpp>
+#include <boost/ptr_container/ptr_unordered_map.hpp>
+#include <algorithm>
+
 namespace boost {
 namespace process {
 namespace detail {

Modified: sandbox/SOC/2010/process/libs/process/test/Jamfile.jam
==============================================================================
--- sandbox/SOC/2010/process/libs/process/test/Jamfile.jam (original)
+++ sandbox/SOC/2010/process/libs/process/test/Jamfile.jam 2010-08-12 14:07:21 EDT (Thu, 12 Aug 2010)
@@ -26,6 +26,11 @@
 
 using testing ;
 
+for local i in [ glob inclusion/*.cpp ]
+{
+ compile $(i) : : include_$(i:B) ;
+}
+
 run environment.cpp bfs ;
 run handle.cpp bfs ;
 run self.cpp bfs ;

Added: sandbox/SOC/2010/process/libs/process/test/inclusion/child.cpp
==============================================================================
--- (empty file)
+++ sandbox/SOC/2010/process/libs/process/test/inclusion/child.cpp 2010-08-12 14:07:21 EDT (Thu, 12 Aug 2010)
@@ -0,0 +1,14 @@
+//
+// Boost.Process
+// ~~~~~~~~~~~~~
+//
+// Copyright (c) 2006, 2007 Julio M. Merino Vidal
+// Copyright (c) 2008 Ilya Sokolov, Boris Schaeling
+// Copyright (c) 2009 Boris Schaeling
+// Copyright (c) 2010 Felipe Tanus, Boris Schaeling
+//
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//
+
+#include <boost/process/child.hpp>

Added: sandbox/SOC/2010/process/libs/process/test/inclusion/config.cpp
==============================================================================
--- (empty file)
+++ sandbox/SOC/2010/process/libs/process/test/inclusion/config.cpp 2010-08-12 14:07:21 EDT (Thu, 12 Aug 2010)
@@ -0,0 +1,14 @@
+//
+// Boost.Process
+// ~~~~~~~~~~~~~
+//
+// Copyright (c) 2006, 2007 Julio M. Merino Vidal
+// Copyright (c) 2008 Ilya Sokolov, Boris Schaeling
+// Copyright (c) 2009 Boris Schaeling
+// Copyright (c) 2010 Felipe Tanus, Boris Schaeling
+//
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//
+
+#include <boost/process/config.hpp>

Added: sandbox/SOC/2010/process/libs/process/test/inclusion/context.cpp
==============================================================================
--- (empty file)
+++ sandbox/SOC/2010/process/libs/process/test/inclusion/context.cpp 2010-08-12 14:07:21 EDT (Thu, 12 Aug 2010)
@@ -0,0 +1,14 @@
+//
+// Boost.Process
+// ~~~~~~~~~~~~~
+//
+// Copyright (c) 2006, 2007 Julio M. Merino Vidal
+// Copyright (c) 2008 Ilya Sokolov, Boris Schaeling
+// Copyright (c) 2009 Boris Schaeling
+// Copyright (c) 2010 Felipe Tanus, Boris Schaeling
+//
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//
+
+#include <boost/process/context.hpp>

Added: sandbox/SOC/2010/process/libs/process/test/inclusion/detail_basic_status.cpp
==============================================================================
--- (empty file)
+++ sandbox/SOC/2010/process/libs/process/test/inclusion/detail_basic_status.cpp 2010-08-12 14:07:21 EDT (Thu, 12 Aug 2010)
@@ -0,0 +1,14 @@
+//
+// Boost.Process
+// ~~~~~~~~~~~~~
+//
+// Copyright (c) 2006, 2007 Julio M. Merino Vidal
+// Copyright (c) 2008 Ilya Sokolov, Boris Schaeling
+// Copyright (c) 2009 Boris Schaeling
+// Copyright (c) 2010 Felipe Tanus, Boris Schaeling
+//
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//
+
+#include <boost/process/detail/basic_status.hpp>

Added: sandbox/SOC/2010/process/libs/process/test/inclusion/detail_basic_status_service.cpp
==============================================================================
--- (empty file)
+++ sandbox/SOC/2010/process/libs/process/test/inclusion/detail_basic_status_service.cpp 2010-08-12 14:07:21 EDT (Thu, 12 Aug 2010)
@@ -0,0 +1,14 @@
+//
+// Boost.Process
+// ~~~~~~~~~~~~~
+//
+// Copyright (c) 2006, 2007 Julio M. Merino Vidal
+// Copyright (c) 2008 Ilya Sokolov, Boris Schaeling
+// Copyright (c) 2009 Boris Schaeling
+// Copyright (c) 2010 Felipe Tanus, Boris Schaeling
+//
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//
+
+#include <boost/process/detail/basic_status_service.hpp>

Added: sandbox/SOC/2010/process/libs/process/test/inclusion/detail_posix_helpers.cpp
==============================================================================
--- (empty file)
+++ sandbox/SOC/2010/process/libs/process/test/inclusion/detail_posix_helpers.cpp 2010-08-12 14:07:21 EDT (Thu, 12 Aug 2010)
@@ -0,0 +1,14 @@
+//
+// Boost.Process
+// ~~~~~~~~~~~~~
+//
+// Copyright (c) 2006, 2007 Julio M. Merino Vidal
+// Copyright (c) 2008 Ilya Sokolov, Boris Schaeling
+// Copyright (c) 2009 Boris Schaeling
+// Copyright (c) 2010 Felipe Tanus, Boris Schaeling
+//
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//
+
+#include <boost/process/detail/posix_helpers.hpp>

Added: sandbox/SOC/2010/process/libs/process/test/inclusion/detail_status_impl.cpp
==============================================================================
--- (empty file)
+++ sandbox/SOC/2010/process/libs/process/test/inclusion/detail_status_impl.cpp 2010-08-12 14:07:21 EDT (Thu, 12 Aug 2010)
@@ -0,0 +1,14 @@
+//
+// Boost.Process
+// ~~~~~~~~~~~~~
+//
+// Copyright (c) 2006, 2007 Julio M. Merino Vidal
+// Copyright (c) 2008 Ilya Sokolov, Boris Schaeling
+// Copyright (c) 2009 Boris Schaeling
+// Copyright (c) 2010 Felipe Tanus, Boris Schaeling
+//
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//
+
+#include <boost/process/detail/status_impl.hpp>

Added: sandbox/SOC/2010/process/libs/process/test/inclusion/detail_systembuf.cpp
==============================================================================
--- (empty file)
+++ sandbox/SOC/2010/process/libs/process/test/inclusion/detail_systembuf.cpp 2010-08-12 14:07:21 EDT (Thu, 12 Aug 2010)
@@ -0,0 +1,14 @@
+//
+// Boost.Process
+// ~~~~~~~~~~~~~
+//
+// Copyright (c) 2006, 2007 Julio M. Merino Vidal
+// Copyright (c) 2008 Ilya Sokolov, Boris Schaeling
+// Copyright (c) 2009 Boris Schaeling
+// Copyright (c) 2010 Felipe Tanus, Boris Schaeling
+//
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//
+
+#include <boost/process/detail/systembuf.hpp>

Added: sandbox/SOC/2010/process/libs/process/test/inclusion/detail_windows_helpers.cpp
==============================================================================
--- (empty file)
+++ sandbox/SOC/2010/process/libs/process/test/inclusion/detail_windows_helpers.cpp 2010-08-12 14:07:21 EDT (Thu, 12 Aug 2010)
@@ -0,0 +1,14 @@
+//
+// Boost.Process
+// ~~~~~~~~~~~~~
+//
+// Copyright (c) 2006, 2007 Julio M. Merino Vidal
+// Copyright (c) 2008 Ilya Sokolov, Boris Schaeling
+// Copyright (c) 2009 Boris Schaeling
+// Copyright (c) 2010 Felipe Tanus, Boris Schaeling
+//
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//
+
+#include <boost/process/detail/windows_helpers.hpp>

Added: sandbox/SOC/2010/process/libs/process/test/inclusion/environment.cpp
==============================================================================
--- (empty file)
+++ sandbox/SOC/2010/process/libs/process/test/inclusion/environment.cpp 2010-08-12 14:07:21 EDT (Thu, 12 Aug 2010)
@@ -0,0 +1,14 @@
+//
+// Boost.Process
+// ~~~~~~~~~~~~~
+//
+// Copyright (c) 2006, 2007 Julio M. Merino Vidal
+// Copyright (c) 2008 Ilya Sokolov, Boris Schaeling
+// Copyright (c) 2009 Boris Schaeling
+// Copyright (c) 2010 Felipe Tanus, Boris Schaeling
+//
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//
+
+#include <boost/process/environment.hpp>

Added: sandbox/SOC/2010/process/libs/process/test/inclusion/handle.cpp
==============================================================================
--- (empty file)
+++ sandbox/SOC/2010/process/libs/process/test/inclusion/handle.cpp 2010-08-12 14:07:21 EDT (Thu, 12 Aug 2010)
@@ -0,0 +1,14 @@
+//
+// Boost.Process
+// ~~~~~~~~~~~~~
+//
+// Copyright (c) 2006, 2007 Julio M. Merino Vidal
+// Copyright (c) 2008 Ilya Sokolov, Boris Schaeling
+// Copyright (c) 2009 Boris Schaeling
+// Copyright (c) 2010 Felipe Tanus, Boris Schaeling
+//
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//
+
+#include <boost/process/handle.hpp>

Added: sandbox/SOC/2010/process/libs/process/test/inclusion/operations.cpp
==============================================================================
--- (empty file)
+++ sandbox/SOC/2010/process/libs/process/test/inclusion/operations.cpp 2010-08-12 14:07:21 EDT (Thu, 12 Aug 2010)
@@ -0,0 +1,14 @@
+//
+// Boost.Process
+// ~~~~~~~~~~~~~
+//
+// Copyright (c) 2006, 2007 Julio M. Merino Vidal
+// Copyright (c) 2008 Ilya Sokolov, Boris Schaeling
+// Copyright (c) 2009 Boris Schaeling
+// Copyright (c) 2010 Felipe Tanus, Boris Schaeling
+//
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//
+
+#include <boost/process/operations.hpp>

Added: sandbox/SOC/2010/process/libs/process/test/inclusion/pid_type.cpp
==============================================================================
--- (empty file)
+++ sandbox/SOC/2010/process/libs/process/test/inclusion/pid_type.cpp 2010-08-12 14:07:21 EDT (Thu, 12 Aug 2010)
@@ -0,0 +1,14 @@
+//
+// Boost.Process
+// ~~~~~~~~~~~~~
+//
+// Copyright (c) 2006, 2007 Julio M. Merino Vidal
+// Copyright (c) 2008 Ilya Sokolov, Boris Schaeling
+// Copyright (c) 2009 Boris Schaeling
+// Copyright (c) 2010 Felipe Tanus, Boris Schaeling
+//
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//
+
+#include <boost/process/pid_type.hpp>

Added: sandbox/SOC/2010/process/libs/process/test/inclusion/pipe.cpp
==============================================================================
--- (empty file)
+++ sandbox/SOC/2010/process/libs/process/test/inclusion/pipe.cpp 2010-08-12 14:07:21 EDT (Thu, 12 Aug 2010)
@@ -0,0 +1,14 @@
+//
+// Boost.Process
+// ~~~~~~~~~~~~~
+//
+// Copyright (c) 2006, 2007 Julio M. Merino Vidal
+// Copyright (c) 2008 Ilya Sokolov, Boris Schaeling
+// Copyright (c) 2009 Boris Schaeling
+// Copyright (c) 2010 Felipe Tanus, Boris Schaeling
+//
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//
+
+#include <boost/process/pipe.hpp>

Added: sandbox/SOC/2010/process/libs/process/test/inclusion/pistream.cpp
==============================================================================
--- (empty file)
+++ sandbox/SOC/2010/process/libs/process/test/inclusion/pistream.cpp 2010-08-12 14:07:21 EDT (Thu, 12 Aug 2010)
@@ -0,0 +1,14 @@
+//
+// Boost.Process
+// ~~~~~~~~~~~~~
+//
+// Copyright (c) 2006, 2007 Julio M. Merino Vidal
+// Copyright (c) 2008 Ilya Sokolov, Boris Schaeling
+// Copyright (c) 2009 Boris Schaeling
+// Copyright (c) 2010 Felipe Tanus, Boris Schaeling
+//
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//
+
+#include <boost/process/pistream.hpp>

Added: sandbox/SOC/2010/process/libs/process/test/inclusion/postream.cpp
==============================================================================
--- (empty file)
+++ sandbox/SOC/2010/process/libs/process/test/inclusion/postream.cpp 2010-08-12 14:07:21 EDT (Thu, 12 Aug 2010)
@@ -0,0 +1,14 @@
+//
+// Boost.Process
+// ~~~~~~~~~~~~~
+//
+// Copyright (c) 2006, 2007 Julio M. Merino Vidal
+// Copyright (c) 2008 Ilya Sokolov, Boris Schaeling
+// Copyright (c) 2009 Boris Schaeling
+// Copyright (c) 2010 Felipe Tanus, Boris Schaeling
+//
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//
+
+#include <boost/process/postream.hpp>

Added: sandbox/SOC/2010/process/libs/process/test/inclusion/process.cpp
==============================================================================
--- (empty file)
+++ sandbox/SOC/2010/process/libs/process/test/inclusion/process.cpp 2010-08-12 14:07:21 EDT (Thu, 12 Aug 2010)
@@ -0,0 +1,14 @@
+//
+// Boost.Process
+// ~~~~~~~~~~~~~
+//
+// Copyright (c) 2006, 2007 Julio M. Merino Vidal
+// Copyright (c) 2008 Ilya Sokolov, Boris Schaeling
+// Copyright (c) 2009 Boris Schaeling
+// Copyright (c) 2010 Felipe Tanus, Boris Schaeling
+//
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//
+
+#include <boost/process/process.hpp>

Added: sandbox/SOC/2010/process/libs/process/test/inclusion/self.cpp
==============================================================================
--- (empty file)
+++ sandbox/SOC/2010/process/libs/process/test/inclusion/self.cpp 2010-08-12 14:07:21 EDT (Thu, 12 Aug 2010)
@@ -0,0 +1,14 @@
+//
+// Boost.Process
+// ~~~~~~~~~~~~~
+//
+// Copyright (c) 2006, 2007 Julio M. Merino Vidal
+// Copyright (c) 2008 Ilya Sokolov, Boris Schaeling
+// Copyright (c) 2009 Boris Schaeling
+// Copyright (c) 2010 Felipe Tanus, Boris Schaeling
+//
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//
+
+#include <boost/process/self.hpp>

Added: sandbox/SOC/2010/process/libs/process/test/inclusion/status.cpp
==============================================================================
--- (empty file)
+++ sandbox/SOC/2010/process/libs/process/test/inclusion/status.cpp 2010-08-12 14:07:21 EDT (Thu, 12 Aug 2010)
@@ -0,0 +1,14 @@
+//
+// Boost.Process
+// ~~~~~~~~~~~~~
+//
+// Copyright (c) 2006, 2007 Julio M. Merino Vidal
+// Copyright (c) 2008 Ilya Sokolov, Boris Schaeling
+// Copyright (c) 2009 Boris Schaeling
+// Copyright (c) 2010 Felipe Tanus, Boris Schaeling
+//
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//
+
+#include <boost/process/status.hpp>

Added: sandbox/SOC/2010/process/libs/process/test/inclusion/stream_behavior.cpp
==============================================================================
--- (empty file)
+++ sandbox/SOC/2010/process/libs/process/test/inclusion/stream_behavior.cpp 2010-08-12 14:07:21 EDT (Thu, 12 Aug 2010)
@@ -0,0 +1,14 @@
+//
+// Boost.Process
+// ~~~~~~~~~~~~~
+//
+// Copyright (c) 2006, 2007 Julio M. Merino Vidal
+// Copyright (c) 2008 Ilya Sokolov, Boris Schaeling
+// Copyright (c) 2009 Boris Schaeling
+// Copyright (c) 2010 Felipe Tanus, Boris Schaeling
+//
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//
+
+#include <boost/process/stream_behavior.hpp>


Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk