From 4620282d94dd880c9ef88a957eed6cb68f484448 Mon Sep 17 00:00:00 2001 From: Paul Schneider Date: Sun, 4 Apr 2021 22:20:46 +0100 Subject: [PATCH] hotfix solution dir --- scripts/make/msbuild.mk | 4 ++-- scripts/make/versioning.mk | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/scripts/make/msbuild.mk b/scripts/make/msbuild.mk index 0784efe7..c21b833d 100644 --- a/scripts/make/msbuild.mk +++ b/scripts/make/msbuild.mk @@ -5,8 +5,8 @@ MONO=mono CONFIGURATION=Debug BINTYPE=exe PRJNAME := $(shell basename `pwd -P`) -SOLUTIONDIR=$(HOME)/workspace/yavsc -rc_num := $(shell cat $(SOLUTIONDIR)/rc-num.txt) + +rc_num := $(shell cat ../../rc-num.txt) VERSION=1.0.5-rc$(rc_num) BINTARGET=$(PRJNAME).$(BINTYPE) diff --git a/scripts/make/versioning.mk b/scripts/make/versioning.mk index 48ca3c05..3b2cfdb9 100644 --- a/scripts/make/versioning.mk +++ b/scripts/make/versioning.mk @@ -2,8 +2,7 @@ ifndef PRJNAME PRJNAME := $(shell basename `pwd -P`) endif -SOLUTIONDIR=../.. -version := $(shell cat $(SOLUTIONDIR)/version.txt) +version := $(shell cat ../../version.txt) MAKE=make NUGETSOURCE=$(HOME)/Nupkgs VERSION=$(version) @@ -11,7 +10,7 @@ CONFIGURATION=Debug version-check: ifndef version - @echo no version number specification ... please, could you try and run 'echo 1.2.3 > $(SOLUTIONDIR)version.txt' ?. + @echo no version number specification ... please, could you try and run 'echo 1.2.3 > ../../version.txt' ?. else @echo 'Got version number : $(version)' endif