From f65411b5b7438d7d9c2e006d4d9c1c4e44d009e1 Mon Sep 17 00:00:00 2001 From: Paul Schneider Date: Sat, 3 Aug 2019 11:45:31 +0200 Subject: [PATCH] refact & version file name --- scripts/build/make/dnx.mk | 9 +-------- scripts/build/make/versioning.mk | 9 +++++++++ 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/scripts/build/make/dnx.mk b/scripts/build/make/dnx.mk index 79beeb87..496ce00f 100644 --- a/scripts/build/make/dnx.mk +++ b/scripts/build/make/dnx.mk @@ -28,13 +28,6 @@ git_status := $(shell git status -s --porcelain |wc -l) all: $(BINTARGETPATH) -rc-num.txt-check: -ifndef rc_num - @echo no rc num ... please, could you try and run 'make rc-num.txt' ?. -else - @echo 'Got rc num : $(rc_num)' -endif - restore: touch project.json @@ -67,7 +60,7 @@ bin/output/wwwroot/version: bin/output pack: $(NUGETSOURCE)/$(PKGFILENAME) -$(NUGETSOURCE)/$(PKGFILENAME): $(BINTARGETPATH) $(SOLUTIONDIR)/rc-num.txt +$(NUGETSOURCE)/$(PKGFILENAME): $(BINTARGETPATH) $(SOLUTIONDIR)/version.txt ifeq ($(git_status),0) nuget pack $(PRJNAME).nuspec -Version $(VERSION) -Properties config=$(CONFIGURATION) -OutputDirectory bin else diff --git a/scripts/build/make/versioning.mk b/scripts/build/make/versioning.mk index 88193cd1..eb1a52df 100644 --- a/scripts/build/make/versioning.mk +++ b/scripts/build/make/versioning.mk @@ -8,3 +8,12 @@ MAKE=make NUGETSOURCE=$(HOME)/Nupkgs VERSION=$(version) CONFIGURATION=Debug + +version-check: +ifndef version + @echo no version number specification ... please, could you try and run 'echo 1.2.3 > $(SOLUTIONDIR)version.txt' ?. +else + @echo 'Got version number : $(version)' +endif + +