Merge branch 'trunk' of https://github.com/benoitdion/thrift into trunk

git-svn-id: https://svn.apache.org/repos/asf/thrift/trunk@1326086 13f79535-47bb-0310-9956-ffa450edef68

.gitignore

@@ -241,3 +241,13 @@
 *.user
 *.ipch
 *.sdf
+
+*_ReSharper*
+lib/cpp/Debug/
+lib/cpp/Release/
+*.opensdf
+lib/cpp/x64/Debug/
+lib/cpp/x64/Release
+compiler/cpp/src/thrifty.h
+compiler/cpp/src/thrifty.cc
+compiler/cpp/src/thriftl.cc

compiler/cpp/compiler.vcxproj

@@ -19,66 +19,65 @@
     </ProjectConfiguration>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="src\thrift\generate\t_generator.h" />
-    <ClInclude Include="src\thrift\generate\t_generator_registry.h" />
-    <ClInclude Include="src\thrift\generate\t_oop_generator.h" />
-    <ClInclude Include="src\thrift\globals.h" />
-    <ClInclude Include="src\thrift\main.h" />
-    <ClInclude Include="src\thrift\md5.h" />
-    <ClInclude Include="src\thrift\parse\t_base_type.h" />
-    <ClInclude Include="src\thrift\parse\t_const.h" />
-    <ClInclude Include="src\thrift\parse\t_const_value.h" />
-    <ClInclude Include="src\thrift\parse\t_container.h" />
-    <ClInclude Include="src\thrift\parse\t_doc.h" />
-    <ClInclude Include="src\thrift\parse\t_enum.h" />
-    <ClInclude Include="src\thrift\parse\t_enum_value.h" />
-    <ClInclude Include="src\thrift\parse\t_field.h" />
-    <ClInclude Include="src\thrift\parse\t_function.h" />
-    <ClInclude Include="src\thrift\parse\t_list.h" />
-    <ClInclude Include="src\thrift\parse\t_map.h" />
-    <ClInclude Include="src\thrift\parse\t_program.h" />
-    <ClInclude Include="src\thrift\parse\t_scope.h" />
-    <ClInclude Include="src\thrift\parse\t_service.h" />
-    <ClInclude Include="src\thrift\parse\t_set.h" />
-    <ClInclude Include="src\thrift\parse\t_struct.h" />
-    <ClInclude Include="src\thrift\parse\t_type.h" />
-    <ClInclude Include="src\thrift\parse\t_typedef.h" />
-    <ClInclude Include="src\thrift\platform.h" />
-    <ClInclude Include="src\thrift\thrifty.h" />
-    <ClInclude Include="src\thrift\windows\config.h" />
-    <ClInclude Include="src\thrift\windows\version.h" />
+    <ClInclude Include="src\generate\t_generator.h" />
+    <ClInclude Include="src\generate\t_generator_registry.h" />
+    <ClInclude Include="src\generate\t_oop_generator.h" />
+    <ClInclude Include="src\globals.h" />
+    <ClInclude Include="src\main.h" />
+    <ClInclude Include="src\md5.h" />
+    <ClInclude Include="src\parse\t_base_type.h" />
+    <ClInclude Include="src\parse\t_const.h" />
+    <ClInclude Include="src\parse\t_const_value.h" />
+    <ClInclude Include="src\parse\t_container.h" />
+    <ClInclude Include="src\parse\t_doc.h" />
+    <ClInclude Include="src\parse\t_enum.h" />
+    <ClInclude Include="src\parse\t_enum_value.h" />
+    <ClInclude Include="src\parse\t_field.h" />
+    <ClInclude Include="src\parse\t_function.h" />
+    <ClInclude Include="src\parse\t_list.h" />
+    <ClInclude Include="src\parse\t_map.h" />
+    <ClInclude Include="src\parse\t_program.h" />
+    <ClInclude Include="src\parse\t_scope.h" />
+    <ClInclude Include="src\parse\t_service.h" />
+    <ClInclude Include="src\parse\t_set.h" />
+    <ClInclude Include="src\parse\t_struct.h" />
+    <ClInclude Include="src\parse\t_type.h" />
+    <ClInclude Include="src\parse\t_typedef.h" />
+    <ClInclude Include="src\platform.h" />
+    <ClInclude Include="src\thrifty.h" />
+    <ClInclude Include="src\windows\config.h" />
+    <ClInclude Include="src\windows\version.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="src\thrift\generate\t_as3_generator.cc" />
-    <ClCompile Include="src\thrift\generate\t_cocoa_generator.cc" />
-    <ClCompile Include="src\thrift\generate\t_cpp_generator.cc" />
-    <ClCompile Include="src\thrift\generate\t_csharp_generator.cc" />
-    <ClCompile Include="src\thrift\generate\t_c_glib_generator.cc" />
-    <ClCompile Include="src\thrift\generate\t_erl_generator.cc" />
-    <ClCompile Include="src\thrift\generate\t_generator.cc" />
-    <ClCompile Include="src\thrift\generate\t_go_generator.cc" />
-    <ClCompile Include="src\thrift\generate\t_hs_generator.cc" />
-    <ClCompile Include="src\thrift\generate\t_html_generator.cc" />
-    <ClCompile Include="src\thrift\generate\t_javame_generator.cc" />
-    <ClCompile Include="src\thrift\generate\t_java_generator.cc" />
-    <ClCompile Include="src\thrift\generate\t_js_generator.cc" />
-    <ClCompile Include="src\thrift\generate\t_ocaml_generator.cc" />
-    <ClCompile Include="src\thrift\generate\t_perl_generator.cc" />
-    <ClCompile Include="src\thrift\generate\t_php_generator.cc" />
-    <ClCompile Include="src\thrift\generate\t_py_generator.cc" />
-    <ClCompile Include="src\thrift\generate\t_rb_generator.cc" />
-    <ClCompile Include="src\thrift\generate\t_st_generator.cc" />
-    <ClCompile Include="src\thrift\generate\t_xsd_generator.cc" />
-    <ClCompile Include="src\thrift\main.cc" />
-    <ClCompile Include="src\thrift\md5.c" />
-    <ClCompile Include="src\thrift\parse\parse.cc" />
-    <ClCompile Include="src\thrift\thriftl.cc" />
-    <ClCompile Include="src\thrift\thrifty.cc" />
+    <ClCompile Include="src\generate\t_as3_generator.cc" />
+    <ClCompile Include="src\generate\t_cocoa_generator.cc" />
+    <ClCompile Include="src\generate\t_cpp_generator.cc" />
+    <ClCompile Include="src\generate\t_csharp_generator.cc" />
+    <ClCompile Include="src\generate\t_c_glib_generator.cc" />
+    <ClCompile Include="src\generate\t_erl_generator.cc" />
+    <ClCompile Include="src\generate\t_generator.cc" />
+    <ClCompile Include="src\generate\t_go_generator.cc" />
+    <ClCompile Include="src\generate\t_hs_generator.cc" />
+    <ClCompile Include="src\generate\t_html_generator.cc" />
+    <ClCompile Include="src\generate\t_javame_generator.cc" />
+    <ClCompile Include="src\generate\t_java_generator.cc" />
+    <ClCompile Include="src\generate\t_js_generator.cc" />
+    <ClCompile Include="src\generate\t_ocaml_generator.cc" />
+    <ClCompile Include="src\generate\t_perl_generator.cc" />
+    <ClCompile Include="src\generate\t_php_generator.cc" />
+    <ClCompile Include="src\generate\t_py_generator.cc" />
+    <ClCompile Include="src\generate\t_rb_generator.cc" />
+    <ClCompile Include="src\generate\t_st_generator.cc" />
+    <ClCompile Include="src\generate\t_xsd_generator.cc" />
+    <ClCompile Include="src\main.cc" />
+    <ClCompile Include="src\md5.c" />
+    <ClCompile Include="src\parse\parse.cc" />
+    <ClCompile Include="src\thriftl.cc" />
+    <ClCompile Include="src\thrifty.cc" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="README_WINDOWS" />
-    <None Include="src\thrift\thriftl.ll" />
-    <None Include="src\thrift\thrifty.yy" />
+    <None Include="src\thriftl.ll" />
+    <None Include="src\thrifty.yy" />
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{89975A1A-F799-4556-98B8-64E30AB39A90}</ProjectGuid>
@@ -126,25 +125,25 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
-    <IncludePath>$(ProjectDir)\src\thrift\;$(ProjectDir)\src\windows\;$(IncludePath)</IncludePath>
+    <IncludePath>$(ProjectDir)\src\;$(ProjectDir)\src\windows\;$(IncludePath)</IncludePath>
     <TargetName>thrift</TargetName>
     <ExecutablePath>$(ExecutablePath);C:\Program Files (x86)\Git\bin</ExecutablePath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
