[Mobies-commit] [commit] r4393 - in UDM/trunk: NuGetPackages/boost.1.55.0.10/build/native NuGetPackages/boost.1.55.0.16 NuGetPackages/boost.1.55.0.16/build NuGetPackages/boost.1.55.0.16/build/native NuGetPackages/boost_python.1.55.0.10/build/native NuGetPackages/boost_python.1.55.0.16 NuGetPackages/boost_python.1.55.0.16/build NuGetPackages/boost_python.1.55.0.16/build/native Projects/Win32/VC10/src/UdmPython src/UdmPython tests

[ksmyth at svn.isis.vanderbilt.edu]

Author: ksmyth
Date: Fri Oct 13 09:39:11 2017
New Revision: 4393

Log:
udm.pyd: upgrade boost

Added:
   UDM/trunk/NuGetPackages/boost.1.55.0.16/
   UDM/trunk/NuGetPackages/boost.1.55.0.16/build/
   UDM/trunk/NuGetPackages/boost.1.55.0.16/build/native/
   UDM/trunk/NuGetPackages/boost.1.55.0.16/build/native/boost.targets
      - copied, changed from r4392, UDM/trunk/NuGetPackages/boost.1.55.0.10/build/native/boost.targets
   UDM/trunk/NuGetPackages/boost_python.1.55.0.16/
   UDM/trunk/NuGetPackages/boost_python.1.55.0.16/build/
   UDM/trunk/NuGetPackages/boost_python.1.55.0.16/build/native/
   UDM/trunk/NuGetPackages/boost_python.1.55.0.16/build/native/boost_python.targets
      - copied, changed from r4392, UDM/trunk/NuGetPackages/boost_python.1.55.0.10/build/native/boost_python.targets
   UDM/trunk/tests/UdmTest.h
Deleted:
   UDM/trunk/NuGetPackages/boost.1.55.0.10/build/native/boost.targets
   UDM/trunk/NuGetPackages/boost_python.1.55.0.10/build/native/boost_python.targets
Modified:
   UDM/trunk/Projects/Win32/VC10/src/UdmPython/UdmPython.vcxproj
   UDM/trunk/Projects/Win32/VC10/src/UdmPython/packages.config
   UDM/trunk/src/UdmPython/setup.py

Copied and modified: UDM/trunk/NuGetPackages/boost.1.55.0.16/build/native/boost.targets (from r4392, UDM/trunk/NuGetPackages/boost.1.55.0.10/build/native/boost.targets)
==============================================================================

Copied and modified: UDM/trunk/NuGetPackages/boost_python.1.55.0.16/build/native/boost_python.targets (from r4392, UDM/trunk/NuGetPackages/boost_python.1.55.0.10/build/native/boost_python.targets)
==============================================================================

Modified: UDM/trunk/Projects/Win32/VC10/src/UdmPython/UdmPython.vcxproj
==============================================================================
--- UDM/trunk/Projects/Win32/VC10/src/UdmPython/UdmPython.vcxproj	Fri Oct 13 09:38:56 2017	(r4392)
+++ UDM/trunk/Projects/Win32/VC10/src/UdmPython/UdmPython.vcxproj	Fri Oct 13 09:39:11 2017	(r4393)
@@ -397,7 +397,7 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
     <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
-    <Import Project="..\..\..\..\..\NuGetPackages\boost.1.55.0.10\build\native\boost.targets" Condition="Exists('..\..\..\..\..\NuGetPackages\boost.1.55.0.10\build\native\boost.targets')" />
-    <Import Project="..\..\..\..\..\NuGetPackages\boost_python.1.55.0.10\build\native\boost_python.targets" Condition="Exists('..\..\..\..\..\NuGetPackages\boost_python.1.55.0.10\build\native\boost_python.targets')" />
+    <Import Project="..\..\..\..\..\NuGetPackages\boost.1.55.0.16\build\native\boost.targets" Condition="Exists('..\..\..\..\..\NuGetPackages\boost.1.55.0.16\build\native\boost.targets')" />
+    <Import Project="..\..\..\..\..\NuGetPackages\boost_python.1.55.0.16\build\native\boost_python.targets" Condition="Exists('..\..\..\..\..\NuGetPackages\boost_python.1.55.0.16\build\native\boost_python.targets')" />
   </ImportGroup>
 </Project>
\ No newline at end of file

Modified: UDM/trunk/Projects/Win32/VC10/src/UdmPython/packages.config
==============================================================================
--- UDM/trunk/Projects/Win32/VC10/src/UdmPython/packages.config	Fri Oct 13 09:38:56 2017	(r4392)
+++ UDM/trunk/Projects/Win32/VC10/src/UdmPython/packages.config	Fri Oct 13 09:39:11 2017	(r4393)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="boost" version="1.55.0.10" targetFramework="Native" />
-  <package id="boost_python" version="1.55.0.10" targetFramework="Native" />
+  <package id="boost" version="1.55.0.16" targetFramework="Native" />
+  <package id="boost_python" version="1.55.0.16" targetFramework="Native" />
 </packages>
\ No newline at end of file

Modified: UDM/trunk/src/UdmPython/setup.py
==============================================================================
--- UDM/trunk/src/UdmPython/setup.py	Fri Oct 13 09:38:56 2017	(r4392)
+++ UDM/trunk/src/UdmPython/setup.py	Fri Oct 13 09:39:11 2017	(r4393)
@@ -54,6 +54,7 @@
             # \PC
 
             import subprocess
+            subprocess.check_call([r'..\..\Projects\Win32\VC10\src\.nuget\NuGet.exe', 'restore', r'..\..\Projects\Win32\VC10\src\UdmPython\packages.config'])
             subprocess.check_call([os.path.join(os.environ['VS100COMNTOOLS'], '..', '..', 'VC', 'vcvarsall.bat'), ('AMD64' if struct.calcsize("P") == 8 else 'x86')] +
                 ['&&'] +
                 [r'msbuild', r'..\..\Projects\Win32\VC10\src\UdmPython\UdmPython.vcxproj', '/t:Rebuild', '/fl',

Added: UDM/trunk/tests/UdmTest.h
==============================================================================