Update Windows support (#317)

vsprojects/base.props

@@ -2,7 +2,7 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ImportGroup Label="PropertySheets" />
   <PropertyGroup Label="UserMacros">
-    <THIRD_PARTY>$(ProjectDir)..\thirdparty\</THIRD_PARTY>
+    <THIRD_PARTY>$(SolutionDir)thirdparty\</THIRD_PARTY>
   </PropertyGroup>
   <PropertyGroup>
     <OutDir>$(SolutionDir)build\$(Platform)\$(Configuration)\</OutDir>
@@ -16,7 +16,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>
-      <AdditionalIncludeDirectories>$(PYTHONHOME)\Lib\site-packages\numpy\core\include;$(THIRD_PARTY)python\inc;$(THIRD_PARTY)python\inc\Windows;$(ProjectDir)..\build\generated;$(ProjectDir)..\include;$(THIRD_PARTY)numbuf\cpp\src;$(THIRD_PARTY)numbuf\python\src;$(THIRD_PARTY)grpc\include;$(THIRD_PARTY)grpc\third_party\protobuf\src;$(THIRD_PARTY)arrow\cpp\src;$(BOOST_ROOT);$(BOOST_ROOT)\libs\interprocess\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(PYTHONHOME)\Lib\site-packages\numpy\core\include;$(THIRD_PARTY)python\inc;$(THIRD_PARTY)python\inc\Windows;$(ProjectDir)..\build\generated;$(ProjectDir)..\include;$(THIRD_PARTY)numbuf\cpp\src;$(THIRD_PARTY)numbuf\python\src;$(THIRD_PARTY)grpc\include;$(THIRD_PARTY)grpc\third_party\protobuf\src;$(BOOST_ROOT);$(BOOST_ROOT)\libs\interprocess\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0600;BOOST_DATE_TIME_NO_LIB=1;HAVE_ROUND;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <DisableSpecificWarnings>4191;;4100;4371;4514;4571;4619;4668;4710;4820</DisableSpecificWarnings>
       <AdditionalOptions>/FS %(AdditionalOptions)</AdditionalOptions>

vsprojects/objstore.vcxproj

@@ -34,7 +34,7 @@
   </ImportGroup>
   <ImportGroup Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="base.props" />
+    <Import Project="$(SolutionDir)vsprojects\base.props" Condition="exists('$(SolutionDir)vsprojects\base.props')" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <ItemDefinitionGroup>

vsprojects/ray.vcxproj

@@ -35,7 +35,7 @@
   </ImportGroup>
   <ImportGroup Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="Base.props" />
+    <Import Project="$(SolutionDir)vsprojects\base.props" Condition="exists('$(SolutionDir)vsprojects\base.props')" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <ItemDefinitionGroup>
@@ -79,6 +79,8 @@
     <ClInclude Include="..\build\generated\ray.pb.h" />
     <ClInclude Include="..\build\generated\types.grpc.pb.h" />
     <ClInclude Include="..\build\generated\types.pb.h" />
+    <ClInclude Include="..\include\ray\logging.h" />
+    <ClInclude Include="..\include\ray\ray.h" />
     <ClInclude Include="..\src\ipc.h" />
     <ClInclude Include="..\src\utils.h" />
   </ItemGroup>
@@ -113,9 +115,6 @@ protoc --proto_path="$(SolutionDir)protos" --python_out="$(ProjectDir)..\lib\pyt
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\thirdparty\arrow\vsprojects\Arrow.vcxproj">
-      <Project>{10e7d8e8-0eeb-46ea-a58d-f9236b5960ad}</Project>
-    </ProjectReference>
     <ProjectReference Include="..\thirdparty\grpc\third_party\protobuf\vsprojects\libprotobuf.vcxproj">
       <Project>{07abd431-1515-4140-932e-e8c150ff7d1a}</Project>
     </ProjectReference>

vsprojects/ray.vcxproj.filters

@@ -74,6 +74,12 @@
     <ClInclude Include="..\build\generated\types.pb.h">
       <Filter>Header Files\protobufs</Filter>
     </ClInclude>
+    <ClInclude Include="..\include\ray\logging.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\include\ray\ray.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <CustomBuild Include="..\protos\ray.proto" />

vsprojects/raylib.vcxproj

@@ -34,7 +34,7 @@
   </ImportGroup>
   <ImportGroup Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="base.props" />
+    <Import Project="$(SolutionDir)vsprojects\base.props" Condition="exists('$(SolutionDir)vsprojects\base.props')" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
@@ -49,31 +49,14 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClInclude Include="..\src\worker.h" />
-    <ClInclude Include="..\thirdparty\numbuf\cpp\src\numbuf\dict.h" />
-    <ClInclude Include="..\thirdparty\numbuf\cpp\src\numbuf\metadata.h" />
-    <ClInclude Include="..\thirdparty\numbuf\cpp\src\numbuf\tensor.h" />
-    <ClInclude Include="..\thirdparty\numbuf\cpp\src\numbuf\types.h" />
-    <ClInclude Include="..\thirdparty\numbuf\cpp\src\numbuf\util\buffer.h" />
-    <ClInclude Include="..\thirdparty\numbuf\cpp\src\numbuf\util\logging.h" />
-    <ClInclude Include="..\thirdparty\numbuf\cpp\src\numbuf\util\utils.h" />
-    <ClInclude Include="..\thirdparty\numbuf\python\src\pynumbuf\adapters\numpy.h" />
-    <ClInclude Include="..\thirdparty\numbuf\python\src\pynumbuf\adapters\python.h" />
-    <ClInclude Include="..\thirdparty\numbuf\python\src\pynumbuf\serialize.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\src\raylib.cc" />
     <ClCompile Include="..\src\worker.cc" />
-    <ClCompile Include="..\thirdparty\numbuf\cpp\src\numbuf\dict.cc" />
-    <ClCompile Include="..\thirdparty\numbuf\cpp\src\numbuf\metadata.cc" />
-    <ClCompile Include="..\thirdparty\numbuf\cpp\src\numbuf\tensor.cc" />
-    <ClCompile Include="..\thirdparty\numbuf\cpp\src\numbuf\types.cc" />
-    <ClCompile Include="..\thirdparty\numbuf\python\src\pynumbuf\adapters\numpy.cc" />
-    <ClCompile Include="..\thirdparty\numbuf\python\src\pynumbuf\adapters\python.cc" />
-    <ClCompile Include="..\thirdparty\numbuf\python\src\pynumbuf\serialize.cc" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\thirdparty\arrow\vsprojects\Arrow.vcxproj">
-      <Project>{10e7d8e8-0eeb-46ea-a58d-f9236b5960ad}</Project>
+    <ProjectReference Include="..\thirdparty\numbuf\vsprojects\numbuf.vcxproj">
+      <Project>{609d1438-d42d-4cba-80a5-a1398c3bcc85}</Project>
     </ProjectReference>
     <ProjectReference Include="Ray.vcxproj">
       <Project>{c002f9f6-8447-4b95-aa18-fb781f4a7865}</Project>

vsprojects/raylib.vcxproj.filters

@@ -13,27 +13,6 @@
       <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
       <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
     </Filter>
-    <Filter Include="Header Files\pynumbuf">
-      <UniqueIdentifier>{670b10a8-e1e8-4cba-ab9f-13bcd990ccec}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\pynumbuf">
-      <UniqueIdentifier>{c187b201-02bc-4abc-a53c-f7173bd7520a}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\numbuf">
-      <UniqueIdentifier>{d6d2cf0f-350f-4ba4-a009-23342f47a731}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\numbuf">
-      <UniqueIdentifier>{43371834-59c6-46eb-a97b-0a17501d3175}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\numbuf\util">
-      <UniqueIdentifier>{873d1bc4-095c-407b-a6ff-066cb88ca022}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\pynumbuf\adapters">
-      <UniqueIdentifier>{3222a6d7-2377-4be1-8aa1-d856d756047d}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\pynumbuf\adapters">
-      <UniqueIdentifier>{052fd44b-f361-47b9-b341-140b050baa85}</UniqueIdentifier>
-    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\src\raylib.cc">
@@ -42,61 +21,10 @@
     <ClCompile Include="..\src\worker.cc">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\thirdparty\numbuf\python\src\pynumbuf\serialize.cc">
-      <Filter>Source Files\pynumbuf</Filter>
-    </ClCompile>
-    <ClCompile Include="..\thirdparty\numbuf\cpp\src\numbuf\dict.cc">
-      <Filter>Source Files\numbuf</Filter>
-    </ClCompile>
-    <ClCompile Include="..\thirdparty\numbuf\cpp\src\numbuf\metadata.cc">
-      <Filter>Source Files\numbuf</Filter>
-    </ClCompile>
-    <ClCompile Include="..\thirdparty\numbuf\cpp\src\numbuf\tensor.cc">
-      <Filter>Source Files\numbuf</Filter>
-    </ClCompile>
-    <ClCompile Include="..\thirdparty\numbuf\cpp\src\numbuf\types.cc">
-      <Filter>Source Files\numbuf</Filter>
-    </ClCompile>
-    <ClCompile Include="..\thirdparty\numbuf\python\src\pynumbuf\adapters\numpy.cc">
-      <Filter>Source Files\pynumbuf\adapters</Filter>
-    </ClCompile>
-    <ClCompile Include="..\thirdparty\numbuf\python\src\pynumbuf\adapters\python.cc">
-      <Filter>Source Files\pynumbuf\adapters</Filter>
-    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\src\worker.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\thirdparty\numbuf\python\src\pynumbuf\serialize.h">
-      <Filter>Header Files\pynumbuf</Filter>
-    </ClInclude>
-    <ClInclude Include="..\thirdparty\numbuf\cpp\src\numbuf\dict.h">
-      <Filter>Header Files\numbuf</Filter>
-    </ClInclude>
-    <ClInclude Include="..\thirdparty\numbuf\cpp\src\numbuf\metadata.h">
-      <Filter>Header Files\numbuf</Filter>
-    </ClInclude>
-    <ClInclude Include="..\thirdparty\numbuf\cpp\src\numbuf\tensor.h">
-      <Filter>Header Files\numbuf</Filter>
-    </ClInclude>
-    <ClInclude Include="..\thirdparty\numbuf\cpp\src\numbuf\types.h">
-      <Filter>Header Files\numbuf</Filter>
-    </ClInclude>
-    <ClInclude Include="..\thirdparty\numbuf\cpp\src\numbuf\util\buffer.h">
-      <Filter>Header Files\numbuf\util</Filter>
-    </ClInclude>
-    <ClInclude Include="..\thirdparty\numbuf\cpp\src\numbuf\util\logging.h">
-      <Filter>Header Files\numbuf\util</Filter>
-    </ClInclude>
-    <ClInclude Include="..\thirdparty\numbuf\cpp\src\numbuf\util\utils.h">
-      <Filter>Header Files\numbuf\util</Filter>
-    </ClInclude>
-    <ClInclude Include="..\thirdparty\numbuf\python\src\pynumbuf\adapters\numpy.h">
-      <Filter>Header Files\pynumbuf\adapters</Filter>
-    </ClInclude>
-    <ClInclude Include="..\thirdparty\numbuf\python\src\pynumbuf\adapters\python.h">
-      <Filter>Header Files\pynumbuf\adapters</Filter>
-    </ClInclude>
   </ItemGroup>
 </Project>

vsprojects/scheduler.vcxproj

@@ -34,7 +34,7 @@
   </ImportGroup>
   <ImportGroup Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="base.props" />
+    <Import Project="$(SolutionDir)vsprojects\base.props" Condition="exists('$(SolutionDir)vsprojects\base.props')" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <ItemDefinitionGroup>

vsprojects/shell.pyproj

@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>55436dea-03b9-4955-aab9-6fec4f8bcb87</ProjectGuid>
+    <ProjectHome>.</ProjectHome>
+    <StartupFile>..\scripts\shell.py</StartupFile>
+    <SearchPath>
+    </SearchPath>
+    <WorkingDirectory>.</WorkingDirectory>
+    <OutputPath>.</OutputPath>
+    <Name>shell</Name>
+    <RootNamespace>shell</RootNamespace>
+    <LaunchProvider>Standard Python launcher</LaunchProvider>
+    <EnableNativeCodeDebugging>False</EnableNativeCodeDebugging>
+    <Environment>PYTHONPATH=$(SolutionDir)build\x64\$(Configuration)\;$(SolutionDir)build\Win32\$(Configuration)\;$(MSBuildThisFileDirectory)..\lib\python\;$(MSBuildThisFileDirectory)..\scripts\;$(PYTHONPATH)
+PATH=$(SolutionDir)build\x64\$(Configuration)\;$(SolutionDir)build\Win32\$(Configuration)\;$(PATH)</Environment>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
+    <DebugSymbols>true</DebugSymbols>
+    <EnableUnmanagedDebugging>false</EnableUnmanagedDebugging>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)' != 'Debug' ">
+    <DebugSymbols>true</DebugSymbols>
+    <EnableUnmanagedDebugging>false</EnableUnmanagedDebugging>
+  </PropertyGroup>
+  <PropertyGroup>
+    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
+    <PtvsTargetsFile>$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\Python Tools\Microsoft.PythonTools.targets</PtvsTargetsFile>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\thirdparty\numbuf\vsprojects\numbuf.vcxproj">
+      <Name>numbuf</Name>
+      <Project>{609d1438-d42d-4cba-80a5-a1398c3bcc85}</Project>
+      <Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="objstore.vcxproj">
+      <Name>objstore</Name>
+      <Project>{ddfcec30-7024-421a-979a-b1bf69cf464e}</Project>
+      <Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="raylib.vcxproj">
+      <Name>raylib</Name>
+      <Project>{76be8e91-0f74-4276-a6a7-b279c6fea0d2}</Project>
+      <Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="scheduler.vcxproj">
+      <Name>scheduler</Name>
+      <Project>{d4f50b21-7fde-41ce-87f5-2cf71178ef40}</Project>
+      <Private>False</Private>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="ray\" />
+    <Folder Include="tests\" />
+    <Folder Include="scripts\" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\lib\python\ray\config.py">
+      <Link>ray\config.py</Link>
+    </Compile>
+    <Compile Include="..\lib\python\ray\graph.py">
+      <Link>ray\graph.py</Link>
+    </Compile>
+    <Compile Include="..\lib\python\ray\pickling.py">
+      <Link>ray\pickling.py</Link>
+    </Compile>
+    <Compile Include="..\lib\python\ray\serialization.py">
+      <Link>ray\serialization.py</Link>
+    </Compile>
+    <Compile Include="..\lib\python\ray\services.py">
+      <Link>ray\services.py</Link>
+    </Compile>
+    <Compile Include="..\lib\python\ray\worker.py">
+      <Link>ray\worker.py</Link>
+    </Compile>
+    <Compile Include="..\lib\python\ray\__init__.py">
+      <Link>ray\__init__.py</Link>
+    </Compile>
+    <Compile Include="..\scripts\cluster.py">
+      <Link>scripts\cluster.py</Link>
+    </Compile>
+    <Compile Include="..\scripts\default_worker.py">
+      <Link>scripts\default_worker.py</Link>
+    </Compile>
+    <Compile Include="..\scripts\ec2.py">
+      <Link>scripts\ec2.py</Link>
+    </Compile>
+    <Compile Include="..\scripts\example_functions.py">
+      <Link>scripts\example_functions.py</Link>
+    </Compile>
+    <Compile Include="..\scripts\shell.py">
+      <Link>scripts\shell.py</Link>
+    </Compile>
+    <Compile Include="..\test\array_test.py">
+      <Link>tests\array_test.py</Link>
+    </Compile>
+    <Compile Include="..\test\memory_leak_deserialize.py">
+      <Link>tests\memory_leak_deserialize.py</Link>
+    </Compile>
+    <Compile Include="..\test\microbenchmarks.py">
+      <Link>tests\microbenchmarks.py</Link>
+    </Compile>
+    <Compile Include="..\test\runtest.py">
+      <Link>tests\runtest.py</Link>
+    </Compile>
+    <Compile Include="..\test\test_functions.py">
+      <Link>tests\test_functions.py</Link>
+    </Compile>
+  </ItemGroup>
+  <Import Condition="Exists($(PtvsTargetsFile))" Project="$(PtvsTargetsFile)" />
+  <Import Condition="!Exists($(PtvsTargetsFile))" Project="$(MSBuildToolsPath)\Microsoft.Common.targets" />
+  <!-- Uncomment the CoreCompile target to enable the Build command in
+       Visual Studio and specify your pre- and post-build commands in
+       the BeforeBuild and AfterBuild targets below. -->
+  <!--<Target Name="CoreCompile" />-->
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+</Project>