Skip to content

Commit

Permalink
Refactor coreclr packaging
Browse files Browse the repository at this point in the history
  • Loading branch information
@chcosta
chcosta committed Feb 1, 2017
1 parent 1359351 commit 9497910
Show file tree
Hide file tree
Showing 95 changed files with 373 additions and 3,021 deletions.
82 changes: 45 additions & 37 deletions build.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ usage()
echo "cmakeargs - user-settable additional arguments passed to CMake."
echo "bindir - output directory (defaults to $__ProjectRoot/bin)"
echo "buildstandalonegc - builds the GC in a standalone mode. Can't be used with \"cmakeargs\"."

echo "msbuildonunsupportedplatform"
exit 1
}

Expand Down Expand Up @@ -304,42 +304,46 @@ isMSBuildOnNETCoreSupported()

if [ "$__HostArch" == "x64" ]; then
if [ "$__HostOS" == "Linux" ]; then
case "$__HostDistroRid" in
"centos.7-x64")
__isMSBuildOnNETCoreSupported=1
;;
"debian.8-x64")
__isMSBuildOnNETCoreSupported=1
;;
"fedora.23-x64")
__isMSBuildOnNETCoreSupported=1
;;
"fedora.24-x64")
__isMSBuildOnNETCoreSupported=1
;;
"opensuse.13.2-x64")
__isMSBuildOnNETCoreSupported=1
;;
"opensuse.42.1-x64")
__isMSBuildOnNETCoreSupported=1
;;
"rhel.7"*"-x64")
__isMSBuildOnNETCoreSupported=1
;;
"ubuntu.14.04-x64")
__isMSBuildOnNETCoreSupported=1
;;
"ubuntu.16.04-x64")
__isMSBuildOnNETCoreSupported=1
;;
"ubuntu.16.10-x64")
__isMSBuildOnNETCoreSupported=1
;;
"alpine.3.4.3-x64")
__isMSBuildOnNETCoreSupported=1
;;
*)
esac
if [ "$__msbuildonunsupportedplatform" == "1" ]; then
__isMSBuildOnNETCoreSupported=1
else
case "$__HostDistroRid" in
"centos.7-x64")
__isMSBuildOnNETCoreSupported=1
;;
"debian.8-x64")
__isMSBuildOnNETCoreSupported=1
;;
"fedora.23-x64")
__isMSBuildOnNETCoreSupported=1
;;
"fedora.24-x64")
__isMSBuildOnNETCoreSupported=1
;;
"opensuse.13.2-x64")
__isMSBuildOnNETCoreSupported=1
;;
"opensuse.42.1-x64")
__isMSBuildOnNETCoreSupported=1
;;
"rhel.7"*"-x64")
__isMSBuildOnNETCoreSupported=1
;;
"ubuntu.14.04-x64")
__isMSBuildOnNETCoreSupported=1
;;
"ubuntu.16.04-x64")
__isMSBuildOnNETCoreSupported=1
;;
"ubuntu.16.10-x64")
__isMSBuildOnNETCoreSupported=1
;;
"alpine.3.4.3-x64")
__isMSBuildOnNETCoreSupported=1
;;
*)
esac
fi
elif [ "$__HostOS" == "OSX" ]; then
__isMSBuildOnNETCoreSupported=1
fi
Expand Down Expand Up @@ -558,6 +562,7 @@ __cmakeargs=""
__SkipGenerateVersion=0
__DoCrossArchBuild=0
__PortableLinux=0
__msbuildonunsupportedplatform=0

while :; do
if [ $# -le 0 ]; then
Expand Down Expand Up @@ -728,6 +733,9 @@ while :; do
buildstandalonegc)
__cmakeargs="-DFEATURE_STANDALONE_GC=1"
;;
msbuildonunsupportedplatform)
__msbuildonunsupportedplatform=1
;;
*)
__UnprocessedBuildArgs="$__UnprocessedBuildArgs $1"
;;
Expand Down
1 change: 1 addition & 0 deletions dir.traversal.targets
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,5 @@

<Target Name="Rebuild" DependsOnTargets="Clean;Build" />

<Target Name="Dump" />
</Project>
88 changes: 5 additions & 83 deletions src/.nuget/Microsoft.NETCore.ILAsm/Microsoft.NETCore.ILAsm.builds
View file
Original file line number Diff line number Diff line change
@@ -1,89 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), packaging.props))\packaging.props" />

<PropertyGroup>
<!-- This property must be set to the same value as $(PackageOutputPath) for the nuspecs and nupkgs to be binplaced to the intended location. -->
<OutputPath>$(PackageOutputPath)</OutputPath>
</PropertyGroup>

