Skip to content

Commit

Permalink
[DBP-413] Fix for BUG #18040- Reporting PostgreSQL minor version to W…
Browse files Browse the repository at this point in the history
…indows OS
  • Loading branch information
agarwal-kritika committed Nov 7, 2023
1 parent b6049f4 commit 932a5b9
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 0 deletions.
1 change: 1 addition & 0 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ _init() {

# Set the package versions string
PG_PACKAGE_VERSION=$PG_MAJOR_VERSION.`echo $PG_MINOR_VERSION | sed -e 's/\./-/'`
PG_PACKAGE_MINOR_VERSION=`echo $PG_MINOR_VERSION | awk -F'.' '{print $1}'`

# Setup CVS
export CVS_RSH=ssh
Expand Down
1 change: 1 addition & 0 deletions server/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -348,6 +348,7 @@ _prepare_server_xml() {
_replace PG_MAJOR_VERSION $PG_MAJOR_VERSION $filename || _die "Failed to set major version in $filename"
_replace PG_MINOR_VERSION $PG_MINOR_VERSION $filename || _die "Failed to set minor version in $filename"
_replace PG_PACKAGE_VERSION $PG_PACKAGE_VERSION $filename || _die "Failed to set package version in $filename"
_replace PG_PACKAGE_MINOR_VERSION $PG_PACKAGE_MINOR_VERSION $filename || _die "Failed to set package minor version in $filename"
_replace PG_STAGING_DIR $WD/server/staging $filename || _die "Failed to set staging directory in $filename"
_replace PG_CATALOG_VERSION $PG_CATALOG_VERSION $filename || _die "Failed to set catalog version number in $filename"
_replace PG_CONTROL_VERSION $PG_CONTROL_VERSION $filename || _die "Failed to set catalog version number in $filename"
Expand Down
8 changes: 8 additions & 0 deletions server/installer.xml.in
Original file line number Diff line number Diff line change
Expand Up @@ -905,6 +905,14 @@ EOF
</preUninstallationActionList>

<!-- Post-uninstall actions -->
<postUninstallerCreationActionList>
<registrySet>
<key>HKEY_LOCAL_MACHINE\Software\Microsoft\Windows\CurrentVersion\Uninstall\${project.windowsARPRegistryPrefix}</key>
<name>MinorVersion</name>
<value>PG_PACKAGE_MINOR_VERSION</value>
</registrySet>
</postUninstallerCreationActionList>

<postUninstallationActionList>
<actionGroup>
<actionList>
Expand Down

0 comments on commit 932a5b9

Please sign in to comment.