root
/
rabbitmq-server
mirror of https://github.com/rabbitmq/rabbitmq-server.git
1
0
Fork 0
Code Issues Actions 9 Packages Projects Releases Wiki Activity

packaging/windows: Allow to override `PRODUCTVERSION` 

This will allow to keep a semver-formatted version everywhere and have a
valid `PRODUCTVERSION` made of for integers.

[#131645343]
This commit is contained in:
Jean-Sébastien Pédron 2017-01-19 13:34:21 +01:00
parent b16731b302
commit 841e8775eb
No known key found for this signature in database
GPG Key ID: 39E99761A5FD94CC
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packaging/windows-exe/Makefile
View File

@ -6,6 +6,7 @@ endif
ZIP = $(notdir $(wildcard $(ZIP_DIR)/rabbitmq-server-windows-*.zip)) ZIP = $(notdir $(wildcard $(ZIP_DIR)/rabbitmq-server-windows-*.zip))
VERSION = $(patsubst rabbitmq-server-windows-%.zip,%,$(ZIP)) VERSION = $(patsubst rabbitmq-server-windows-%.zip,%,$(ZIP))
PRODUCT_VERSION ?= $(VERSION).0
unexport DEPS_DIR unexport DEPS_DIR
unexport ERL_LIBS unexport ERL_LIBS
@ -25,6 +26,7 @@ dist: rabbitmq-$(VERSION).nsi rabbitmq_server-$(VERSION)
rabbitmq-$(VERSION).nsi: rabbitmq_nsi.in rabbitmq-$(VERSION).nsi: rabbitmq_nsi.in
sed \ sed \
-e 's|%%VERSION%%|$(VERSION)|' \ -e 's|%%VERSION%%|$(VERSION)|' \
-e 's|%%PRODUCT_VERSION%%|$(PRODUCT_VERSION)|' \
$< > $@ $< > $@
rabbitmq_server-$(VERSION): rabbitmq_server-$(VERSION):

2
packaging/windows-exe/rabbitmq_nsi.in
View File

@ -61,7 +61,7 @@ SetCompressor /solid lzma
;-------------------------------- ;--------------------------------
VIProductVersion "%%VERSION%%.0" VIProductVersion "%%PRODUCT_VERSION%%"
VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductVersion" "%%VERSION%%" VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductVersion" "%%VERSION%%"
VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductName" "RabbitMQ Server" VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductName" "RabbitMQ Server"
;VIAddVersionKey /LANG=${LANG_ENGLISH} "Comments" "" ;VIAddVersionKey /LANG=${LANG_ENGLISH} "Comments" ""