huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove changelog message from rpm generation

This commit is contained in:
John Luo 2017-07-26 11:39:31 -07:00
parent 41aeb56d12
commit a79dafebaf
2 changed files with 15 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
build/repo.targets
View File

@ -458,9 +458,6 @@
<JsonPeek Query="$.maintainer_email" JsonInputPath="$(StoreDebianConfigTemplateFile)"> <JsonPeek Query="$.maintainer_email" JsonInputPath="$(StoreDebianConfigTemplateFile)">
<Output TaskParameter="Result" ItemName="_StoreInstallerMaintainerEmail" /> <Output TaskParameter="Result" ItemName="_StoreInstallerMaintainerEmail" />
</JsonPeek> </JsonPeek>
<JsonPeek Query="$.release.changelog_message" JsonInputPath="$(StoreDebianConfigTemplateFile)">
<Output TaskParameter="Result" ItemName="_StoreInstallerChangelogMessage" />
</JsonPeek>
<JsonPeek Query="$.short_description" JsonInputPath="$(HostingDebianConfigTemplateFile)"> <JsonPeek Query="$.short_description" JsonInputPath="$(HostingDebianConfigTemplateFile)">
<Output TaskParameter="Result" ItemName="_HostingInstallerSummary" /> <Output TaskParameter="Result" ItemName="_HostingInstallerSummary" />
</JsonPeek> </JsonPeek>
@ -482,9 +479,6 @@
<JsonPeek Query="$.maintainer_email" JsonInputPath="$(HostingDebianConfigTemplateFile)"> <JsonPeek Query="$.maintainer_email" JsonInputPath="$(HostingDebianConfigTemplateFile)">
<Output TaskParameter="Result" ItemName="_HostingInstallerMaintainerEmail" /> <Output TaskParameter="Result" ItemName="_HostingInstallerMaintainerEmail" />
</JsonPeek> </JsonPeek>
<JsonPeek Query="$.release.changelog_message" JsonInputPath="$(HostingDebianConfigTemplateFile)">
<Output TaskParameter="Result" ItemName="_HostingInstallerChangelogMessage" />
</JsonPeek>
<ItemGroup> <ItemGroup>
<RHStoreDirectories Include="/opt/rh/rh-dotnet20/root/usr/lib64/dotnet/additionalDeps" /> <RHStoreDirectories Include="/opt/rh/rh-dotnet20/root/usr/lib64/dotnet/additionalDeps" />
@ -501,7 +495,6 @@
<StoreInstallerHomepage>@(_StoreInstallerHomepage)</StoreInstallerHomepage> <StoreInstallerHomepage>@(_StoreInstallerHomepage)</StoreInstallerHomepage>
<StoreInstallerMaintainerName>@(_StoreInstallerMaintainerName)</StoreInstallerMaintainerName> <StoreInstallerMaintainerName>@(_StoreInstallerMaintainerName)</StoreInstallerMaintainerName>
<StoreInstallerMaintainerEmail>@(_StoreInstallerMaintainerEmail)</StoreInstallerMaintainerEmail> <StoreInstallerMaintainerEmail>@(_StoreInstallerMaintainerEmail)</StoreInstallerMaintainerEmail>
<StoreInstallerChangelogMessage>@(_StoreInstallerChangelogMessage)</StoreInstallerChangelogMessage>
<HostingInstallerSummary>@(_HostingInstallerSummary)</HostingInstallerSummary> <HostingInstallerSummary>@(_HostingInstallerSummary)</HostingInstallerSummary>
<HostingInstallerDescription>@(_HostingInstallerDescription)</HostingInstallerDescription> <HostingInstallerDescription>@(_HostingInstallerDescription)</HostingInstallerDescription>
<HostingInstallerLicense>@(_HostingInstallerLicense)</HostingInstallerLicense> <HostingInstallerLicense>@(_HostingInstallerLicense)</HostingInstallerLicense>
@ -509,7 +502,6 @@
<HostingInstallerHomepage>@(_HostingInstallerHomepage)</HostingInstallerHomepage> <HostingInstallerHomepage>@(_HostingInstallerHomepage)</HostingInstallerHomepage>
<HostingInstallerMaintainerName>@(_HostingInstallerMaintainerName)</HostingInstallerMaintainerName> <HostingInstallerMaintainerName>@(_HostingInstallerMaintainerName)</HostingInstallerMaintainerName>
<HostingInstallerMaintainerEmail>@(_HostingInstallerMaintainerEmail)</HostingInstallerMaintainerEmail> <HostingInstallerMaintainerEmail>@(_HostingInstallerMaintainerEmail)</HostingInstallerMaintainerEmail>
<HostingInstallerChangelogMessage>@(_HostingInstallerChangelogMessage)</HostingInstallerChangelogMessage>
<RHInstallerInstallRoot>/opt/rh/rh-dotnet20/root/usr/lib64/dotnet/</RHInstallerInstallRoot> <RHInstallerInstallRoot>/opt/rh/rh-dotnet20/root/usr/lib64/dotnet/</RHInstallerInstallRoot>
<RHStoreDirectoriesArguments>@(RHStoreDirectories->' --directories &quot;%(FullPath)&quot;', ' ')</RHStoreDirectoriesArguments> <RHStoreDirectoriesArguments>@(RHStoreDirectories->' --directories &quot;%(FullPath)&quot;', ' ')</RHStoreDirectoriesArguments>
<GeneralInstallerInstallRoot>/usr/share/dotnet/</GeneralInstallerInstallRoot> <GeneralInstallerInstallRoot>/usr/share/dotnet/</GeneralInstallerInstallRoot>
@ -523,7 +515,6 @@
-e 's/MAINTAINER_EMAIL/$(StoreInstallerMaintainerEmail)/' -e 's/MAINTAINER_EMAIL/$(StoreInstallerMaintainerEmail)/'
-e 's/PACKAGE_VERSION/$(TimestampVersion)/' -e 's/PACKAGE_VERSION/$(TimestampVersion)/'
-e 's/PACKAGE_REVISION/$(StoreInstallerPackageRevision)/' -e 's/PACKAGE_REVISION/$(StoreInstallerPackageRevision)/'
-e 's/CHANGELOG_MESSAGE/$(StoreInstallerChangelogMessage)/'
$(RuntimeStoreInstallerLayoutTimestampDirectory)templates/changelog" /> $(RuntimeStoreInstallerLayoutTimestampDirectory)templates/changelog" />
<Exec Command="sed -i <Exec Command="sed -i
-e 's/DATE/$([System.DateTime]::UtcNow.ToString(ddd MMM dd yyyy))/' -e 's/DATE/$([System.DateTime]::UtcNow.ToString(ddd MMM dd yyyy))/'
@ -531,7 +522,6 @@
-e 's/MAINTAINER_EMAIL/$(StoreInstallerMaintainerEmail)/' -e 's/MAINTAINER_EMAIL/$(StoreInstallerMaintainerEmail)/'
-e 's/PACKAGE_VERSION/$(NoTimestampVersion)/' -e 's/PACKAGE_VERSION/$(NoTimestampVersion)/'
-e 's/PACKAGE_REVISION/$(StoreInstallerPackageRevision)/' -e 's/PACKAGE_REVISION/$(StoreInstallerPackageRevision)/'
-e 's/CHANGELOG_MESSAGE/$(StoreInstallerChangelogMessage)/'
$(RuntimeStoreInstallerLayoutNoTimestampDirectory)templates/changelog" /> $(RuntimeStoreInstallerLayoutNoTimestampDirectory)templates/changelog" />
<Exec Command="sed -i <Exec Command="sed -i
-e 's/DATE/$([System.DateTime]::UtcNow.ToString(ddd MMM dd yyyy))/' -e 's/DATE/$([System.DateTime]::UtcNow.ToString(ddd MMM dd yyyy))/'
@ -539,7 +529,6 @@
-e 's/MAINTAINER_EMAIL/$(HostingInstallerMaintainerEmail)/' -e 's/MAINTAINER_EMAIL/$(HostingInstallerMaintainerEmail)/'
-e 's/PACKAGE_VERSION/$(TimestampVersion)/' -e 's/PACKAGE_VERSION/$(TimestampVersion)/'
-e 's/PACKAGE_REVISION/$(HostingInstallerPackageRevision)/' -e 's/PACKAGE_REVISION/$(HostingInstallerPackageRevision)/'
-e 's/CHANGELOG_MESSAGE/$(HostingInstallerChangelogMessage)/'
$(HostingBundleInstallerLayoutTimestampDirectory)templates/changelog" /> $(HostingBundleInstallerLayoutTimestampDirectory)templates/changelog" />
<Exec Command="sed -i <Exec Command="sed -i
-e 's/DATE/$([System.DateTime]::UtcNow.ToString(ddd MMM dd yyyy))/' -e 's/DATE/$([System.DateTime]::UtcNow.ToString(ddd MMM dd yyyy))/'
@ -547,7 +536,6 @@
-e 's/MAINTAINER_EMAIL/$(HostingInstallerMaintainerEmail)/' -e 's/MAINTAINER_EMAIL/$(HostingInstallerMaintainerEmail)/'
-e 's/PACKAGE_VERSION/$(NoTimestampVersion)/' -e 's/PACKAGE_VERSION/$(NoTimestampVersion)/'
-e 's/PACKAGE_REVISION/$(HostingInstallerPackageRevision)/' -e 's/PACKAGE_REVISION/$(HostingInstallerPackageRevision)/'
-e 's/CHANGELOG_MESSAGE/$(HostingInstallerChangelogMessage)/'
$(HostingBundleInstallerLayoutNoTimestampDirectory)templates/changelog" /> $(HostingBundleInstallerLayoutNoTimestampDirectory)templates/changelog" />
<MSBuild <MSBuild
@ -785,7 +773,7 @@
-e InstallCommand=&quot;sudo rpm -i&quot; -e InstallCommand=&quot;sudo rpm -i&quot;
-e UninstallCommand=&quot;sudo rpm -e&quot; -e UninstallCommand=&quot;sudo rpm -e&quot;
docker-image-$(DockerImage) docker-image-$(DockerImage)
./tools/scripts/TestInstallers.sh" ./tools/scripts/TestInstallers.sh"
Condition="'$(SkipInstallerTests)' != 'true'"/> Condition="'$(SkipInstallerTests)' != 'true'"/>
<Exec Command="docker run <Exec Command="docker run
--rm --rm
@ -800,7 +788,7 @@
-e InstallCommand=&quot;sudo rpm -i&quot; -e InstallCommand=&quot;sudo rpm -i&quot;
-e UninstallCommand=&quot;sudo rpm -e&quot; -e UninstallCommand=&quot;sudo rpm -e&quot;
docker-image-$(DockerImage) docker-image-$(DockerImage)
./tools/scripts/TestInstallers.sh" ./tools/scripts/TestInstallers.sh"
Condition="'$(SkipInstallerTests)' != 'true'"/> Condition="'$(SkipInstallerTests)' != 'true'"/>
<!-- Remove Docker Image to save disk space --> <!-- Remove Docker Image to save disk space -->
@ -851,27 +839,27 @@
-e 's/ASPNETCORE_STORE_VERSION/$(NoTimestampVersion)/' -e 's/ASPNETCORE_STORE_VERSION/$(NoTimestampVersion)/'
$(HostingBundleInstallerLayoutNoTimestampDirectory)debian_config.json" /> $(HostingBundleInstallerLayoutNoTimestampDirectory)debian_config.json" />
<MSBuild <MSBuild
Projects="$(ProjectPath)" Projects="$(ProjectPath)"
Targets="BuildStoreAndHostingDeb" Targets="BuildStoreAndHostingDeb"
Properties="InstallerPlatform=debian.8; Properties="InstallerPlatform=debian.8;
SharedFrameworkVersion=$(SharedFrameworkVersion); SharedFrameworkVersion=$(SharedFrameworkVersion);
BuildNumber=$(BuildNumber)" /> BuildNumber=$(BuildNumber)" />
<MSBuild <MSBuild
Projects="$(ProjectPath)" Projects="$(ProjectPath)"
Targets="BuildStoreAndHostingDeb" Targets="BuildStoreAndHostingDeb"
Properties="InstallerPlatform=ubuntu.14.04; Properties="InstallerPlatform=ubuntu.14.04;
SharedFrameworkVersion=$(SharedFrameworkVersion); SharedFrameworkVersion=$(SharedFrameworkVersion);
BuildNumber=$(BuildNumber)" /> BuildNumber=$(BuildNumber)" />
<MSBuild <MSBuild
Projects="$(ProjectPath)" Projects="$(ProjectPath)"
Targets="BuildStoreAndHostingDeb" Targets="BuildStoreAndHostingDeb"
Properties="InstallerPlatform=ubuntu.16.04; Properties="InstallerPlatform=ubuntu.16.04;
SharedFrameworkVersion=$(SharedFrameworkVersion); SharedFrameworkVersion=$(SharedFrameworkVersion);
BuildNumber=$(BuildNumber)" /> BuildNumber=$(BuildNumber)" />
<MSBuild <MSBuild
Projects="$(ProjectPath)" Projects="$(ProjectPath)"
Targets="BuildStoreAndHostingDeb" Targets="BuildStoreAndHostingDeb"
Properties="InstallerPlatform=ubuntu.16.10; Properties="InstallerPlatform=ubuntu.16.10;
SharedFrameworkVersion=$(SharedFrameworkVersion); SharedFrameworkVersion=$(SharedFrameworkVersion);
BuildNumber=$(BuildNumber)" /> BuildNumber=$(BuildNumber)" />

2
tools/packaging/changelog
View File

@ -1,2 +1,2 @@
* DATE MAINTAINER_NAME <MAINTAINER_EMAIL> - PACKAGE_VERSION-PACKAGE_REVISION * DATE MAINTAINER_NAME <MAINTAINER_EMAIL> - PACKAGE_VERSION-PACKAGE_REVISION
- CHANGELOG_MESSAGE -