[Mobies-commit] [commit] r4248 - in UDM/trunk: . NuGetPackages NuGetPackages/boost.1.55.0.10 NuGetPackages/boost.1.55.0.10/build NuGetPackages/boost.1.55.0.10/build/native NuGetPackages/boost_python.1.55.0.10 NuGetPackages/boost_python.1.55.0.10/build NuGetPackages/boost_python.1.55.0.10/build/native Projects/Win32/VC10/src Projects/Win32/VC10/src/.nuget Projects/Win32/VC10/src/UdmPython WiX/Udm_bin bin/Python26 bin/Python27
ksmyth at redhat3.isis.vanderbilt.edu
ksmyth at redhat3.isis.vanderbilt.edu
Wed Jan 22 16:43:24 CST 2014
Author: ksmyth
Date: Wed Jan 22 16:43:24 2014
New Revision: 4248
Log:
Use NuGet for boost_python
Added:
UDM/trunk/NuGet.Config
UDM/trunk/NuGetPackages/
UDM/trunk/NuGetPackages/boost.1.55.0.10/
UDM/trunk/NuGetPackages/boost.1.55.0.10/build/
UDM/trunk/NuGetPackages/boost.1.55.0.10/build/native/
UDM/trunk/NuGetPackages/boost.1.55.0.10/build/native/boost.targets
UDM/trunk/NuGetPackages/boost_python.1.55.0.10/
UDM/trunk/NuGetPackages/boost_python.1.55.0.10/build/
UDM/trunk/NuGetPackages/boost_python.1.55.0.10/build/native/
UDM/trunk/NuGetPackages/boost_python.1.55.0.10/build/native/boost_python.targets
UDM/trunk/Projects/Win32/VC10/src/.nuget/
UDM/trunk/Projects/Win32/VC10/src/.nuget/NuGet.Config
UDM/trunk/Projects/Win32/VC10/src/.nuget/NuGet.exe
UDM/trunk/Projects/Win32/VC10/src/.nuget/NuGet.targets
UDM/trunk/Projects/Win32/VC10/src/UdmPython/packages.config
Deleted:
UDM/trunk/bin/Python26/boost_python-vc100-mt-1_44.dll
UDM/trunk/bin/Python26/boost_python-vc100-mt-gd-1_44.dll
UDM/trunk/bin/Python27/boost_python-vc100-mt-1_44.dll
Modified:
UDM/trunk/Projects/Win32/VC10/src/Udm.sln
UDM/trunk/Projects/Win32/VC10/src/UdmPython/UdmPython.vcxproj
UDM/trunk/Projects/Win32/VC10/src/UdmPython/UdmPython.vcxproj.filters
UDM/trunk/WiX/Udm_bin/Udm_bin.wxs
Added: UDM/trunk/NuGet.Config
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ UDM/trunk/NuGet.Config Wed Jan 22 16:43:24 2014 (r4248)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+ <solution>
+ <add key="disableSourceControlIntegration" value="true" />
+ </solution>
+
+ <config>
+ <add key="repositorypath" value="NuGetPackages" />
+ </config>
+
+ <packageRestore>
+ <!-- Allow NuGet to download missing packages -->
+ <add key="enabled" value="True" />
+
+ <!-- Automatically check for missing packages during build in Visual Studio -->
+ <add key="automatic" value="True" />
+ </packageRestore>
+</configuration>
\ No newline at end of file
Added: UDM/trunk/NuGetPackages/boost.1.55.0.10/build/native/boost.targets
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ UDM/trunk/NuGetPackages/boost.1.55.0.10/build/native/boost.targets Wed Jan 22 16:43:24 2014 (r4248)
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemDefinitionGroup>
+ <ClCompile>
+ <PreprocessorDefinitions>;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>$(MSBuildThisFileDirectory)..\..\lib\native\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ </ClCompile>
+ </ItemDefinitionGroup>
+ <ItemGroup />
+</Project>
\ No newline at end of file
Added: UDM/trunk/NuGetPackages/boost_python.1.55.0.10/build/native/boost_python.targets
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ UDM/trunk/NuGetPackages/boost_python.1.55.0.10/build/native/boost_python.targets Wed Jan 22 16:43:24 2014 (r4248)
@@ -0,0 +1,207 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemDefinitionGroup>
+ <ClCompile>
+ <PreprocessorDefinitions>BOOST_PYTHON_STATIC_LIB;BOOST_PYTHON_NO_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ </ClCompile>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+ <ClCompile Include="$(MSBuildThisFileDirectory)..\..\lib\native\src\converter\boost_python.converter.arg_to_python_base.cpp">
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>
+ <SDLCheck>False</SDLCheck>
+ <ExceptionHandling>Async</ExceptionHandling>
+ <PreprocessorDefinitions>;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>$(MSBuildThisFileDirectory)..\..\lib\native\src\converter;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ </ClCompile>
+ <ClCompile Include="$(MSBuildThisFileDirectory)..\..\lib\native\src\converter\boost_python.converter.builtin_converters.cpp">
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>
+ <SDLCheck>False</SDLCheck>
+ <ExceptionHandling>Async</ExceptionHandling>
+ <PreprocessorDefinitions>;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>$(MSBuildThisFileDirectory)..\..\lib\native\src\converter;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ </ClCompile>
+ <ClCompile Include="$(MSBuildThisFileDirectory)..\..\lib\native\src\converter\boost_python.converter.from_python.cpp">
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>
+ <SDLCheck>False</SDLCheck>
+ <ExceptionHandling>Async</ExceptionHandling>
+ <PreprocessorDefinitions>;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>$(MSBuildThisFileDirectory)..\..\lib\native\src\converter;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ </ClCompile>
+ <ClCompile Include="$(MSBuildThisFileDirectory)..\..\lib\native\src\converter\boost_python.converter.registry.cpp">
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>
+ <SDLCheck>False</SDLCheck>
+ <ExceptionHandling>Async</ExceptionHandling>
+ <PreprocessorDefinitions>;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>$(MSBuildThisFileDirectory)..\..\lib\native\src\converter;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ </ClCompile>
+ <ClCompile Include="$(MSBuildThisFileDirectory)..\..\lib\native\src\converter\boost_python.converter.type_id.cpp">
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>
+ <SDLCheck>False</SDLCheck>
+ <ExceptionHandling>Async</ExceptionHandling>
+ <PreprocessorDefinitions>;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>$(MSBuildThisFileDirectory)..\..\lib\native\src\converter;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ </ClCompile>
+ <ClCompile Include="$(MSBuildThisFileDirectory)..\..\lib\native\src\object\boost_python.object.class.cpp">
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>
+ <SDLCheck>False</SDLCheck>
+ <ExceptionHandling>Async</ExceptionHandling>
+ <PreprocessorDefinitions>;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>$(MSBuildThisFileDirectory)..\..\lib\native\src\object;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ </ClCompile>
+ <ClCompile Include="$(MSBuildThisFileDirectory)..\..\lib\native\src\object\boost_python.object.enum.cpp">
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>
+ <SDLCheck>False</SDLCheck>
+ <ExceptionHandling>Async</ExceptionHandling>
+ <PreprocessorDefinitions>;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>$(MSBuildThisFileDirectory)..\..\lib\native\src\object;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ </ClCompile>
+ <ClCompile Include="$(MSBuildThisFileDirectory)..\..\lib\native\src\object\boost_python.object.function.cpp">
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>
+ <SDLCheck>False</SDLCheck>
+ <ExceptionHandling>Async</ExceptionHandling>
+ <PreprocessorDefinitions>;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>$(MSBuildThisFileDirectory)..\..\lib\native\src\object;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ </ClCompile>
+ <ClCompile Include="$(MSBuildThisFileDirectory)..\..\lib\native\src\object\boost_python.object.function_doc_signature.cpp">
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>
+ <SDLCheck>False</SDLCheck>
+ <ExceptionHandling>Async</ExceptionHandling>
+ <PreprocessorDefinitions>;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>$(MSBuildThisFileDirectory)..\..\lib\native\src\object;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ </ClCompile>
+ <ClCompile Include="$(MSBuildThisFileDirectory)..\..\lib\native\src\object\boost_python.object.inheritance.cpp">
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>
+ <SDLCheck>False</SDLCheck>
+ <ExceptionHandling>Async</ExceptionHandling>
+ <PreprocessorDefinitions>;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>$(MSBuildThisFileDirectory)..\..\lib\native\src\object;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ </ClCompile>
+ <ClCompile Include="$(MSBuildThisFileDirectory)..\..\lib\native\src\object\boost_python.object.iterator.cpp">
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>
+ <SDLCheck>False</SDLCheck>
+ <ExceptionHandling>Async</ExceptionHandling>
+ <PreprocessorDefinitions>;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>$(MSBuildThisFileDirectory)..\..\lib\native\src\object;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ </ClCompile>
+ <ClCompile Include="$(MSBuildThisFileDirectory)..\..\lib\native\src\object\boost_python.object.life_support.cpp">
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>
+ <SDLCheck>False</SDLCheck>
+ <ExceptionHandling>Async</ExceptionHandling>
+ <PreprocessorDefinitions>;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>$(MSBuildThisFileDirectory)..\..\lib\native\src\object;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ </ClCompile>
+ <ClCompile Include="$(MSBuildThisFileDirectory)..\..\lib\native\src\object\boost_python.object.pickle_support.cpp">
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>
+ <SDLCheck>False</SDLCheck>
+ <ExceptionHandling>Async</ExceptionHandling>
+ <PreprocessorDefinitions>;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>$(MSBuildThisFileDirectory)..\..\lib\native\src\object;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ </ClCompile>
+ <ClCompile Include="$(MSBuildThisFileDirectory)..\..\lib\native\src\object\boost_python.object.stl_iterator.cpp">
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>
+ <SDLCheck>False</SDLCheck>
+ <ExceptionHandling>Async</ExceptionHandling>
+ <PreprocessorDefinitions>;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>$(MSBuildThisFileDirectory)..\..\lib\native\src\object;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ </ClCompile>
+ <ClCompile Include="$(MSBuildThisFileDirectory)..\..\lib\native\src\boost_python.dict.cpp">
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>
+ <SDLCheck>False</SDLCheck>
+ <ExceptionHandling>Async</ExceptionHandling>
+ <PreprocessorDefinitions>;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>$(MSBuildThisFileDirectory)..\..\lib\native\src\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ </ClCompile>
+ <ClCompile Include="$(MSBuildThisFileDirectory)..\..\lib\native\src\boost_python.errors.cpp">
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>
+ <SDLCheck>False</SDLCheck>
+ <ExceptionHandling>Async</ExceptionHandling>
+ <PreprocessorDefinitions>;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>$(MSBuildThisFileDirectory)..\..\lib\native\src\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ </ClCompile>
+ <ClCompile Include="$(MSBuildThisFileDirectory)..\..\lib\native\src\boost_python.exec.cpp">
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>
+ <SDLCheck>False</SDLCheck>
+ <ExceptionHandling>Async</ExceptionHandling>
+ <PreprocessorDefinitions>;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>$(MSBuildThisFileDirectory)..\..\lib\native\src\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ </ClCompile>
+ <ClCompile Include="$(MSBuildThisFileDirectory)..\..\lib\native\src\boost_python.import.cpp">
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>
+ <SDLCheck>False</SDLCheck>
+ <ExceptionHandling>Async</ExceptionHandling>
+ <PreprocessorDefinitions>;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>$(MSBuildThisFileDirectory)..\..\lib\native\src\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ </ClCompile>
+ <ClCompile Include="$(MSBuildThisFileDirectory)..\..\lib\native\src\boost_python.list.cpp">
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>
+ <SDLCheck>False</SDLCheck>
+ <ExceptionHandling>Async</ExceptionHandling>
+ <PreprocessorDefinitions>;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>$(MSBuildThisFileDirectory)..\..\lib\native\src\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ </ClCompile>
+ <ClCompile Include="$(MSBuildThisFileDirectory)..\..\lib\native\src\boost_python.long.cpp">
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>
+ <SDLCheck>False</SDLCheck>
+ <ExceptionHandling>Async</ExceptionHandling>
+ <PreprocessorDefinitions>;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>$(MSBuildThisFileDirectory)..\..\lib\native\src\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ </ClCompile>
+ <ClCompile Include="$(MSBuildThisFileDirectory)..\..\lib\native\src\boost_python.module.cpp">
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>
+ <SDLCheck>False</SDLCheck>
+ <ExceptionHandling>Async</ExceptionHandling>
+ <PreprocessorDefinitions>;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>$(MSBuildThisFileDirectory)..\..\lib\native\src\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ </ClCompile>
+ <ClCompile Include="$(MSBuildThisFileDirectory)..\..\lib\native\src\boost_python.numeric.cpp">
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>
+ <SDLCheck>False</SDLCheck>
+ <ExceptionHandling>Async</ExceptionHandling>
+ <PreprocessorDefinitions>;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>$(MSBuildThisFileDirectory)..\..\lib\native\src\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ </ClCompile>
+ <ClCompile Include="$(MSBuildThisFileDirectory)..\..\lib\native\src\boost_python.object_operators.cpp">
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>
+ <SDLCheck>False</SDLCheck>
+ <ExceptionHandling>Async</ExceptionHandling>
+ <PreprocessorDefinitions>;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>$(MSBuildThisFileDirectory)..\..\lib\native\src\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ </ClCompile>
+ <ClCompile Include="$(MSBuildThisFileDirectory)..\..\lib\native\src\boost_python.object_protocol.cpp">
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>
+ <SDLCheck>False</SDLCheck>
+ <ExceptionHandling>Async</ExceptionHandling>
+ <PreprocessorDefinitions>;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>$(MSBuildThisFileDirectory)..\..\lib\native\src\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ </ClCompile>
+ <ClCompile Include="$(MSBuildThisFileDirectory)..\..\lib\native\src\boost_python.slice.cpp">
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>
+ <SDLCheck>False</SDLCheck>
+ <ExceptionHandling>Async</ExceptionHandling>
+ <PreprocessorDefinitions>;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>$(MSBuildThisFileDirectory)..\..\lib\native\src\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ </ClCompile>
+ <ClCompile Include="$(MSBuildThisFileDirectory)..\..\lib\native\src\boost_python.str.cpp">
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>
+ <SDLCheck>False</SDLCheck>
+ <ExceptionHandling>Async</ExceptionHandling>
+ <PreprocessorDefinitions>;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>$(MSBuildThisFileDirectory)..\..\lib\native\src\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ </ClCompile>
+ <ClCompile Include="$(MSBuildThisFileDirectory)..\..\lib\native\src\boost_python.tuple.cpp">
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>
+ <SDLCheck>False</SDLCheck>
+ <ExceptionHandling>Async</ExceptionHandling>
+ <PreprocessorDefinitions>;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>$(MSBuildThisFileDirectory)..\..\lib\native\src\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ </ClCompile>
+ <ClCompile Include="$(MSBuildThisFileDirectory)..\..\lib\native\src\boost_python.wrapper.cpp">
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>
+ <SDLCheck>False</SDLCheck>
+ <ExceptionHandling>Async</ExceptionHandling>
+ <PreprocessorDefinitions>;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>$(MSBuildThisFileDirectory)..\..\lib\native\src\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ </ClCompile>
+ </ItemGroup>
+</Project>
\ No newline at end of file
Added: UDM/trunk/Projects/Win32/VC10/src/.nuget/NuGet.Config
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ UDM/trunk/Projects/Win32/VC10/src/.nuget/NuGet.Config Wed Jan 22 16:43:24 2014 (r4248)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+ <solution>
+ <add key="disableSourceControlIntegration" value="true" />
+ </solution>
+</configuration>
\ No newline at end of file
Added: UDM/trunk/Projects/Win32/VC10/src/.nuget/NuGet.exe
==============================================================================
Binary files /dev/null 00:00:00 1970 (empty, because file is newly added) and UDM/trunk/Projects/Win32/VC10/src/.nuget/NuGet.exe Wed Jan 22 16:43:24 2014 (r4248) differ
Added: UDM/trunk/Projects/Win32/VC10/src/.nuget/NuGet.targets
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ UDM/trunk/Projects/Win32/VC10/src/.nuget/NuGet.targets Wed Jan 22 16:43:24 2014 (r4248)
@@ -0,0 +1,136 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup>
+ <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">$(MSBuildProjectDirectory)\..\</SolutionDir>
+
+ <!-- Enable the restore command to run before builds -->
+ <RestorePackages Condition=" '$(RestorePackages)' == '' ">false</RestorePackages>
+
+ <!-- Property that enables building a package from a project -->
+ <BuildPackage Condition=" '$(BuildPackage)' == '' ">false</BuildPackage>
+
+ <!-- Determines if package restore consent is required to restore packages -->
+ <RequireRestoreConsent Condition=" '$(RequireRestoreConsent)' != 'false' ">true</RequireRestoreConsent>
+
+ <!-- Download NuGet.exe if it does not already exist -->
+ <DownloadNuGetExe Condition=" '$(DownloadNuGetExe)' == '' ">false</DownloadNuGetExe>
+ </PropertyGroup>
+
+ <ItemGroup Condition=" '$(PackageSources)' == '' ">
+ <!-- Package sources used to restore packages. By default, registered sources under %APPDATA%\NuGet\NuGet.Config will be used -->
+ <!-- The official NuGet package source (https://www.nuget.org/api/v2/) will be excluded if package sources are specified and it does not appear in the list -->
+ <!--
+ <PackageSource Include="https://www.nuget.org/api/v2/" />
+ <PackageSource Include="https://my-nuget-source/nuget/" />
+ -->
+ </ItemGroup>
+
+ <PropertyGroup Condition=" '$(OS)' == 'Windows_NT'">
+ <!-- Windows specific commands -->
+ <NuGetToolsPath>$([System.IO.Path]::Combine($(SolutionDir), ".nuget"))</NuGetToolsPath>
+ <PackagesConfig>$([System.IO.Path]::Combine($(ProjectDir), "packages.config"))</PackagesConfig>
+ </PropertyGroup>
+
+ <PropertyGroup Condition=" '$(OS)' != 'Windows_NT'">
+ <!-- We need to launch nuget.exe with the mono command if we're not on windows -->
+ <NuGetToolsPath>$(SolutionDir).nuget</NuGetToolsPath>
+ <PackagesConfig>packages.config</PackagesConfig>
+ </PropertyGroup>
+
+ <PropertyGroup>
+ <!-- NuGet command -->
+ <NuGetExePath Condition=" '$(NuGetExePath)' == '' ">$(NuGetToolsPath)\NuGet.exe</NuGetExePath>
+ <PackageSources Condition=" $(PackageSources) == '' ">@(PackageSource)</PackageSources>
+
+ <NuGetCommand Condition=" '$(OS)' == 'Windows_NT'">"$(NuGetExePath)"</NuGetCommand>
+ <NuGetCommand Condition=" '$(OS)' != 'Windows_NT' ">mono --runtime=v4.0.30319 $(NuGetExePath)</NuGetCommand>
+
+ <PackageOutputDir Condition="$(PackageOutputDir) == ''">$(TargetDir.Trim('\\'))</PackageOutputDir>
+
+ <RequireConsentSwitch Condition=" $(RequireRestoreConsent) == 'true' ">-RequireConsent</RequireConsentSwitch>
+ <NonInteractiveSwitch Condition=" '$(VisualStudioVersion)' != '' AND '$(OS)' == 'Windows_NT' ">-NonInteractive</NonInteractiveSwitch>
+
+ <PaddedSolutionDir Condition=" '$(OS)' == 'Windows_NT'">"$(SolutionDir) "</PaddedSolutionDir>
+ <PaddedSolutionDir Condition=" '$(OS)' != 'Windows_NT' ">"$(SolutionDir)"</PaddedSolutionDir>
+
+ <!-- Commands -->
+ <RestoreCommand>$(NuGetCommand) install "$(PackagesConfig)" -source "$(PackageSources)" $(NonInteractiveSwitch) $(RequireConsentSwitch) -solutionDir $(PaddedSolutionDir)</RestoreCommand>
+ <BuildCommand>$(NuGetCommand) pack "$(ProjectPath)" -Properties "Configuration=$(Configuration);Platform=$(Platform)" $(NonInteractiveSwitch) -OutputDirectory "$(PackageOutputDir)" -symbols</BuildCommand>
+
+ <!-- We need to ensure packages are restored prior to assembly resolve -->
+ <BuildDependsOn Condition="$(RestorePackages) == 'true'">
+ RestorePackages;
+ $(BuildDependsOn);
+ </BuildDependsOn>
+
+ <!-- Make the build depend on restore packages -->
+ <BuildDependsOn Condition="$(BuildPackage) == 'true'">
+ $(BuildDependsOn);
+ BuildPackage;
+ </BuildDependsOn>
+ </PropertyGroup>
+
+ <Target Name="CheckPrerequisites">
+ <!-- Raise an error if we're unable to locate nuget.exe -->
+ <Error Condition="'$(DownloadNuGetExe)' != 'true' AND !Exists('$(NuGetExePath)')" Text="Unable to locate '$(NuGetExePath)'" />
+ <!--
+ Take advantage of MsBuild's build dependency tracking to make sure that we only ever download nuget.exe once.
+ This effectively acts as a lock that makes sure that the download operation will only happen once and all
+ parallel builds will have to wait for it to complete.
+ -->
+ <MsBuild Targets="_DownloadNuGet" Projects="$(MSBuildThisFileFullPath)" Properties="Configuration=NOT_IMPORTANT;DownloadNuGetExe=$(DownloadNuGetExe)" />
+ </Target>
+
+ <Target Name="_DownloadNuGet">
+ <DownloadNuGet OutputFilename="$(NuGetExePath)" Condition=" '$(DownloadNuGetExe)' == 'true' AND !Exists('$(NuGetExePath)')" />
+ </Target>
+
+ <Target Name="RestorePackages" DependsOnTargets="CheckPrerequisites">
+ <Exec Command="$(RestoreCommand)"
+ Condition="'$(OS)' != 'Windows_NT' And Exists('$(PackagesConfig)')" />
+
+ <Exec Command="$(RestoreCommand)"
+ LogStandardErrorAsError="true"
+ Condition="'$(OS)' == 'Windows_NT' And Exists('$(PackagesConfig)')" />
+ </Target>
+
+ <Target Name="BuildPackage" DependsOnTargets="CheckPrerequisites">
+ <Exec Command="$(BuildCommand)"
+ Condition=" '$(OS)' != 'Windows_NT' " />
+
+ <Exec Command="$(BuildCommand)"
+ LogStandardErrorAsError="true"
+ Condition=" '$(OS)' == 'Windows_NT' " />
+ </Target>
+
+ <UsingTask TaskName="DownloadNuGet" TaskFactory="CodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.v4.0.dll">
+ <ParameterGroup>
+ <OutputFilename ParameterType="System.String" Required="true" />
+ </ParameterGroup>
+ <Task>
+ <Reference Include="System.Core" />
+ <Using Namespace="System" />
+ <Using Namespace="System.IO" />
+ <Using Namespace="System.Net" />
+ <Using Namespace="Microsoft.Build.Framework" />
+ <Using Namespace="Microsoft.Build.Utilities" />
+ <Code Type="Fragment" Language="cs">
+ <![CDATA[
+ try {
+ OutputFilename = Path.GetFullPath(OutputFilename);
+
+ Log.LogMessage("Downloading latest version of NuGet.exe...");
+ WebClient webClient = new WebClient();
+ webClient.DownloadFile("https://www.nuget.org/nuget.exe", OutputFilename);
+
+ return true;
+ }
+ catch (Exception ex) {
+ Log.LogErrorFromException(ex);
+ return false;
+ }
+ ]]>
+ </Code>
+ </Task>
+ </UsingTask>
+</Project>
\ No newline at end of file
Modified: UDM/trunk/Projects/Win32/VC10/src/Udm.sln
==============================================================================
--- UDM/trunk/Projects/Win32/VC10/src/Udm.sln Wed Jan 22 12:37:16 2014 (r4247)
+++ UDM/trunk/Projects/Win32/VC10/src/Udm.sln Wed Jan 22 16:43:24 2014 (r4248)
@@ -59,6 +59,12 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PythonAPIGen", "Udm\PythonAPIGen\PythonAPIGen.vcxproj", "{F264EC86-7AE6-4A51-A35C-CB4947E57F28}"
EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{62FDD9CD-BBFF-4268-A27F-9FCBEA4B8F70}"
+ ProjectSection(SolutionItems) = preProject
+ .nuget\NuGet.Config = .nuget\NuGet.Config
+ .nuget\NuGet.targets = .nuget\NuGet.targets
+ EndProjectSection
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
BootUdmCompile Debug|Win32 = BootUdmCompile Debug|Win32
Modified: UDM/trunk/Projects/Win32/VC10/src/UdmPython/UdmPython.vcxproj
==============================================================================
--- UDM/trunk/Projects/Win32/VC10/src/UdmPython/UdmPython.vcxproj Wed Jan 22 12:37:16 2014 (r4247)
+++ UDM/trunk/Projects/Win32/VC10/src/UdmPython/UdmPython.vcxproj Wed Jan 22 16:43:24 2014 (r4248)
@@ -29,6 +29,8 @@
<PropertyGroup Label="Globals">
<ProjectGuid>{55409968-F077-4A87-87D5-F28DB28181C2}</ProjectGuid>
<RootNamespace>UdmPython</RootNamespace>
+ <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
+ <RestorePackages>true</RestorePackages>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
@@ -64,37 +66,31 @@
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="..\boost.props" />
<Import Project="..\Udm.props" />
<Import Project="..\Python26.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="..\boost.props" />
<Import Project="..\Udm.props" />
<Import Project="..\Python26.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release27|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="..\boost.props" />
<Import Project="..\Udm.props" />
<Import Project="..\Python27.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release27|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="..\boost.props" />
<Import Project="..\Udm.props" />
<Import Project="..\Python27.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="..\boost.props" />
<Import Project="..\Udm.props" />
<Import Project="..\Python26.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- <Import Project="..\boost.props" />
<Import Project="..\Udm.props" />
<Import Project="..\Python26.props" />
</ImportGroup>
@@ -256,7 +252,13 @@
<ItemGroup>
<ClCompile Include="..\..\..\..\..\src\UdmPython\UdmPython.cpp" />
</ItemGroup>
+ <ItemGroup>
+ <None Include="packages.config" />
+ </ItemGroup>
<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')" />
</ImportGroup>
</Project>
\ No newline at end of file
Modified: UDM/trunk/Projects/Win32/VC10/src/UdmPython/UdmPython.vcxproj.filters
==============================================================================
--- UDM/trunk/Projects/Win32/VC10/src/UdmPython/UdmPython.vcxproj.filters Wed Jan 22 12:37:16 2014 (r4247)
+++ UDM/trunk/Projects/Win32/VC10/src/UdmPython/UdmPython.vcxproj.filters Wed Jan 22 16:43:24 2014 (r4248)
@@ -15,4 +15,7 @@
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
+ <ItemGroup>
+ <None Include="packages.config" />
+ </ItemGroup>
</Project>
\ No newline at end of file
Added: UDM/trunk/Projects/Win32/VC10/src/UdmPython/packages.config
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ UDM/trunk/Projects/Win32/VC10/src/UdmPython/packages.config Wed Jan 22 16:43:24 2014 (r4248)
@@ -0,0 +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" />
+</packages>
\ No newline at end of file
Modified: UDM/trunk/WiX/Udm_bin/Udm_bin.wxs
==============================================================================
--- UDM/trunk/WiX/Udm_bin/Udm_bin.wxs Wed Jan 22 12:37:16 2014 (r4247)
+++ UDM/trunk/WiX/Udm_bin/Udm_bin.wxs Wed Jan 22 16:43:24 2014 (r4248)
@@ -120,9 +120,6 @@
<Component>
<File Source="..\bin\Python26\__init__.py" />
</Component>
- <Component>
- <File Source="..\bin\Python26\boost_python-vc100-mt-1_44.dll" />
- </Component>
</DirectoryRef>
<DirectoryRef Id="Python27">
@@ -132,9 +129,6 @@
<Component>
<File Source="..\bin\Python27\__init__.py" Id="initpy27"/>
</Component>
- <Component>
- <File Source="..\bin\Python27\boost_python-vc100-mt-1_44.dll" Id="boost_python_vc100_mt_1_44.dll27"/>
- </Component>
</DirectoryRef>
<?endif?>
More information about the Mobies-commit
mailing list