Skip to content

Commit

Permalink
Additional RPMs for CBL-Mariner (#7951)
Browse files Browse the repository at this point in the history
  • Loading branch information
NikolaMilosavljevic authored Sep 23, 2021
1 parent 5fb71bb commit 5fc64e4
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,15 @@
UseHardlinksIfPossible="False" />

<Message Text="$(MSBuildProjectName) -> $(InstallerFile)" Importance="high" />

<Copy Condition="'$(CreateRPMForCblMariner)' == 'true'"
SourceFiles="@(GeneratedRpmFiles)"
DestinationFiles="$(_InstallerFileCblMariner)"
OverwriteReadOnlyFiles="True"
SkipUnchangedFiles="False"
UseHardlinksIfPossible="False" />

<Message Text="$(MSBuildProjectName) -> $(_InstallerFileCblMariner)" Importance="high" />
</Target>

<Target Name="GetRpmInstallerJsonProperties"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,14 @@
<CompressedArchiveFile>$(AssetOutputPath)$(InstallerFileNameWithoutExtension)$(CompressedFileExtension)</CompressedArchiveFile>
</PropertyGroup>

<PropertyGroup Condition="'$(InstallerExtension)' == '.rpm'">
<CreateRPMForCblMariner>true</CreateRPMForCblMariner>
<_CblMarinerVersionSuffix>cm.1</_CblMarinerVersionSuffix>
<_InstallerBuildPartCblMariner>$(ProductVersion)-$(_CblMarinerVersionSuffix)-$(TargetArchitecture)</_InstallerBuildPartCblMariner>
<_InstallerFileNameWithoutExtensionCblMariner>$(InstallerName)-$(_InstallerBuildPartCblMariner)$(CrossArchContentsBuildPart)</_InstallerFileNameWithoutExtensionCblMariner>
<_InstallerFileCblMariner Condition="'$(_InstallerFileCblMariner)' == ''">$(AssetOutputPath)$(_InstallerFileNameWithoutExtensionCblMariner)$(InstallerExtension)</_InstallerFileCblMariner>
</PropertyGroup>

<!--
Set the directory containing contents to include in the archive (zip/tarball). This default
means the "shared" dir is inside the archive and it can be extracted directly into the dotnet
Expand Down

0 comments on commit 5fc64e4

Please sign in to comment.