diff options
| author | Tomas Weinfurt <tweinfurt@yahoo.com> | 2018-10-31 14:58:06 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-31 14:58:06 -0700 |
| commit | 2fd737a51724aba6f49e0e06272343f05cc3917e (patch) | |
| tree | 464628ed9dff7f46e44d47a110bc5d58fdf6be79 | |
| parent | ccf84fc34b83c3d3e6b2b378136b55dda5f9bdc8 (diff) | |
| download | coreclr-2fd737a51724aba6f49e0e06272343f05cc3917e.tar.gz coreclr-2fd737a51724aba6f49e0e06272343f05cc3917e.tar.bz2 coreclr-2fd737a51724aba6f49e0e06272343f05cc3917e.zip | |
more changes to fix packaging on FreeBSD. runtime.json now contains freebsd-x64 and portable build/packaging works (#20725)
| -rwxr-xr-x | build-packages.sh | 2 | ||||
| -rw-r--r-- | buildpipeline/DotNet-CoreClr-Trusted-FreeBSD.json | 4 | ||||
| -rw-r--r-- | src/.nuget/dir.props | 10 |
3 files changed, 14 insertions, 2 deletions
diff --git a/build-packages.sh b/build-packages.sh index f06024e7f6..71345eb6a1 100755 --- a/build-packages.sh +++ b/build-packages.sh @@ -117,6 +117,8 @@ if [ $__IsPortableBuild == 1 ]; then export __DistroRid="linux-$__Arch" elif [ "$__BuildOS" == "OSX" ]; then export __DistroRid="osx-$__Arch" + elif [ "$__BuildOS" == "FreeBSD" ]; then + export __DistroRid="freebsd-$__Arch" fi else # init the host distro name diff --git a/buildpipeline/DotNet-CoreClr-Trusted-FreeBSD.json b/buildpipeline/DotNet-CoreClr-Trusted-FreeBSD.json index a9eb7e427a..ee2ed7a166 100644 --- a/buildpipeline/DotNet-CoreClr-Trusted-FreeBSD.json +++ b/buildpipeline/DotNet-CoreClr-Trusted-FreeBSD.json @@ -55,7 +55,7 @@ }, "inputs": { "filename": "$(Agent.BuildDirectory)/s/build.sh", - "arguments": "$(PB_BuildType) $(Architecture) skipnuget -skiprestore stripSymbols -OfficialBuildId=$(OfficialBuildId) -clang6.0 -osgroup FreeBSD -msbuildonunsupportedplatform -portablebuild=false", + "arguments": "$(PB_BuildType) $(Architecture) skipnuget -skiprestore stripSymbols -OfficialBuildId=$(OfficialBuildId) -clang6.0", "workingFolder": "", "failOnStandardError": "false" } @@ -75,7 +75,7 @@ }, "inputs": { "filename": "$(Agent.BuildDirectory)/s/build-packages.sh", - "arguments": "-BuildType=$(PB_BuildType) -BuildArch=$(Architecture) -portablebuild=false -- /p:OfficialBuildId=$(OfficialBuildId)", + "arguments": "-BuildType=$(PB_BuildType) -BuildArch=$(Architecture) -- /p:OfficialBuildId=$(OfficialBuildId)", "workingFolder": "", "failOnStandardError": "false" } diff --git a/src/.nuget/dir.props b/src/.nuget/dir.props index 4893e2fd09..b97f3d81a2 100644 --- a/src/.nuget/dir.props +++ b/src/.nuget/dir.props @@ -84,6 +84,13 @@ <PackageRID Condition="'$(PortableBuild)' == 'true'">osx-$(ArchGroup)</PackageRID> </PropertyGroup> </When> + <When Condition="'$(_runtimeOSFamily)' == 'freebsd'"> + <PropertyGroup> + <PackageRID>freebsd.11-$(ArchGroup)</PackageRID> + <!-- Set the platform part of the RID if we are doing a portable build --> + <PackageRID Condition="'$(PortableBuild)' == 'true'">freebsd-$(ArchGroup)</PackageRID> + </PropertyGroup> + </When> <When Condition="'$(_runtimeOSFamily)' == 'android'"> <PropertyGroup> <PackageRID>android.21-$(ArchGroup)</PackageRID> @@ -151,6 +158,9 @@ <ItemGroup Condition="$(SupportedPackageOSGroups.Contains(';OSX;'))"> <OfficialBuildRID Include="osx-x64" /> </ItemGroup> + <ItemGroup Condition="$(SupportedPackageOSGroups.Contains(';FreeBSD;'))"> + <OfficialBuildRID Include="freebsd-x64" /> + </ItemGroup> <ItemGroup Condition="$(SupportedPackageOSGroups.Contains(';Windows_NT;'))"> <OfficialBuildRID Include="win-x86"> <Platform>x86</Platform> |