AMDG This broke the regression tests: error: Unable to find file or target named error: 'macro_default_test.cpp' error: referred from project at error: '../libs/filesystem/test' In Christ, Steven Watanabe On 04/30/2012 08:00 AM, bdawes@acm.org wrote:

Author: bemandawes Date: 2012-04-30 11:00:21 EDT (Mon, 30 Apr 2012) New Revision: 78273 URL: http://svn.boost.org/trac/boost/changeset/78273

Log: Revert to BOOST_FILESYSTEM_STATIC_LINK as the default if no linkage macros supplied. See http://www.boost.org/doc/libs/1_49_0/libs/config/doc/html/boost_config/boost... Add test to verify correct default. Added: trunk/libs/filesystem/test/msvc10/macro_default_test/ trunk/libs/filesystem/test/msvc10/macro_default_test/macro_default_test.vcxproj (contents, props changed) Text files modified: trunk/boost/filesystem/config.hpp | 2 +- trunk/libs/filesystem/test/Jamfile.v2 | 1 + trunk/libs/filesystem/test/msvc10/filesystem-v3.sln | 10 ++++++++++ 3 files changed, 12 insertions(+), 1 deletions(-)

Modified: trunk/boost/filesystem/config.hpp ============================================================================== --- trunk/boost/filesystem/config.hpp (original) +++ trunk/boost/filesystem/config.hpp 2012-04-30 11:00:21 EDT (Mon, 30 Apr 2012) @@ -56,7 +56,7 @@

#if !defined(BOOST_FILESYSTEM_DYN_LINK) && !defined(BOOST_FILESYSTEM_STATIC_LINK) \ && !defined(BOOST_ALL_DYN_LINK) && !defined(BOOST_ALL_STATIC_LINK) -# define BOOST_FILESYSTEM_DYN_LINK +# define BOOST_FILESYSTEM_STATIC_LINK #endif

#if defined(BOOST_ALL_DYN_LINK) && !defined(BOOST_FILESYSTEM_DYN_LINK)

Modified: trunk/libs/filesystem/test/Jamfile.v2 ============================================================================== --- trunk/libs/filesystem/test/Jamfile.v2 (original) +++ trunk/libs/filesystem/test/Jamfile.v2 2012-04-30 11:00:21 EDT (Mon, 30 Apr 2012) @@ -17,6 +17,7 @@

test-suite "filesystem" : [ run convenience_test.cpp ] + [ compile macro_default_test.cpp ] [ run deprecated_test.cpp ] [ run fstream_test.cpp ] [ run large_file_support_test.cpp ]

Modified: trunk/libs/filesystem/test/msvc10/filesystem-v3.sln ============================================================================== --- trunk/libs/filesystem/test/msvc10/filesystem-v3.sln (original) +++ trunk/libs/filesystem/test/msvc10/filesystem-v3.sln 2012-04-30 11:00:21 EDT (Mon, 30 Apr 2012) @@ -106,6 +106,12 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "exec_monitor_lib", "exec_monitor_lib\exec_monitor_lib.vcxproj", "{272DFC15-6292-49DF-B457-6784A183EAC3}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "macro_default_test", "macro_default_test\macro_default_test.vcxproj", "{36E2032D-F9E6-4FBA-9630-3D4AC518DC6C}" + ProjectSection(ProjectDependencies) = postProject + {3640605D-6F82-493D-879F-8F30762DA554} = {3640605D-6F82-493D-879F-8F30762DA554} + {2C1770A4-4AC3-4102-9D36-E652DBB686D8} = {2C1770A4-4AC3-4102-9D36-E652DBB686D8} + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -228,6 +234,10 @@ {272DFC15-6292-49DF-B457-6784A183EAC3}.Debug|Win32.Build.0 = Debug|Win32 {272DFC15-6292-49DF-B457-6784A183EAC3}.Release|Win32.ActiveCfg = Release|Win32 {272DFC15-6292-49DF-B457-6784A183EAC3}.Release|Win32.Build.0 = Release|Win32 + {36E2032D-F9E6-4FBA-9630-3D4AC518DC6C}.Debug|Win32.ActiveCfg = Debug|Win32 + {36E2032D-F9E6-4FBA-9630-3D4AC518DC6C}.Debug|Win32.Build.0 = Debug|Win32 + {36E2032D-F9E6-4FBA-9630-3D4AC518DC6C}.Release|Win32.ActiveCfg = Release|Win32 + {36E2032D-F9E6-4FBA-9630-3D4AC518DC6C}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE

Added: trunk/libs/filesystem/test/msvc10/macro_default_test/macro_default_test.vcxproj ============================================================================== --- (empty file) +++ trunk/libs/filesystem/test/msvc10/macro_default_test/macro_default_test.vcxproj 2012-04-30 11:00:21 EDT (Mon, 30 Apr 2012) @@ -0,0 +1,91 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Debug|Win32"> + <Configuration>Debug</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|Win32"> + <Configuration>Release</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + </ItemGroup> + <PropertyGroup Label="Globals"> + <ProjectGuid>{36E2032D-F9E6-4FBA-9630-3D4AC518DC6C}</ProjectGuid> + <Keyword>Win32Proj</Keyword> + <RootNamespace>macro_default_test</RootNamespace> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>true</UseDebugLibraries> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseDebugLibraries>false</UseDebugLibraries> + <WholeProgramOptimization>true</WholeProgramOptimization> + <CharacterSet>Unicode</CharacterSet> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> + <ImportGroup Label="ExtensionSettings"> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <PropertyGroup Label="UserMacros" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <LinkIncremental>true</LinkIncremental> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <LinkIncremental>false</LinkIncremental> + </PropertyGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ClCompile> + <PrecompiledHeader> + </PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <Optimization>Disabled</Optimization> + <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalIncludeDirectories>../../../../..</AdditionalIncludeDirectories> + </ClCompile> + <Link> + <SubSystem>Console</SubSystem> + <GenerateDebugInformation>true</GenerateDebugInformation> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ClCompile> + <WarningLevel>Level3</WarningLevel> + <PrecompiledHeader> + </PrecompiledHeader> + <Optimization>MaxSpeed</Optimization> + <FunctionLevelLinking>true</FunctionLevelLinking> + <IntrinsicFunctions>true</IntrinsicFunctions> + <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + </ClCompile> + <Link> + <SubSystem>Console</SubSystem> + <GenerateDebugInformation>true</GenerateDebugInformation> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <OptimizeReferences>true</OptimizeReferences> + </Link> + </ItemDefinitionGroup> + <ItemGroup> + <ClCompile Include="..\..\macro_default_test.cpp" /> + </ItemGroup> + <ItemGroup> + <ProjectReference Include="..\filesystem_lib\filesystem_lib.vcxproj"> + <Project>{2c1770a4-4ac3-4102-9d36-e652dbb686d8}</Project> + </ProjectReference> + <ProjectReference Include="..\system_lib\system_lib.vcxproj"> + <Project>{3640605d-6f82-493d-879f-8f30762da554}</Project> + </ProjectReference> + </ItemGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> + <ImportGroup Label="ExtensionTargets"> + </ImportGroup> +</Project> \ No newline at end of file _______________________________________________ Boost-commit mailing list Boost-commit@lists.boost.org http://lists.boost.org/mailman/listinfo.cgi/boost-commit