Return-Path: X-Original-To: apmail-zookeeper-commits-archive@www.apache.org Delivered-To: apmail-zookeeper-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id EDCCE116F2 for ; Thu, 17 Jul 2014 09:40:43 +0000 (UTC) Received: (qmail 62285 invoked by uid 500); 17 Jul 2014 09:40:43 -0000 Delivered-To: apmail-zookeeper-commits-archive@zookeeper.apache.org Received: (qmail 62254 invoked by uid 500); 17 Jul 2014 09:40:43 -0000 Mailing-List: contact commits-help@zookeeper.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ Delivered-To: mailing list commits@zookeeper.apache.org Received: (qmail 62243 invoked by uid 99); 17 Jul 2014 09:40:43 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 17 Jul 2014 09:40:43 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 17 Jul 2014 09:40:39 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 499392388A02; Thu, 17 Jul 2014 09:40:19 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1611309 - in /zookeeper/trunk: ./ src/c/ Date: Thu, 17 Jul 2014 09:40:19 -0000 To: commits@zookeeper.apache.org From: fpj@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140717094019.499392388A02@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: fpj Date: Thu Jul 17 09:40:18 2014 New Revision: 1611309 URL: http://svn.apache.org/r1611309 Log: ZOOKEEPER-1966. VS and line breaks - second fix (Orion Hodson via fpj) Added: zookeeper/trunk/src/c/Cli.vcxproj - copied, changed from r1611301, zookeeper/trunk/Cli.vcxproj zookeeper/trunk/src/c/Cli.vcxproj.filters - copied, changed from r1611301, zookeeper/trunk/Cli.vcxproj.filters zookeeper/trunk/src/c/zookeeper-vs2013.sln - copied, changed from r1611301, zookeeper/trunk/zookeeper-vs2013.sln zookeeper/trunk/src/c/zookeeper.vcxproj - copied, changed from r1611301, zookeeper/trunk/zookeeper.vcxproj zookeeper/trunk/src/c/zookeeper.vcxproj.filters - copied, changed from r1611301, zookeeper/trunk/zookeeper.vcxproj.filters Removed: zookeeper/trunk/Cli.vcxproj zookeeper/trunk/Cli.vcxproj.filters zookeeper/trunk/zookeeper-vs2013.sln zookeeper/trunk/zookeeper.vcxproj zookeeper/trunk/zookeeper.vcxproj.filters Copied: zookeeper/trunk/src/c/Cli.vcxproj (from r1611301, zookeeper/trunk/Cli.vcxproj) URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/c/Cli.vcxproj?p2=zookeeper/trunk/src/c/Cli.vcxproj&p1=zookeeper/trunk/Cli.vcxproj&r1=1611301&r2=1611309&rev=1611309&view=diff ============================================================================== --- zookeeper/trunk/Cli.vcxproj (original) +++ zookeeper/trunk/src/c/Cli.vcxproj Thu Jul 17 09:40:18 2014 @@ -1,160 +1,160 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {F267C55D-E02C-4BAF-A246-0AA58E8FE4A6} - Win32Proj - cli - - - - Application - true - v120 - Unicode - - - Application - true - v120 - Unicode - - - Application - false - v120 - true - Unicode - - - Application - false - v120 - true - Unicode - - - - - - - - - - - - - - - - - - - true - - - true - - - false - - - false - - - - - - Level3 - Disabled - THREADED;WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) - include;generated - - - Console - true - ws2_32.lib - - - - - - - Level3 - Disabled - THREADED;WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) - include;generated - - - Console - true - ws2_32.lib - - - - - Level3 - - - MaxSpeed - true - true - THREADED;WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) - include;generated - - - Console - true - true - true - ws2_32.lib - - - - - Level3 - - - MaxSpeed - true - true - THREADED;WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) - include;generated - - - Console - true - true - true - ws2_32.lib - - - - - - - - {5754fb2b-5ea5-4988-851d-908ca533a626} - - - - - + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {F267C55D-E02C-4BAF-A246-0AA58E8FE4A6} + Win32Proj + cli + + + + Application + true + v120 + Unicode + + + Application + true + v120 + Unicode + + + Application + false + v120 + true + Unicode + + + Application + false + v120 + true + Unicode + + + + + + + + + + + + + + + + + + + true + + + true + + + false + + + false + + + + + + Level3 + Disabled + THREADED;WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) + include;generated + + + Console + true + ws2_32.lib + + + + + + + Level3 + Disabled + THREADED;WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) + include;generated + + + Console + true + ws2_32.lib + + + + + Level3 + + + MaxSpeed + true + true + THREADED;WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) + include;generated + + + Console + true + true + true + ws2_32.lib + + + + + Level3 + + + MaxSpeed + true + true + THREADED;WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) + include;generated + + + Console + true + true + true + ws2_32.lib + + + + + + + + {5754fb2b-5ea5-4988-851d-908ca533a626} + + + + + \ No newline at end of file Copied: zookeeper/trunk/src/c/Cli.vcxproj.filters (from r1611301, zookeeper/trunk/Cli.vcxproj.filters) URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/c/Cli.vcxproj.filters?p2=zookeeper/trunk/src/c/Cli.vcxproj.filters&p1=zookeeper/trunk/Cli.vcxproj.filters&r1=1611301&r2=1611309&rev=1611309&view=diff ============================================================================== --- zookeeper/trunk/Cli.vcxproj.filters (original) +++ zookeeper/trunk/src/c/Cli.vcxproj.filters Thu Jul 17 09:40:18 2014 @@ -1,22 +1,22 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hh;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - - - Source Files - - + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hh;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + + + Source Files + + \ No newline at end of file Copied: zookeeper/trunk/src/c/zookeeper-vs2013.sln (from r1611301, zookeeper/trunk/zookeeper-vs2013.sln) URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/c/zookeeper-vs2013.sln?p2=zookeeper/trunk/src/c/zookeeper-vs2013.sln&p1=zookeeper/trunk/zookeeper-vs2013.sln&r1=1611301&r2=1611309&rev=1611309&view=diff ============================================================================== --- zookeeper/trunk/zookeeper-vs2013.sln (original) +++ zookeeper/trunk/src/c/zookeeper-vs2013.sln Thu Jul 17 09:40:18 2014 @@ -1,37 +1,37 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2013 -VisualStudioVersion = 12.0.30110.0 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zookeeper", "zookeeper.vcxproj", "{5754FB2B-5EA5-4988-851D-908CA533A626}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cli", "cli.vcxproj", "{F267C55D-E02C-4BAF-A246-0AA58E8FE4A6}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Debug|x64 = Debug|x64 - Release|Win32 = Release|Win32 - Release|x64 = Release|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {5754FB2B-5EA5-4988-851D-908CA533A626}.Debug|Win32.ActiveCfg = Debug|Win32 - {5754FB2B-5EA5-4988-851D-908CA533A626}.Debug|Win32.Build.0 = Debug|Win32 - {5754FB2B-5EA5-4988-851D-908CA533A626}.Debug|x64.ActiveCfg = Debug|x64 - {5754FB2B-5EA5-4988-851D-908CA533A626}.Debug|x64.Build.0 = Debug|x64 - {5754FB2B-5EA5-4988-851D-908CA533A626}.Release|Win32.ActiveCfg = Release|Win32 - {5754FB2B-5EA5-4988-851D-908CA533A626}.Release|Win32.Build.0 = Release|Win32 - {5754FB2B-5EA5-4988-851D-908CA533A626}.Release|x64.ActiveCfg = Release|x64 - {5754FB2B-5EA5-4988-851D-908CA533A626}.Release|x64.Build.0 = Release|x64 - {F267C55D-E02C-4BAF-A246-0AA58E8FE4A6}.Debug|Win32.ActiveCfg = Debug|Win32 - {F267C55D-E02C-4BAF-A246-0AA58E8FE4A6}.Debug|Win32.Build.0 = Debug|Win32 - {F267C55D-E02C-4BAF-A246-0AA58E8FE4A6}.Debug|x64.ActiveCfg = Debug|x64 - {F267C55D-E02C-4BAF-A246-0AA58E8FE4A6}.Debug|x64.Build.0 = Debug|x64 - {F267C55D-E02C-4BAF-A246-0AA58E8FE4A6}.Release|Win32.ActiveCfg = Release|Win32 - {F267C55D-E02C-4BAF-A246-0AA58E8FE4A6}.Release|Win32.Build.0 = Release|Win32 - {F267C55D-E02C-4BAF-A246-0AA58E8FE4A6}.Release|x64.ActiveCfg = Release|x64 - {F267C55D-E02C-4BAF-A246-0AA58E8FE4A6}.Release|x64.Build.0 = Release|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2013 +VisualStudioVersion = 12.0.30110.0 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zookeeper", "zookeeper.vcxproj", "{5754FB2B-5EA5-4988-851D-908CA533A626}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cli", "cli.vcxproj", "{F267C55D-E02C-4BAF-A246-0AA58E8FE4A6}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 + Release|Win32 = Release|Win32 + Release|x64 = Release|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {5754FB2B-5EA5-4988-851D-908CA533A626}.Debug|Win32.ActiveCfg = Debug|Win32 + {5754FB2B-5EA5-4988-851D-908CA533A626}.Debug|Win32.Build.0 = Debug|Win32 + {5754FB2B-5EA5-4988-851D-908CA533A626}.Debug|x64.ActiveCfg = Debug|x64 + {5754FB2B-5EA5-4988-851D-908CA533A626}.Debug|x64.Build.0 = Debug|x64 + {5754FB2B-5EA5-4988-851D-908CA533A626}.Release|Win32.ActiveCfg = Release|Win32 + {5754FB2B-5EA5-4988-851D-908CA533A626}.Release|Win32.Build.0 = Release|Win32 + {5754FB2B-5EA5-4988-851D-908CA533A626}.Release|x64.ActiveCfg = Release|x64 + {5754FB2B-5EA5-4988-851D-908CA533A626}.Release|x64.Build.0 = Release|x64 + {F267C55D-E02C-4BAF-A246-0AA58E8FE4A6}.Debug|Win32.ActiveCfg = Debug|Win32 + {F267C55D-E02C-4BAF-A246-0AA58E8FE4A6}.Debug|Win32.Build.0 = Debug|Win32 + {F267C55D-E02C-4BAF-A246-0AA58E8FE4A6}.Debug|x64.ActiveCfg = Debug|x64 + {F267C55D-E02C-4BAF-A246-0AA58E8FE4A6}.Debug|x64.Build.0 = Debug|x64 + {F267C55D-E02C-4BAF-A246-0AA58E8FE4A6}.Release|Win32.ActiveCfg = Release|Win32 + {F267C55D-E02C-4BAF-A246-0AA58E8FE4A6}.Release|Win32.Build.0 = Release|Win32 + {F267C55D-E02C-4BAF-A246-0AA58E8FE4A6}.Release|x64.ActiveCfg = Release|x64 + {F267C55D-E02C-4BAF-A246-0AA58E8FE4A6}.Release|x64.Build.0 = Release|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal Copied: zookeeper/trunk/src/c/zookeeper.vcxproj (from r1611301, zookeeper/trunk/zookeeper.vcxproj) URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/c/zookeeper.vcxproj?p2=zookeeper/trunk/src/c/zookeeper.vcxproj&p1=zookeeper/trunk/zookeeper.vcxproj&r1=1611301&r2=1611309&rev=1611309&view=diff ============================================================================== --- zookeeper/trunk/zookeeper.vcxproj (original) +++ zookeeper/trunk/src/c/zookeeper.vcxproj Thu Jul 17 09:40:18 2014 @@ -1,196 +1,196 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {5754FB2B-5EA5-4988-851D-908CA533A626} - zookeeper - Win32Proj - - - - DynamicLibrary - v120 - - - DynamicLibrary - v120 - - - DynamicLibrary - v120 - MultiByte - - - DynamicLibrary - v120 - MultiByte - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>11.0.61030.0 - - - $(ProjectName) - false - - - $(ProjectName) - false - - - true - - - $(ProjectName) - true - - - - Disabled - ./include;./generated;./hashtable;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;ZOOKEEPER_EXPORTS;DLL_EXPORT;THREADED;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - Level3 - EditAndContinue - CompileAsC - - - ws2_32.lib;%(AdditionalDependencies) - true - Windows - false - - MachineX86 - - - - - Disabled - ./include;./generated;./hashtable;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;ZOOKEEPER_EXPORTS;DLL_EXPORT;THREADED;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - ProgramDatabase - CompileAsC - - - ws2_32.lib;%(AdditionalDependencies) - true - Windows - false - - - - - - - ./include;./generated;./hashtable;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;ZOOKEEPER_EXPORTS;DLL_EXPORT;THREADED;%(PreprocessorDefinitions) - MultiThreadedDLL - - Level3 - ProgramDatabase - CompileAsC - - - WS2_32.lib;%(AdditionalDependencies) - true - Windows - true - true - MachineX86 - $(OutDir)\$(TargetName).lib - - - - - ./include;./generated;./hashtable;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;ZOOKEEPER_EXPORTS;DLL_EXPORT;THREADED;%(PreprocessorDefinitions) - MultiThreadedDLL - - - Level3 - ProgramDatabase - CompileAsC - NoListing - - - WS2_32.lib;%(AdditionalDependencies) - true - Windows - true - true - $(OutDir)\$(TargetName).lib - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {5754FB2B-5EA5-4988-851D-908CA533A626} + zookeeper + Win32Proj + + + + DynamicLibrary + v120 + + + DynamicLibrary + v120 + + + DynamicLibrary + v120 + MultiByte + + + DynamicLibrary + v120 + MultiByte + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>11.0.61030.0 + + + $(ProjectName) + false + + + $(ProjectName) + false + + + true + + + $(ProjectName) + true + + + + Disabled + ./include;./generated;./hashtable;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;ZOOKEEPER_EXPORTS;DLL_EXPORT;THREADED;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + Level3 + EditAndContinue + CompileAsC + + + ws2_32.lib;%(AdditionalDependencies) + true + Windows + false + + MachineX86 + + + + + Disabled + ./include;./generated;./hashtable;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;ZOOKEEPER_EXPORTS;DLL_EXPORT;THREADED;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + ProgramDatabase + CompileAsC + + + ws2_32.lib;%(AdditionalDependencies) + true + Windows + false + + + + + + + ./include;./generated;./hashtable;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;ZOOKEEPER_EXPORTS;DLL_EXPORT;THREADED;%(PreprocessorDefinitions) + MultiThreadedDLL + + Level3 + ProgramDatabase + CompileAsC + + + WS2_32.lib;%(AdditionalDependencies) + true + Windows + true + true + MachineX86 + $(OutDir)\$(TargetName).lib + + + + + ./include;./generated;./hashtable;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;ZOOKEEPER_EXPORTS;DLL_EXPORT;THREADED;%(PreprocessorDefinitions) + MultiThreadedDLL + + + Level3 + ProgramDatabase + CompileAsC + NoListing + + + WS2_32.lib;%(AdditionalDependencies) + true + Windows + true + true + $(OutDir)\$(TargetName).lib + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Copied: zookeeper/trunk/src/c/zookeeper.vcxproj.filters (from r1611301, zookeeper/trunk/zookeeper.vcxproj.filters) URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/c/zookeeper.vcxproj.filters?p2=zookeeper/trunk/src/c/zookeeper.vcxproj.filters&p1=zookeeper/trunk/zookeeper.vcxproj.filters&r1=1611301&r2=1611309&rev=1611309&view=diff ============================================================================== --- zookeeper/trunk/zookeeper.vcxproj.filters (original) +++ zookeeper/trunk/src/c/zookeeper.vcxproj.filters Thu Jul 17 09:40:18 2014 @@ -1,96 +1,96 @@ - - - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Header Files - - - Source Files - - + + + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Header Files + + + Source Files + + \ No newline at end of file