diff --git a/Makefile b/Makefile index 51206d7..beeb692 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,7 @@ DIT_NAME=$(shell ddit targetname) BASENAME=$(shell ddit targetname --basename) VERSION=$(shell ddit ditversion) +BOT_VERSION=$(shell ddit ditversion | sed "s/-rc./rc/") NAME=${BASENAME}-${VERSION} @@ -8,8 +9,8 @@ PKG_FILES=$(shell find pkg -type f) PYTHON := pipenv run python -operator_bot := target/daml-chat-operator-bot-$(VERSION).tar.gz -user_bot := target/daml-chat-user-bot-$(VERSION).tar.gz +operator_bot := target/daml-chat-operator-bot-$(BOT_VERSION).tar.gz +user_bot := target/daml-chat-user-bot-$(BOT_VERSION).tar.gz ui := target/daml-chat-ui-$(VERSION).zip .PHONY: all package publish @@ -29,17 +30,17 @@ target: mkdir $@ $(operator_bot): - cd python/operator && DDIT_VERSION=$(VERSION) $(PYTHON) setup.py sdist + cd python/operator && DDIT_VERSION=$(BOT_VERSION) $(PYTHON) setup.py sdist rm -fr python/operator/daml_chat_operator_bot.egg-info mkdir -p $(@D) - mv python/operator/dist/daml-chat-operator-bot-$(VERSION).tar.gz $@ + mv python/operator/dist/daml-chat-operator-bot-$(BOT_VERSION).tar.gz $@ rm -r python/operator/dist $(user_bot): - cd python/user && DDIT_VERSION=$(VERSION) $(PYTHON) setup.py sdist + cd python/user && BOT_VERSION=$(BOT_VERSION) $(PYTHON) setup.py sdist rm -fr python/user/daml_chat_user_bot.egg-info mkdir -p $(@D) - mv python/user/dist/daml-chat-user-bot-$(VERSION).tar.gz $@ + mv python/user/dist/daml-chat-user-bot-$(BOT_VERSION).tar.gz $@ rm -r python/user/dist $(ui): $(user_bot) diff --git a/python/operator/setup.py b/python/operator/setup.py index bf622dc..62c81d2 100644 --- a/python/operator/setup.py +++ b/python/operator/setup.py @@ -2,7 +2,7 @@ from setuptools import setup setup(name='daml-chat-operator-bot', - version=os.environ.get('DDIT_VERSION', 'release'), + version=os.environ.get('BOT_VERSION', 'release'), description='Daml Chat Operator', author='Digital Asset', license='Apache2', diff --git a/python/user/setup.py b/python/user/setup.py index e6d8c0f..353d84d 100644 --- a/python/user/setup.py +++ b/python/user/setup.py @@ -2,7 +2,7 @@ from setuptools import setup setup(name='daml-chat-user-bot', - version=os.environ.get('DDIT_VERSION', 'release'), + version=os.environ.get('BOT_VERSION', 'release'), description='Daml Chat User', author='Digital Asset', license='Apache2',