makes from dnu a variable

This commit is contained in:
2018-07-22 22:12:41 +02:00
parent 7cbde44ba8
commit 3d25d17b7e

10
dnx.mk
View File

@ -15,6 +15,8 @@ FRAMEWORKALIAS=dnx451
BINTARGET=$(PRJNAME).dll BINTARGET=$(PRJNAME).dll
BINTARGETPATH=bin/$(CONFIGURATION)/$(FRAMEWORKALIAS)/$(BINTARGET) BINTARGETPATH=bin/$(CONFIGURATION)/$(FRAMEWORKALIAS)/$(BINTARGET)
PKGFILENAME=$(PRJNAME).$(VERSION).nupkg PKGFILENAME=$(PRJNAME).$(VERSION).nupkg
dnu=dnu
dnx=dnx
# OBS SUBDIRS=Yavsc.Server Yavsc.Abstract Yavsc cli # OBS SUBDIRS=Yavsc.Server Yavsc.Abstract Yavsc cli
# #
@ -34,10 +36,10 @@ endif
restore: restore:
touch project.json touch project.json
dnu restore $(dnu) restore
project.lock.json: project.json project.lock.json: project.json
dnu restore $(dnu) restore
watch: project.lock.json watch: project.lock.json
ASPNET_ENV=$(ASPNET_ENV) ASPNET_LOG_LEVEL=$(ASPNET_LOG_LEVEL) dnx-watch web --configuration=$(CONFIGURATION) ASPNET_ENV=$(ASPNET_ENV) ASPNET_LOG_LEVEL=$(ASPNET_LOG_LEVEL) dnx-watch web --configuration=$(CONFIGURATION)
@ -50,12 +52,12 @@ cleanoutput:
rm -rf bin/output rm -rf bin/output
$(BINTARGETPATH): project.lock.json rc-num.txt-check $(BINTARGETPATH): project.lock.json rc-num.txt-check
dnu build --configuration=$(CONFIGURATION) $(dnu) build --configuration=$(CONFIGURATION)
# Default target, from one level sub dirs # Default target, from one level sub dirs
bin/output: bin/output:
@dnu publish @$(dnu) publish
bin/output/wwwroot/version: bin/output bin/output/wwwroot/version: bin/output
@git log -1 --pretty=format:%h > bin/output/wwwroot/version @git log -1 --pretty=format:%h > bin/output/wwwroot/version