-    <IncludePath>$(ProjectDir)\src\thrift\;$(ProjectDir)\src\windows\;$(IncludePath)</IncludePath>
+    <IncludePath>$(ProjectDir)\src\;$(ProjectDir)\src\windows\;$(IncludePath)</IncludePath>
     <TargetName>thrift</TargetName>
     <ExecutablePath>$(ExecutablePath);C:\Program Files (x86)\Git\bin</ExecutablePath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
-    <IncludePath>$(ProjectDir)\src\thrift\;$(ProjectDir)\src\windows\;$(IncludePath)</IncludePath>
+    <IncludePath>$(ProjectDir)\src\;$(ProjectDir)\src\windows\;$(IncludePath)</IncludePath>
     <TargetName>thrift</TargetName>
     <ExecutablePath>$(ExecutablePath);C:\Program Files (x86)\Git\bin</ExecutablePath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
-    <IncludePath>$(ProjectDir)\src\thrift\;$(ProjectDir)\src\windows\;$(IncludePath)</IncludePath>
+    <IncludePath>$(ProjectDir)\src\;$(ProjectDir)\src\windows\;$(IncludePath)</IncludePath>
     <TargetName>thrift</TargetName>
     <ExecutablePath>$(ExecutablePath);C:\Program Files (x86)\Git\bin</ExecutablePath>
   </PropertyGroup>
