Skip to content
This repository has been archived by the owner on Feb 23, 2021. It is now read-only.

Commit

Permalink
Changing the folder of ARM version of libuv to win7-arm
Browse files Browse the repository at this point in the history
Required to fix: dotnet/aspnetcore#1111
  • Loading branch information
moozzyk committed Dec 15, 2015
1 parent 60769ff commit d2050f5
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
2 changes: 1 addition & 1 deletion makefile.shade
Expand Up @@ -39,7 +39,7 @@ var FULL_VERSION = '${PRODUCT_VERSION + "-" + E("DNX_BUILD_VERSION")}'
#nuget-pack target='package' if='CanBuildForWindows'
copy sourceDir='${Path.Combine(ROOT, "src\\libuv\\bin\\Win32", Configuration2)}' outputDir='${Path.Combine(BUILD_DIR2, "package-src-win\\runtimes\\win7-x86\\native")}' include='*.dll' overwrite='${true}'
copy sourceDir='${Path.Combine(ROOT, "src\\libuv\\bin\\x64", Configuration2)}' outputDir='${Path.Combine(BUILD_DIR2, "package-src-win\\runtimes\\win7-x64\\native")}' include='*.dll' overwrite='${true}'
copy sourceDir='${Path.Combine(ROOT, "src\\libuv\\bin\\ARM", Configuration2)}' outputDir='${Path.Combine(BUILD_DIR2, "package-src-win\\runtimes\\win10-arm\\native")}' include='*.dll' overwrite='${true}'
copy sourceDir='${Path.Combine(ROOT, "src\\libuv\\bin\\ARM", Configuration2)}' outputDir='${Path.Combine(BUILD_DIR2, "package-src-win\\runtimes\\win7-arm\\native")}' include='*.dll' overwrite='${true}'
copy sourceDir='${Path.Combine(ROOT, "build")}' outputDir='${Path.Combine(BUILD_DIR2, "package-src-win")}' include='*' overwrite='${true}'
nuget-pack packageVersion='${FULL_VERSION}' outputDir='${BUILD_DIR2}' extra='-NoPackageAnalysis -Properties TargetOS=Windows' nugetPath='.nuget/nuget.exe' nuspecFile='${Path.Combine(BUILD_DIR2, "package-src-win\\libuv.nuspec")}'

Expand Down
4 changes: 3 additions & 1 deletion src/libuv/Config.Definitions.Props
Expand Up @@ -28,6 +28,8 @@
</ItemGroup>
<PropertyGroup>
<!-- Enables building using Win10 SDK (One Core, ARM) on non-Win10 OS'es -->
<WindowsTargetPlatformVersion Condition="'$(BuildForOneCore)' == 'True' Or '$(Platform)'=='ARM'">$([MSBuild]::GetRegistryValueFromView('HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v10.0', 'ProductVersion', null, RegistryView.Registry64, RegistryView.Registry32)).0</WindowsTargetPlatformVersion>
<WindowsTargetPlatformVersion Condition="'$(BuildForOneCore)' == 'True' Or '$(Platform)'=='ARM'">$([MSBuild]::GetRegistryValueFromView('HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v10.0', 'ProductVersion', null, RegistryView.Registry64, RegistryView.Registry32))</WindowsTargetPlatformVersion>
<!-- The Win10 SDK versions before 10.0.10586.0 had only 3 parts (e.g. 10.0.10240) so `.0` needs to be appended -->
<WindowsTargetPlatformVersion Condition="'$(WindowsTargetPlatformVersion)' != '' And '$(WindowsTargetPlatformVersion.Split(&quot;.&quot;).Length)' == '3'">$(WindowsTargetPlatformVersion).0</WindowsTargetPlatformVersion>
</PropertyGroup>
</Project>

0 comments on commit d2050f5

Please sign in to comment.