|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r62662 - in branches/filesystem3: boost/filesystem boost/filesystem/v3 libs/filesystem/build libs/filesystem/test libs/filesystem/v3/test
From: bdawes_at_[hidden]
Date: 2010-06-09 11:07:05
Author: bemandawes
Date: 2010-06-09 11:07:03 EDT (Wed, 09 Jun 2010)
New Revision: 62662
URL: http://svn.boost.org/trac/boost/changeset/62662
Log:
Add Build and Test support. Build is working, a few tests are working.
Added:
branches/filesystem3/boost/filesystem/config.hpp (contents, props changed)
branches/filesystem3/boost/filesystem/convenience.hpp (contents, props changed)
branches/filesystem3/boost/filesystem/exception.hpp (contents, props changed)
branches/filesystem3/boost/filesystem/operations.hpp (contents, props changed)
branches/filesystem3/boost/filesystem/path.hpp (contents, props changed)
branches/filesystem3/libs/filesystem/test/
branches/filesystem3/libs/filesystem/test/Jamfile.v2 (contents, props changed)
Text files modified:
branches/filesystem3/boost/filesystem/v3/operations.hpp | 13 ++++++++++++-
branches/filesystem3/boost/filesystem/v3/path_traits.hpp | 12 ++++++++++++
branches/filesystem3/libs/filesystem/build/Jamfile.v2 | 26 +++++++-------------------
branches/filesystem3/libs/filesystem/v3/test/convenience_test.cpp | 2 ++
branches/filesystem3/libs/filesystem/v3/test/deprecated_test.cpp | 2 ++
branches/filesystem3/libs/filesystem/v3/test/fstream_test.cpp | 2 ++
branches/filesystem3/libs/filesystem/v3/test/large_file_support_test.cpp | 2 ++
branches/filesystem3/libs/filesystem/v3/test/operations_test.cpp | 2 ++
branches/filesystem3/libs/filesystem/v3/test/operations_unit_test.cpp | 2 ++
branches/filesystem3/libs/filesystem/v3/test/path_test.cpp | 2 ++
branches/filesystem3/libs/filesystem/v3/test/path_unit_test.cpp | 2 ++
11 files changed, 47 insertions(+), 20 deletions(-)
Added: branches/filesystem3/boost/filesystem/config.hpp
==============================================================================
--- (empty file)
+++ branches/filesystem3/boost/filesystem/config.hpp 2010-06-09 11:07:03 EDT (Wed, 09 Jun 2010)
@@ -0,0 +1,32 @@
+// boost/filesystem/config.hpp -------------------------------------------------------//
+
+// Copyright Beman Dawes 2010
+
+// Distributed under the Boost Software License, Version 1.0.
+// See http://www.boost.org/LICENSE_1_0.txt
+
+// Library home page: http://www.boost.org/libs/filesystem
+
+//--------------------------------------------------------------------------------------//
+
+#ifndef BOOST_FILESYSTEM_CONFIGX_HPP
+#define BOOST_FILESYSTEM_CONFIGX_HPP
+
+# if defined(BOOST_FILESYSTEM_VERSION) \
+ && BOOST_FILESYSTEM_VERSION != 2 && BOOST_FILESYSTEM_VERSION != 3
+# error BOOST_FILESYSTEM_VERSION defined, but not as 2 or 3
+# endif
+
+# if !defined(BOOST_FILESYSTEM_VERSION)
+# define BOOST_FILESYSTEM_VERSION 2
+# endif
+
+#if BOOST_FILESYSTEM_VERSION == 2
+# include <boost/filesystem/v2/config.hpp>
+
+# else
+# include <boost/filesystem/v3/config.hpp>
+
+# endif
+
+#endif BOOST_FILESYSTEM_CONFIGX_HPP
Added: branches/filesystem3/boost/filesystem/convenience.hpp
==============================================================================
--- (empty file)
+++ branches/filesystem3/boost/filesystem/convenience.hpp 2010-06-09 11:07:03 EDT (Wed, 09 Jun 2010)
@@ -0,0 +1,32 @@
+// boost/filesystem/convenience.hpp --------------------------------------------------//
+
+// Copyright Beman Dawes 2010
+
+// Distributed under the Boost Software License, Version 1.0.
+// See http://www.boost.org/LICENSE_1_0.txt
+
+// Library home page: http://www.boost.org/libs/filesystem
+
+//--------------------------------------------------------------------------------------//
+
+#ifndef BOOST_FILESYSTEM_CONVENIENCEX_HPP
+#define BOOST_FILESYSTEM_CONVENIENCEX_HPP
+
+# if defined(BOOST_FILESYSTEM_VERSION) \
+ && BOOST_FILESYSTEM_VERSION != 2 && BOOST_FILESYSTEM_VERSION != 3
+# error BOOST_FILESYSTEM_VERSION defined, but not as 2 or 3
+# endif
+
+# if !defined(BOOST_FILESYSTEM_VERSION)
+# define BOOST_FILESYSTEM_VERSION 2
+# endif
+
+#if BOOST_FILESYSTEM_VERSION == 2
+# include <boost/filesystem/v2/convenience.hpp>
+
+# else
+# include <boost/filesystem/v3/convenience.hpp>
+
+# endif
+
+#endif BOOST_FILESYSTEM_CONVENIENCEX_HPP
Added: branches/filesystem3/boost/filesystem/exception.hpp
==============================================================================
--- (empty file)
+++ branches/filesystem3/boost/filesystem/exception.hpp 2010-06-09 11:07:03 EDT (Wed, 09 Jun 2010)
@@ -0,0 +1,32 @@
+// boost/filesystem/exception.hpp ----------------------------------------------------//
+
+// Copyright Beman Dawes 2010
+
+// Distributed under the Boost Software License, Version 1.0.
+// See http://www.boost.org/LICENSE_1_0.txt
+
+// Library home page: http://www.boost.org/libs/filesystem
+
+//--------------------------------------------------------------------------------------//
+
+#ifndef BOOST_FILESYSTEM_EXCEPTIONX_HPP
+#define BOOST_FILESYSTEM_EXCEPTIONX_HPP
+
+# if defined(BOOST_FILESYSTEM_VERSION) \
+ && BOOST_FILESYSTEM_VERSION != 2 && BOOST_FILESYSTEM_VERSION != 3
+# error BOOST_FILESYSTEM_VERSION defined, but not as 2 or 3
+# endif
+
+# if !defined(BOOST_FILESYSTEM_VERSION)
+# define BOOST_FILESYSTEM_VERSION 2
+# endif
+
+#if BOOST_FILESYSTEM_VERSION == 2
+# include <boost/filesystem/v2/exception.hpp>
+
+# else
+# include <boost/filesystem/v3/exception.hpp>
+
+# endif
+
+#endif BOOST_FILESYSTEM_EXCEPTIONX_HPP
Added: branches/filesystem3/boost/filesystem/operations.hpp
==============================================================================
--- (empty file)
+++ branches/filesystem3/boost/filesystem/operations.hpp 2010-06-09 11:07:03 EDT (Wed, 09 Jun 2010)
@@ -0,0 +1,32 @@
+// boost/filesystem/operations.hpp ---------------------------------------------------//
+
+// Copyright Beman Dawes 2010
+
+// Distributed under the Boost Software License, Version 1.0.
+// See http://www.boost.org/LICENSE_1_0.txt
+
+// Library home page: http://www.boost.org/libs/filesystem
+
+//--------------------------------------------------------------------------------------//
+
+#ifndef BOOST_FILESYSTEM_OPERATIONSX_HPP
+#define BOOST_FILESYSTEM_OPERATIONSX_HPP
+
+# if defined(BOOST_FILESYSTEM_VERSION) \
+ && BOOST_FILESYSTEM_VERSION != 2 && BOOST_FILESYSTEM_VERSION != 3
+# error BOOST_FILESYSTEM_VERSION defined, but not as 2 or 3
+# endif
+
+# if !defined(BOOST_FILESYSTEM_VERSION)
+# define BOOST_FILESYSTEM_VERSION 2
+# endif
+
+#if BOOST_FILESYSTEM_VERSION == 2
+# include <boost/filesystem/v2/operations.hpp>
+
+# else
+# include <boost/filesystem/v3/operations.hpp>
+
+# endif
+
+#endif BOOST_FILESYSTEM_OPERATIONSX_HPP
Added: branches/filesystem3/boost/filesystem/path.hpp
==============================================================================
--- (empty file)
+++ branches/filesystem3/boost/filesystem/path.hpp 2010-06-09 11:07:03 EDT (Wed, 09 Jun 2010)
@@ -0,0 +1,32 @@
+// boost/filesystem/path.hpp ---------------------------------------------------------//
+
+// Copyright Beman Dawes 2010
+
+// Distributed under the Boost Software License, Version 1.0.
+// See http://www.boost.org/LICENSE_1_0.txt
+
+// Library home page: http://www.boost.org/libs/filesystem
+
+//--------------------------------------------------------------------------------------//
+
+#ifndef BOOST_FILESYSTEM_PATHX_HPP
+#define BOOST_FILESYSTEM_PATHX_HPP
+
+# if defined(BOOST_FILESYSTEM_VERSION) \
+ && BOOST_FILESYSTEM_VERSION != 2 && BOOST_FILESYSTEM_VERSION != 3
+# error BOOST_FILESYSTEM_VERSION defined, but not as 2 or 3
+# endif
+
+# if !defined(BOOST_FILESYSTEM_VERSION)
+# define BOOST_FILESYSTEM_VERSION 2
+# endif
+
+#if BOOST_FILESYSTEM_VERSION == 2
+# include <boost/filesystem/v2/path.hpp>
+
+# else
+# include <boost/filesystem/v3/path.hpp>
+
+# endif
+
+#endif // BOOST_FILESYSTEM_PATHX_HPP
Modified: branches/filesystem3/boost/filesystem/v3/operations.hpp
==============================================================================
--- branches/filesystem3/boost/filesystem/v3/operations.hpp (original)
+++ branches/filesystem3/boost/filesystem/v3/operations.hpp 2010-06-09 11:07:03 EDT (Wed, 09 Jun 2010)
@@ -920,7 +920,8 @@
{
namespace filesystem
{
- using filesystem3::resize_file;
+ using filesystem3::block_file;
+ using filesystem3::character_file;
using filesystem3::copy_file;
using filesystem3::copy_option;
using filesystem3::copy_symlink;
@@ -930,9 +931,11 @@
using filesystem3::create_symlink;
using filesystem3::current_path;
using filesystem3::directory_entry;
+ using filesystem3::directory_file;
using filesystem3::directory_iterator;
using filesystem3::equivalent;
using filesystem3::exists;
+ using filesystem3::fifo_file;
using filesystem3::file_not_found;
using filesystem3::file_size;
using filesystem3::file_status;
@@ -948,17 +951,25 @@
using filesystem3::is_symlink;
using filesystem3::last_write_time;
using filesystem3::read_symlink;
+ using filesystem3::regular_file;
using filesystem3::remove;
using filesystem3::remove_all;
using filesystem3::rename;
+ using filesystem3::resize_file;
+ using filesystem3::socket_file;
using filesystem3::space;
using filesystem3::space_info;
using filesystem3::status;
+ using filesystem3::status_error;
using filesystem3::status_known;
+ using filesystem3::symlink_file;
using filesystem3::symlink_status;
using filesystem3::system_complete;
+ using filesystem3::type_unknown;
+ using filesystem3::unique_path;
# ifndef BOOST_FILESYSTEM_NO_DEPRECATED
using filesystem3::is_regular;
+ using filesystem3::status_unknown;
using filesystem3::symbolic_link_exists;
//using filesystem3::wdirectory_iterator;
//using filesystem3::wdirectory_entry;
Modified: branches/filesystem3/boost/filesystem/v3/path_traits.hpp
==============================================================================
--- branches/filesystem3/boost/filesystem/v3/path_traits.hpp (original)
+++ branches/filesystem3/boost/filesystem/v3/path_traits.hpp 2010-06-09 11:07:03 EDT (Wed, 09 Jun 2010)
@@ -199,6 +199,18 @@
}}} // namespace boost::filesystem::path_traits
+//----------------------------------------------------------------------------//
+
+namespace boost
+{
+ namespace filesystem
+ {
+ using filesystem3::codecvt_error_category;
+# ifndef BOOST_FILESYSTEM_NO_DEPRECATED
+# endif
+ }
+}
+
#include <boost/config/abi_suffix.hpp> // pops abi_prefix.hpp pragmas
#endif // BOOST_FILESYSTEM_PATH_TRAITS_HPP
Modified: branches/filesystem3/libs/filesystem/build/Jamfile.v2
==============================================================================
--- branches/filesystem3/libs/filesystem/build/Jamfile.v2 (original)
+++ branches/filesystem3/libs/filesystem/build/Jamfile.v2 2010-06-09 11:07:03 EDT (Wed, 09 Jun 2010)
@@ -13,14 +13,14 @@
<link>shared:<define>BOOST_FILESYSTEM_DYN_LINK=1
;
-SOURCES2 =
- v2/src/operations v2/src/path v2/src/portability v2/src/utf8_codecvt_facet ;
+SOURCES =
+ v2/src/v2_operations v2/src/v2_path v2/src/v2_portability v2/src/v2_utf8_codecvt_facet
+ v3/src/operations v3/src/path v3/src/portability v3/src/utf8_codecvt_facet
+ v3/src/codecvt_error_category v3/src/path_traits v3/src/unique_path v3/src/windows_file_codecvt
+ ;
-SOURCES3 =
- v3/src/operations v3/src/path v3/src/path_traits v3/src/portability v3/src/unique_path
- v3/src/utf8_codecvt_facet v3/src/windows_file_codecvt v3/src/codecvt_error_category ;
-lib boost_filesystem2
+lib boost_filesystem
: $(SOURCES).cpp ../../system/build//boost_system
: <link>shared:<define>BOOST_FILESYSTEM_DYN_LINK=1 # tell source we're building dll's
:
@@ -33,17 +33,5 @@
<link>shared:<library>../../system/build//boost_system
;
-#lib boost_filesystem
-# : $(SOURCES).cpp ../../system/build//boost_system
-# : <link>shared:<define>BOOST_FILESYSTEM_DYN_LINK=1 # tell source we're building dll's
-# :
-# : # Boost.Filesystem uses some of Boost.System functions in inlined/templated
- # functions, so clients that use Boost.Filesystem will have direct references
- # to Boost.System symbols. On Windows, Darwin, and some other platforms, this
- # means those clients have to be directly linked to Boost.System. For static
- # linking this happens anyway, but for shared we need to make it happen. Since
- # doing so is harmless even when not needed, we do it for all platforms.
- <link>shared:<library>../../system/build//boost_system
-# ;
-boost-install boost_filesystem2 ;
\ No newline at end of file
+boost-install boost_filesystem ;
\ No newline at end of file
Added: branches/filesystem3/libs/filesystem/test/Jamfile.v2
==============================================================================
--- (empty file)
+++ branches/filesystem3/libs/filesystem/test/Jamfile.v2 2010-06-09 11:07:03 EDT (Wed, 09 Jun 2010)
@@ -0,0 +1,25 @@
+# Boost Filesystem Library test Jamfile
+
+# (C) Copyright Beman Dawes 2002-2006
+# Distributed under the Boost Software License, Version 1.0.
+# (See accompanying file LICENSE_1_0.txt or www.boost.org/LICENSE_1_0.txt)
+
+project
+ : requirements
+ <library>/boost/filesystem//boost_filesystem
+ <library>/boost/system//boost_system
+ <toolset>msvc:<asynch-exceptions>on
+ ;
+
+ test-suite "filesystem" :
+ [ run ../v3/test/path_unit_test.cpp : : : : v3_path_unit_test ]
+ [ run ../v3/test/path_test.cpp : : : : v3_path_test ]
+ [ run ../v3/test/operations_unit_test.cpp : : : : v3_operations_unit_test ]
+ [ run ../v3/test/operations_test.cpp : : : : v3_operations_test ]
+ [ run ../v3/test/fstream_test.cpp : : : : v3_fstream_test ]
+ [ run ../v3/test/convenience_test.cpp : : : : v3_convenience_test ]
+ [ run ../v3/test/large_file_support_test.cpp : : : : v3_large_file_support_test ]
+ [ run ../v3/test/deprecated_test.cpp : : : : v3_deprecated_test ]
+ [ run ../v3/example/simple_ls.cpp : : : : v3_simple_ls ]
+
+ ;
Modified: branches/filesystem3/libs/filesystem/v3/test/convenience_test.cpp
==============================================================================
--- branches/filesystem3/libs/filesystem/v3/test/convenience_test.cpp (original)
+++ branches/filesystem3/libs/filesystem/v3/test/convenience_test.cpp 2010-06-09 11:07:03 EDT (Wed, 09 Jun 2010)
@@ -8,6 +8,8 @@
// See library home page at http://www.boost.org/libs/filesystem
+#define BOOST_FILESYSTEM_VERSION 3
+
#include <boost/config/warning_disable.hpp>
// See deprecated_test for tests of deprecated features
Modified: branches/filesystem3/libs/filesystem/v3/test/deprecated_test.cpp
==============================================================================
--- branches/filesystem3/libs/filesystem/v3/test/deprecated_test.cpp (original)
+++ branches/filesystem3/libs/filesystem/v3/test/deprecated_test.cpp 2010-06-09 11:07:03 EDT (Wed, 09 Jun 2010)
@@ -11,6 +11,8 @@
// This test verifies that various deprecated names still work. This is
// important to preserve existing code that uses the old names.
+#define BOOST_FILESYSTEM_VERSION 3
+
#define BOOST_FILESYSTEM_DEPRECATED
#include <boost/filesystem.hpp>
Modified: branches/filesystem3/libs/filesystem/v3/test/fstream_test.cpp
==============================================================================
--- branches/filesystem3/libs/filesystem/v3/test/fstream_test.cpp (original)
+++ branches/filesystem3/libs/filesystem/v3/test/fstream_test.cpp 2010-06-09 11:07:03 EDT (Wed, 09 Jun 2010)
@@ -7,6 +7,8 @@
// Library home page: http://www.boost.org/libs/filesystem
+#define BOOST_FILESYSTEM_VERSION 3
+
#include <boost/config/warning_disable.hpp>
// See deprecated_test for tests of deprecated features
Modified: branches/filesystem3/libs/filesystem/v3/test/large_file_support_test.cpp
==============================================================================
--- branches/filesystem3/libs/filesystem/v3/test/large_file_support_test.cpp (original)
+++ branches/filesystem3/libs/filesystem/v3/test/large_file_support_test.cpp 2010-06-09 11:07:03 EDT (Wed, 09 Jun 2010)
@@ -8,6 +8,8 @@
// See library home page at http://www.boost.org/libs/filesystem
+#define BOOST_FILESYSTEM_VERSION 3
+
// See deprecated_test for tests of deprecated features
#define BOOST_FILESYSTEM_NO_DEPRECATED
Modified: branches/filesystem3/libs/filesystem/v3/test/operations_test.cpp
==============================================================================
--- branches/filesystem3/libs/filesystem/v3/test/operations_test.cpp (original)
+++ branches/filesystem3/libs/filesystem/v3/test/operations_test.cpp 2010-06-09 11:07:03 EDT (Wed, 09 Jun 2010)
@@ -7,6 +7,8 @@
// Library home page: http://www.boost.org/libs/filesystem
+#define BOOST_FILESYSTEM_VERSION 3
+
#include <boost/config/warning_disable.hpp>
// See deprecated_test for tests of deprecated features
Modified: branches/filesystem3/libs/filesystem/v3/test/operations_unit_test.cpp
==============================================================================
--- branches/filesystem3/libs/filesystem/v3/test/operations_unit_test.cpp (original)
+++ branches/filesystem3/libs/filesystem/v3/test/operations_unit_test.cpp 2010-06-09 11:07:03 EDT (Wed, 09 Jun 2010)
@@ -7,6 +7,8 @@
// Library home page: http://www.boost.org/libs/filesystem
+#define BOOST_FILESYSTEM_VERSION 3
+
#include <boost/config/warning_disable.hpp>
// See deprecated_test for tests of deprecated features
Modified: branches/filesystem3/libs/filesystem/v3/test/path_test.cpp
==============================================================================
--- branches/filesystem3/libs/filesystem/v3/test/path_test.cpp (original)
+++ branches/filesystem3/libs/filesystem/v3/test/path_test.cpp 2010-06-09 11:07:03 EDT (Wed, 09 Jun 2010)
@@ -13,6 +13,8 @@
// on basename(), extension(), and change_extension() tests from the original
// convenience_test.cpp by Vladimir Prus.
+#define BOOST_FILESYSTEM_VERSION 3
+
#include <boost/config/warning_disable.hpp>
// See deprecated_test for tests of deprecated features
Modified: branches/filesystem3/libs/filesystem/v3/test/path_unit_test.cpp
==============================================================================
--- branches/filesystem3/libs/filesystem/v3/test/path_unit_test.cpp (original)
+++ branches/filesystem3/libs/filesystem/v3/test/path_unit_test.cpp 2010-06-09 11:07:03 EDT (Wed, 09 Jun 2010)
@@ -19,6 +19,8 @@
//
// ---------------------------------------------------------------------------------- //
+#define BOOST_FILESYSTEM_VERSION 3
+
#include <boost/config/warning_disable.hpp>
// See deprecated_test for tests of deprecated features
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