@@ -163,8 +162,8 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
     </Link>
     <PreBuildEvent>
-      <Command>flex -o "src\thrift\thriftl.cc" src/thriftl.ll
-bison -y -o "src\thrift\thrifty.cc" --defines="src/thrifty.h" src/thrifty.yy</Command>
+      <Command>flex -o "src\\thriftl.cc" src/thriftl.ll
+bison -y -o "src\thrifty.cc" --defines="src/thrifty.h" src/thrifty.yy</Command>
     </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -182,8 +181,8 @@ bison -y -o "src\thrift\thrifty.cc" --defines="src/thrifty.h" src/thrifty.yy</Co
       <GenerateDebugInformation>true</GenerateDebugInformation>
     </Link>
     <PreBuildEvent>
-      <Command>flex -o "src\thrift\thriftl.cc" src/thriftl.ll
-bison -y -o "src\thrift\thrifty.cc" --defines="src/thrifty.h" src/thrifty.yy</Command>
+      <Command>flex -o "src\thriftl.cc" src/thriftl.ll
+bison -y -o "src\thrifty.cc" --defines="src/thrifty.h" src/thrifty.yy</Command>
     </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -205,8 +204,8 @@ bison -y -o "src\thrift\thrifty.cc" --defines="src/thrifty.h" src/thrifty.yy</Co
       <OptimizeReferences>true</OptimizeReferences>
     </Link>
     <PreBuildEvent>
-      <Command>flex -o "src\thrift\thriftl.cc" src/thriftl.ll
-bison -y -o "src\thrift\thrifty.cc" --defines="src/thrifty.h" src/thrifty.yy</Command>
+      <Command>flex -o "src\thriftl.cc" src/thriftl.ll
+bison -y -o "src\thrifty.cc" --defines="src/thrifty.h" src/thrifty.yy</Command>
     </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -228,8 +227,8 @@ bison -y -o "src\thrift\thrifty.cc" --defines="src/thrifty.h" src/thrifty.yy</Co
       <OptimizeReferences>true</OptimizeReferences>
     </Link>
     <PreBuildEvent>
-      <Command>flex -o "src\thrift\thriftl.cc" src/thriftl.ll
-bison -y -o "src\thrift\thrifty.cc" --defines="src/thrifty.h" src/thrifty.yy</Command>
+      <Command>flex -o "src\thriftl.cc" src/thriftl.ll
+bison -y -o "src\thrifty.cc" --defines="src/thrifty.h" src/thrifty.yy</Command>
     </PreBuildEvent>
   </ItemDefinitionGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

compiler/cpp/compiler.vcxproj.filters

@@ -1,13 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <ClInclude Include="src\main.h" />
-    <ClInclude Include="src\windows\version.h">
-      <Filter>windows</Filter>
+    <ClInclude Include="src\generate\t_generator.h">
+      <Filter>generate</Filter>
     </ClInclude>
-    <ClInclude Include="src\windows\config.h">
-      <Filter>windows</Filter>
+    <ClInclude Include="src\generate\t_generator_registry.h">
+      <Filter>generate</Filter>
+    </ClInclude>
+    <ClInclude Include="src\generate\t_oop_generator.h">
+      <Filter>generate</Filter>
     </ClInclude>
+    <ClInclude Include="src\globals.h" />
+    <ClInclude Include="src\main.h" />
+    <ClInclude Include="src\md5.h" />
     <ClInclude Include="src\parse\t_base_type.h">
       <Filter>parse</Filter>
     </ClInclude>
@@ -62,32 +67,19 @@
     <ClInclude Include="src\parse\t_typedef.h">
       <Filter>parse</Filter>
     </ClInclude>
-    <ClInclude Include="src\generate\t_generator.h">
-      <Filter>generate</Filter>
-    </ClInclude>
-    <ClInclude Include="src\generate\t_generator_registry.h">
-      <Filter>generate</Filter>
-    </ClInclude>
-    <ClInclude Include="src\generate\t_oop_generator.h">
-      <Filter>generate</Filter>
-    </ClInclude>
-    <ClInclude Include="src\globals.h" />
-    <ClInclude Include="src\md5.h" />
     <ClInclude Include="src\platform.h" />
