Skip to content
代码片段 群组 项目
未验证 提交 7bebff5b 编辑于 作者: Doug Bunting's avatar Doug Bunting
浏览文件

Avoid duplicate targeting-pack RPM Build

- if an RPM containing platform-neutral executables is platform-neutral, this should be enough
上级 32b36c46
无相关合并请求
...@@ -33,7 +33,12 @@ ...@@ -33,7 +33,12 @@
</RpmBuildDependsOn> </RpmBuildDependsOn>
</PropertyGroup> </PropertyGroup>
<Target Name="Build" DependsOnTargets="RpmBuild" /> <!-- Do not build platform-neutral targeting-pack RPM in arm64 build. -->
<Target Name="Build"
Condition=" '$(MSBuildProjectName)' == 'Rpm.TargetingPack' AND '$(TargetRuntimeIdentifier)' == 'linux-arm64' "/>
<Target Name="Build"
Condition=" !('$(MSBuildProjectName)' == 'Rpm.TargetingPack' AND '$(TargetRuntimeIdentifier)' == 'linux-arm64') "
DependsOnTargets="RpmBuild"/>
<Target Name="Pack" /> <Target Name="Pack" />
<Target Name="RpmBuild" DependsOnTargets="$(RpmBuildDependsOn)"> <Target Name="RpmBuild" DependsOnTargets="$(RpmBuildDependsOn)">
...@@ -41,7 +46,7 @@ ...@@ -41,7 +46,7 @@
<CblMariner1TargetPath>$(InstallersOutputPath)$(CblMarinerBaseName)$(CblMariner1VersionSuffix)$(CblMarinerExtension)</CblMariner1TargetPath> <CblMariner1TargetPath>$(InstallersOutputPath)$(CblMarinerBaseName)$(CblMariner1VersionSuffix)$(CblMarinerExtension)</CblMariner1TargetPath>
<CblMariner2TargetPath>$(InstallersOutputPath)$(CblMarinerBaseName)$(CblMariner2VersionSuffix)$(CblMarinerExtension)</CblMariner2TargetPath> <CblMariner2TargetPath>$(InstallersOutputPath)$(CblMarinerBaseName)$(CblMariner2VersionSuffix)$(CblMarinerExtension)</CblMariner2TargetPath>
</PropertyGroup> </PropertyGroup>
<!-- Create layout: Create changelog --> <!-- Create layout: Create changelog -->
<PropertyGroup> <PropertyGroup>
<ChangeLogProps>DATE=$([System.DateTime]::UtcNow.ToString(ddd MMM dd yyyy))</ChangeLogProps> <ChangeLogProps>DATE=$([System.DateTime]::UtcNow.ToString(ddd MMM dd yyyy))</ChangeLogProps>
......
0% 加载中 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册