Browse Source

tweak make release to detect new release version.

Andreas Stenius 8 years ago
parent
commit
7129c7794f
1 changed files with 10 additions and 8 deletions
  1. 10 8
      Makefile

+ 10 - 8
Makefile

@@ -76,12 +76,14 @@ committed:
 	@git diff --no-ext-diff --quiet --exit-code || { echo "there are uncommitted changes in the repo." ; false ;}
 
 release: committed check
-	@{														    \
-		V1=$$(grep vsn src/erlydtl.app.src | sed -e 's/.*vsn,.*"\(.*\)".*/\1/')					 && \
-		read -e -p "OK, all tests passed, current version is $$V1, which version should we release now? " V2	 && \
-		echo "$$V2 it is..."											 && \
-		sed -i -e 's/vsn,.*}/vsn, "'$$V2'"}/' src/erlydtl.app.src						 && \
-		echo git ci -m "release v$$V2" src/erlydtl.app.src							 && \
-		echo git tag $$V2											 && \
-		echo 'Updated src/erlydtl.app.src and tagged, run `git push master --tags` when ready'                      \
+	@{														      \
+		V0=$$(grep vsn src/erlydtl.app.src | sed -e 's/.*vsn,.*"\(.*\)".*/\1/')					   && \
+		V1=$$(grep '##' -m 1 NEWS.md | sed -e 's/##[^0-9]*\([0-9.-]*\).*/\1/')					   && \
+		read -e -p "OK, all tests passed, current version is $$V0, which version should we release now? ($$V1)" V2 && \
+		: $${V2:=$$V1}												   && \
+		echo "$$V2 it is..."											   && \
+		sed -i -e 's/vsn,.*}/vsn, "'$$V2'"}/' src/erlydtl.app.src						   && \
+		git ci -m "release v$$V2" src/erlydtl.app.src								   && \
+		git tag $$V2												   && \
+		echo 'Updated src/erlydtl.app.src and tagged, run `git push master --tags` when ready'                        \
 	;}