-    <ClInclude Include="src\thrifty.h">
-      <Filter>generated</Filter>
+    <ClInclude Include="src\thrifty.h" />
+    <ClInclude Include="src\windows\config.h">
+      <Filter>windows</Filter>
+    </ClInclude>
+    <ClInclude Include="src\windows\version.h">
+      <Filter>windows</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Filter Include="windows">
       <UniqueIdentifier>{ae9d0a15-57ae-4f01-87a4-81f790249b83}</UniqueIdentifier>
     </Filter>
-    <Filter Include="resources">
-      <UniqueIdentifier>{c9be9380-57bb-438a-a647-4a6943326d6b}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="generated">
-      <UniqueIdentifier>{79697fe7-fdf0-4ed4-bb4f-3128632c3446}</UniqueIdentifier>
-    </Filter>
     <Filter Include="parse">
       <UniqueIdentifier>{5df016bb-591b-420a-a535-4330d9187fbf}</UniqueIdentifier>
     </Filter>
@@ -96,16 +88,9 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="src\main.cc" />
-    <ClCompile Include="src\parse\parse.cc">
-      <Filter>parse</Filter>
-    </ClCompile>
     <ClCompile Include="src\generate\t_as3_generator.cc">
       <Filter>generate</Filter>
     </ClCompile>
-    <ClCompile Include="src\generate\t_c_glib_generator.cc">
-      <Filter>generate</Filter>
-    </ClCompile>
     <ClCompile Include="src\generate\t_cocoa_generator.cc">
       <Filter>generate</Filter>
     </ClCompile>
@@ -115,22 +100,28 @@
     <ClCompile Include="src\generate\t_csharp_generator.cc">
       <Filter>generate</Filter>
     </ClCompile>
+    <ClCompile Include="src\generate\t_c_glib_generator.cc">
+      <Filter>generate</Filter>
+    </ClCompile>
     <ClCompile Include="src\generate\t_erl_generator.cc">
       <Filter>generate</Filter>
     </ClCompile>
     <ClCompile Include="src\generate\t_generator.cc">
       <Filter>generate</Filter>
     </ClCompile>
+    <ClCompile Include="src\generate\t_go_generator.cc">
+      <Filter>generate</Filter>
+    </ClCompile>
     <ClCompile Include="src\generate\t_hs_generator.cc">
       <Filter>generate</Filter>
     </ClCompile>
     <ClCompile Include="src\generate\t_html_generator.cc">
       <Filter>generate</Filter>
     </ClCompile>
-    <ClCompile Include="src\generate\t_java_generator.cc">
+    <ClCompile Include="src\generate\t_javame_generator.cc">
       <Filter>generate</Filter>
     </ClCompile>
-    <ClCompile Include="src\generate\t_javame_generator.cc">
+    <ClCompile Include="src\generate\t_java_generator.cc">
       <Filter>generate</Filter>
     </ClCompile>
     <ClCompile Include="src\generate\t_js_generator.cc">
@@ -145,6 +136,9 @@
     <ClCompile Include="src\generate\t_php_generator.cc">
       <Filter>generate</Filter>
     </ClCompile>
+    <ClCompile Include="src\generate\t_py_generator.cc">
+      <Filter>generate</Filter>
+    </ClCompile>
     <ClCompile Include="src\generate\t_rb_generator.cc">
       <Filter>generate</Filter>
     </ClCompile>
@@ -154,27 +148,16 @@
     <ClCompile Include="src\generate\t_xsd_generator.cc">
       <Filter>generate</Filter>
     </ClCompile>
+    <ClCompile Include="src\main.cc" />
     <ClCompile Include="src\md5.c" />
-    <ClCompile Include="src\thriftl.cc">
-      <Filter>generated</Filter>
-    </ClCompile>
-    <ClCompile Include="src\thrifty.cc">
-      <Filter>generated</Filter>
-    </ClCompile>
-    <ClCompile Include="src\generate\t_go_generator.cc">
-      <Filter>generate</Filter>
-    </ClCompile>
-    <ClCompile Include="src\generate\t_py_generator.cc">
-      <Filter>generate</Filter>
+    <ClCompile Include="src\parse\parse.cc">
+      <Filter>parse</Filter>
     </ClCompile>
+    <ClCompile Include="src\thriftl.cc" />
+    <ClCompile Include="src\thrifty.cc" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="src\thriftl.ll">
-      <Filter>resources</Filter>
-    </None>
-    <None Include="src\thrifty.yy">
-      <Filter>resources</Filter>
-    </None>
-    <None Include="README_WINDOWS" />
+    <None Include="src\thriftl.ll" />
+    <None Include="src\thrifty.yy" />
   </ItemGroup>
 </Project>