<!-- We always build the identity/redirection package. However, the platform specific runtime-*.nupkg is built based upon the target OS we are building the product for. -->
<ItemGroup>
<Project Include="Microsoft.NETCore.ILAsm.pkgproj">
</Project>
<Project Condition="'$(TargetsWindows)' == 'true'" Include="win/Microsoft.NETCore.ILAsm.pkgproj">
<OSGroup>Windows_NT</OSGroup>
<Platform>amd64</Platform>
</Project>
<Project Condition="'$(TargetsWindows)' == 'true'" Include="win/Microsoft.NETCore.ILAsm.pkgproj">
<OSGroup>Windows_NT</OSGroup>
<Platform>arm64</Platform>
</Project>
<Project Condition="'$(TargetsWindows)' == 'true'" Include="win/Microsoft.NETCore.ILAsm.pkgproj">
<OSGroup>Windows_NT</OSGroup>
<Platform>x86</Platform>
</Project>
<Project Condition="'$(TargetsWindows)' == 'true'" Include="win/Microsoft.NETCore.ILAsm.pkgproj">
<OSGroup>Windows_NT</OSGroup>
<Platform>arm</Platform>
</Project>
<Project Condition="'$(TargetsLinux)' == 'true' and '$(DistroRid)' == 'linux-x64'" Include="linux/Microsoft.NETCore.ILAsm.pkgproj">
<OSGroup>Linux</OSGroup>
<Platform>amd64</Platform>
</Project>
<Project Condition="'$(TargetsLinux)' == 'true' and '$(DistroRid)' == 'debian.8-x64'" Include="debian/Microsoft.NETCore.ILAsm.pkgproj">
<OSGroup>Linux</OSGroup>
<Platform>amd64</Platform>
</Project>
<Project Condition="'$(TargetsLinux)' == 'true' and '$(DistroRid)' == 'fedora.23-x64'" Include="fedora/23/Microsoft.NETCore.ILAsm.pkgproj">
<OSGroup>Linux</OSGroup>
<Platform>amd64</Platform>
</Project>
<Project Condition="'$(TargetsLinux)' == 'true' and '$(DistroRid)' == 'fedora.24-x64'" Include="fedora/24/Microsoft.NETCore.ILAsm.pkgproj">
<OSGroup>Linux</OSGroup>
<Platform>amd64</Platform>
</Project>
<Project Condition="'$(TargetsLinux)' == 'true' and '$(DistroRid)' == 'opensuse.13.2-x64'" Include="opensuse/13.2/Microsoft.NETCore.ILAsm.pkgproj">
<OSGroup>Linux</OSGroup>
<Platform>amd64</Platform>
</Project>
<Project Condition="'$(TargetsLinux)' == 'true' and '$(DistroRid)' == 'opensuse.42.1-x64'" Include="opensuse/42.1/Microsoft.NETCore.ILAsm.pkgproj">
<OSGroup>Linux</OSGroup>
<Platform>amd64</Platform>
</Project>
<Project Condition="'$(TargetsLinux)' == 'true' and $(DistroRid.StartsWith('rhel.7'))" Include="rhel/Microsoft.NETCore.ILAsm.pkgproj">
<OSGroup>Linux</OSGroup>
<Platform>amd64</Platform>
</Project>
<Project Condition="'$(TargetsLinux)' == 'true' and '$(DistroRid)' == 'ubuntu.14.04-x64'" Include="ubuntu/14.04/Microsoft.NETCore.ILAsm.pkgproj">
<OSGroup>Linux</OSGroup>
<Platform>amd64</Platform>
</Project>
<Project Condition="'$(TargetsLinux)' == 'true' and '$(DistroRid)' == 'ubuntu.14.04-arm'" Include="ubuntu/14.04/Microsoft.NETCore.ILAsm.pkgproj">
<OSGroup>Linux</OSGroup>
<Platform>arm</Platform>
</Project>
<Project Condition="'$(TargetsLinux)' == 'true' and '$(DistroRid)' == 'ubuntu.16.04-x64'" Include="ubuntu/16.04/Microsoft.NETCore.ILAsm.pkgproj">
<OSGroup>Linux</OSGroup>
<Platform>amd64</Platform>
</Project>
<Project Condition="'$(TargetsLinux)' == 'true' and '$(DistroRid)' == 'ubuntu.16.04-arm'" Include="ubuntu/16.04/Microsoft.NETCore.ILAsm.pkgproj">
<OSGroup>Linux</OSGroup>
<Platform>arm</Platform>
</Project>
<Project Condition="'$(TargetsLinux)' == 'true' and '$(DistroRid)' == 'ubuntu.16.10-x64'" Include="ubuntu/16.10/Microsoft.NETCore.ILAsm.pkgproj">
<OSGroup>Linux</OSGroup>
<Platform>amd64</Platform>
</Project>
<Project Condition="'$(TargetsLinux)' == 'true' and '$(DistroRid)' == 'alpine.3.4.3-x64'" Include="alpine/3.4.3/Microsoft.NETCore.ILAsm.pkgproj">
<OSGroup>Linux</OSGroup>
<Platform>amd64</Platform>
</Project>
<Project Condition="'$(TargetsOSX)' == 'true'" Include="osx/Microsoft.NETCore.ILAsm.pkgproj">
<OSGroup>OSX</OSGroup>
<Platform>amd64</Platform>
</Project>
<!-- identity project, runtime specific projects are included by props above -->
<Project Include="$(MSBuildProjectName).pkgproj" />
</ItemGroup>

