Fixes the latest merge

This commit is contained in:
Paul Schneider
2015-10-19 21:41:13 +02:00
parent 2963e2c4a0
commit d8a5ebd526
11 changed files with 72 additions and 64 deletions

View File

@ -3,17 +3,25 @@ VERSION=1.1
CONFIG=Debug
LDYDESTDIR=dist/web/$(CONFIG)
COPYUNCHANGED="false"
RSYNCCMD=rsync -ravu --chown=www-data:www-data
HOST_rsync_dev=totemdev.localdomain
DESTDIR_rsync_dev=/srv/www/totemdev
HOST_rsync_pre=totempre.localdomain
DESTDIR_rsync_pre=/srv/www/totempre
HOST_rsync_prod=totemprod.pschneider.fr
DESTDIR_rsync_prod=/srv/www/totemprod
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_pre=lua.pschneider.fr
DESTDIR_rsync_pre=/srv/www/yavscpre
HOST_rsync_prod=lua.pschneider.fr
DESTDIR_rsync_prod=/srv/www/yavsc
DOCASSBS=NpgsqlBlogProvider.dll WorkFlowProvider.dll Yavsc.WebControls.dll ITContentProvider.dll NpgsqlMRPProviders.dll Yavsc.dll SalesCatalog.dll YavscModel.dll
RSYNCCMD=rsync -ravu --chown=www-data:www-data
all: deploy
ddir:
mkdir -p $(LDYDESTDIR)
@ -22,17 +30,17 @@ deploy: ddir build
xbuild /p:Configuration=$(CONFIG) /p:SkipCopyUnchangedFiles=$(COPYUNCHANGED) /p:DeployDir=../$(LDYDESTDIR) /t:Deploy web/Web.csproj
mv $(LDYDESTDIR)/Web.config $(LDYDESTDIR)/Web.config.new
rsync_% : HOST = $(HOST_$@)
rsync_% : DESTDIR = $(DESTDIR_$@)
rsync_% : deploy
echo "!Deploying to $(HOST)!"
$(RSYNCCMD) dist/web/$(CONFIG)/ root@$(HOST):$(DESTDIR)
ssh root@$(HOST) "service apache2 reload"
build:
xbuild /p:Configuration=$(CONFIG) /t:Build Totem.sln
xbuild /p:Configuration=$(CONFIG) /t:Build Yavsc.sln
clean:
xbuild /t:Clean
@ -56,9 +64,12 @@ htmldoc: xmldoc
docdeploy-prod: htmldoc
rsync -ravu web/htmldoc root@$(PRODHOSTDIR)
rsync_dev:
rsync_lua:
rsync_yavsc:
rsync_pre:
rsync_prod: