Skip to content

Commit 615df9c

Browse files
committed
Add script to extract the version from the header file and remove DOCKER_VERSION
1 parent 094d163 commit 615df9c

File tree

3 files changed

+8
-3
lines changed

3 files changed

+8
-3
lines changed

DOCKER_VERSION

-1
This file was deleted.

makefile

+5-2
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ uninstall:
3030
xargs rm -fv < build/install_manifest.txt
3131

3232
tag:
33-
git tag v"`cat DOCKER_VERSION`"
33+
git tag v"`sh tools/extract_version.sh`"
3434

3535
xcode:
3636
cmake -DCMAKE_BUILD_TYPE=Debug -DUSE_TLS=1 -DUSE_WS=1 -DUSE_TEST=1 -GXcode && open ixwebsocket.xcodeproj
@@ -41,11 +41,14 @@ xcode_openssl:
4141
.PHONY: docker
4242

4343
NAME := bsergean/ws
44-
TAG := $(shell cat DOCKER_VERSION)
44+
TAG := $(shell sh tools/extract_version.sh)
4545
IMG := ${NAME}:${TAG}
4646
LATEST := ${NAME}:latest
4747
BUILD := ${NAME}:build
4848

49+
print_version:
50+
@echo 'IXWebSocket version =>' ${TAG}
51+
4952
docker_test:
5053
docker build -f docker/Dockerfile.debian -t bsergean/ixwebsocket_test:build .
5154

tools/extract_version.sh

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
#/bin/sh
2+
3+
grep VERSION ixwebsocket/IXWebSocketVersion.h | awk '{print $3}' | tr -d \"

0 commit comments

Comments
 (0)