<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), packaging.targets))\packaging.targets" />
</Project>
72 changes: 8 additions & 64 deletions src/.nuget/Microsoft.NETCore.ILAsm/Microsoft.NETCore.ILAsm.pkgproj
View file
Original file line number Diff line number Diff line change
@@ -1,69 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
<PropertyGroup>
<SkipPackageFileCheck>true</SkipPackageFileCheck>
<SkipValidatePackage>true</SkipValidatePackage>
<PackagePlatforms>x64;x86;arm64;arm;</PackagePlatforms>
<OutputPath>$(PackagesOutputPath)</OutputPath>
<IncludeRuntimeJson>true</IncludeRuntimeJson>
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), packaging.props))\packaging.props" />

<PropertyGroup Condition="'$(PackageTargetRuntime)' == ''">
<PackagePlatforms>x64;x86;arm64;arm;</PackagePlatforms>
<IsLineupPackage>true</IsLineupPackage>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\Microsoft.NETCore.Runtime.CoreCLR\Microsoft.NETCore.Runtime.CoreCLR.pkgproj" />
<ProjectReference Include="win\Microsoft.NETCore.ILAsm.pkgproj">
<Platform>amd64</Platform>
</ProjectReference>
<ProjectReference Include="win\Microsoft.NETCore.ILAsm.pkgproj">
<Platform>arm64</Platform>
</ProjectReference>
<ProjectReference Include="win\Microsoft.NETCore.ILAsm.pkgproj">
<Platform>x86</Platform>
</ProjectReference>
<ProjectReference Include="win\Microsoft.NETCore.ILAsm.pkgproj">
<Platform>arm</Platform>
</ProjectReference>
<ProjectReference Include="linux\Microsoft.NETCore.ILAsm.pkgproj">
<Platform>amd64</Platform>
</ProjectReference>
<ProjectReference Include="debian\Microsoft.NETCore.ILAsm.pkgproj">
<Platform>amd64</Platform>
</ProjectReference>
<ProjectReference Include="fedora\23\Microsoft.NETCore.ILAsm.pkgproj">
<Platform>amd64</Platform>
</ProjectReference>
<ProjectReference Include="fedora\24\Microsoft.NETCore.ILAsm.pkgproj">
<Platform>amd64</Platform>
</ProjectReference>
<ProjectReference Include="opensuse\13.2\Microsoft.NETCore.ILAsm.pkgproj">
<Platform>amd64</Platform>
</ProjectReference>
<ProjectReference Include="opensuse\42.1\Microsoft.NETCore.ILAsm.pkgproj">
<Platform>amd64</Platform>
</ProjectReference>
<ProjectReference Include="rhel\Microsoft.NETCore.ILAsm.pkgproj">
<Platform>amd64</Platform>
</ProjectReference>
<ProjectReference Include="ubuntu\14.04\Microsoft.NETCore.ILAsm.pkgproj">
<Platform>amd64</Platform>
</ProjectReference>
<ProjectReference Include="ubuntu\14.04\Microsoft.NETCore.ILAsm.pkgproj">
<Platform>arm</Platform>
</ProjectReference>
<ProjectReference Include="ubuntu\16.04\Microsoft.NETCore.ILAsm.pkgproj">
<Platform>amd64</Platform>
</ProjectReference>
<ProjectReference Include="ubuntu\16.04\Microsoft.NETCore.ILAsm.pkgproj">
<Platform>arm</Platform>
</ProjectReference>
<ProjectReference Include="ubuntu\16.10\Microsoft.NETCore.ILAsm.pkgproj">
<Platform>amd64</Platform>
</ProjectReference>
<ProjectReference Include="alpine\3.4.3\Microsoft.NETCore.ILAsm.pkgproj">
<Platform>amd64</Platform>
</ProjectReference>
<ProjectReference Include="osx\Microsoft.NETCore.ILAsm.pkgproj">
<Platform>amd64</Platform>
</ProjectReference>
</ItemGroup>

<Import Condition="'$(_packageTargetOSGroup)' != ''" Project="$(MSBuildThisFileDirectory)runtime.$(_packageTargetOSGroup).$(MSBuildProjectName).props" />

<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
</Project>
29 changes: 0 additions & 29 deletions src/.nuget/Microsoft.NETCore.ILAsm/alpine/3.4.3/Microsoft.NETCore.ILAsm.pkgproj
View file

This file was deleted.

29 changes: 0 additions & 29 deletions src/.nuget/Microsoft.NETCore.ILAsm/debian/Microsoft.NETCore.ILAsm.pkgproj
View file

This file was deleted.

29 changes: 0 additions & 29 deletions src/.nuget/Microsoft.NETCore.ILAsm/fedora/23/Microsoft.NETCore.ILAsm.pkgproj
View file

This file was deleted.

Loading

0 comments on commit 9497910

Please sign in to comment.