diff --git a/ChangeLog b/ChangeLog index b45b3497..3e2ebdb3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2015-12-01 Paul Schneider + + * Makefile: fixe le déploiement multiple en un appel + 2015-12-01 Paul Schneider * README.md: mise à jour des priorités diff --git a/Makefile b/Makefile index 60647877..53ec9dfd 100644 --- a/Makefile +++ b/Makefile @@ -5,29 +5,27 @@ LDYDESTDIR=dist/web/$(CONFIG) COPYUNCHANGED="false" SHELL=/bin/bash -HOST_rsync_dev=lua.pschneider.fr -DESTDIR_rsync_dev=/srv/www/yavscdev -HOST_rsync_pre=lua.pschneider.fr -DESTDIR_rsync_pre=/srv/www/yavscpre +HOST_rsync_Debug=lua.pschneider.fr +DESTDIR_rsync_Debug=/srv/www/yavscdev -HOST_rsync_prod=lua.pschneider.fr -DESTDIR_rsync_prod=/srv/www/yavsc +HOST_rsync_Release=lua.pschneider.fr +DESTDIR_rsync_Release=/srv/www/yavscpre -HOST_rsync_yavsc=lua.pschneider.fr -DESTDIR_rsync_yavsc=/srv/www/yavsc +HOST_rsync_Lua=lua.pschneider.fr +DESTDIR_rsync_Lua=/srv/www/lua -HOST_rsync_lua=lua.pschneider.fr -DESTDIR_rsync_lua=/srv/www/lua +HOST_rsync_YavscPre=lua.pschneider.fr +DESTDIR_rsync_YavscPre=/srv/www/yavscpre -HOST_rsync_totemdev=lua.pschneider.fr -DESTDIR_rsync_totemdev=/srv/www/totemdev +HOST_rsync_Yavsc=lua.pschneider.fr +DESTDIR_rsync_Yavsc=/srv/www/yavsc -HOST_rsync_totempre=lua.pschneider.fr -DESTDIR_rsync_totempre=/srv/www/totempre +HOST_rsync_TotemPre=lua.pschneider.fr +DESTDIR_rsync_TotemPre=/srv/www/totempre -HOST_rsync_totemprod=lua.pschneider.fr -DESTDIR_rsync_totemprod=/srv/www/totemprod +HOST_rsync_TotemProd=lua.pschneider.fr +DESTDIR_rsync_TotemProd=/srv/www/totemprod DOCASSBS=NpgsqlBlogProvider.dll WorkFlowProvider.dll Yavsc.WebControls.dll ITContentProvider.dll NpgsqlMRPProviders.dll Yavsc.dll SalesCatalog.dll YavscModel.dll @@ -38,21 +36,35 @@ all: deploy ddir: mkdir -p $(LDYDESTDIR) +.PHONY: build +build : + echo "Building $(CONFIG) ..." + xbuild /p:Configuration=$(CONFIG) /t:Build Yavsc.sln + +.PHONY: deploy deploy: ddir build rm -rf $(LYDESTDIR) xbuild /p:Configuration=$(CONFIG) /p:SkipCopyUnchangedFiles=$(COPYUNCHANGED) /p:DeployDir=../$(LDYDESTDIR) /t:Deploy web/Yavsc.csproj -rsync_% : HOST = $(HOST_$@) -rsync_% : DESTDIR = $(DESTDIR_$@) +build_%: CONFIG = "$(subst build_,,$@)" + +build_%: echo "Building $(CONFIG) ..." + xbuild /p:Configuration=$(CONFIG) /t:Build Yavsc.sln + +rsync_% : CONFIG = $(subst rsync_,,$@) + +rsync_% : HOST = $(HOST_rsync_$(CONFIG)) -rsync_% : deploy +rsync_% : DESTDIR = $(DESTDIR_rsync_$(CONFIG)) + + +rsync_% : + make deploy CONFIG=$(CONFIG) if [[ "x$(HOST)" == "x" ]]; then echo "no host given, aborting"; exit 1; fi echo "!Deploying to $(HOST) using $(CONFIG) config!" $(RSYNCCMD) dist/web/$(CONFIG)/ root@$(HOST):$(DESTDIR) -build: - xbuild /p:Configuration=$(CONFIG) /t:Build Yavsc.sln clean: xbuild /p:Configuration=$(CONFIG) /t:Clean Yavsc.sln @@ -76,15 +88,17 @@ htmldoc: xmldoc docdeploy-prod: htmldoc rsync -ravu web/htmldoc root@$(PRODHOSTDIR) -rsync_lua: CONFIG = Lua +rsync_Lua: -rsync_pre: CONFIG = YavscPre +rsync_Debug: -rsync_prod: CONFIG = Yavsc +rsync_Release: -rsync_totempre: CONFIG = TotemPre +rsync_YavscPre: -rsync_totemprod: CONFIG = TotemProd +rsync_yavsc: + +rsync_TotemProd: nuget_restore: for prj in ITContentProvider NpgsqlBlogProvider NpgsqlContentProvider NpgsqlMRPProviders Presta SalesCatalog TestAPI web WebControls yavscclient yavscModel; do nuget restore "$${prj}/packages.config" -SolutionDirectory . ; done @@ -92,7 +106,9 @@ nuget_restore: nuget_update: for prj in ITContentProvider NpgsqlBlogProvider NpgsqlContentProvider NpgsqlMRPProviders Presta SalesCatalog TestAPI web WebControls yavscclient yavscModel; do nuget update "$${prj}/packages.config" ; done -syncall: rsync_lua rsync_pre rsync_prod rsync_totempre rsync_totemprod +syncall: rsync_Debug rsync_Release rsync_YavscPre rsync_Lua rsync_Yavsc rsync_TotemPre rsync_TotemProd + +