From 2226220636220ae70e9221c3df447471c9e3e31b Mon Sep 17 00:00:00 2001
From: Paul Schneider <paulschneider@free.fr>
Date: Mon, 28 Jun 2021 22:34:18 +0100
Subject: [PATCH] push

---
 .gitignore         |  1 +
 Makefile           | 15 +++++++++++----
 src/Yavsc/Makefile |  4 ++--
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index e47dd8ec..bc43d16f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -39,3 +39,4 @@ builds/
 /test/yavscTests/test-results.xml
 /test/yavscTests/test-results.html
 /binaries/Debug/yavscd
+yavsc-pre
diff --git a/Makefile b/Makefile
index b3d54e20..e2f1f919 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@ DNXLIBS=Microsoft.Dnx.Host.Mono.dll Microsoft.Dnx.Host.dll Microsoft.Dnx.Applica
 DNXLIBFP:=$(addprefix $(DNX_USER_HOME)/runtimes/dnx-mono.1.0.0-rc1-update2/bin/, $(DNXLIBS))
 CONFIG=Debug
 
-yavscd=binaries/$(CONFIG)/yavscd
+yavscd=yavscd
 yavsccli=binaries/$(CONFIG)/yavsccli
 
 all: yavscassemblies
@@ -40,10 +40,10 @@ test:
 web:
 	make -C src/Yavsc web
 
-pushInPre: yavscd
+pushInPre: yavscd-pre
 	make -C src/Yavsc pushInPre
 
-pushInProd: yavscd
+pushInProd: $(yavscd)
 	make -C src/Yavsc pushInProd
 
 packages:
@@ -77,13 +77,20 @@ src/Yavsc/bin/$(CONFIG)/dnx451/Yavsc.dll: src/Yavsc.Server/bin/$(CONFIG)/dnx451/
 
 yavscassemblies: src/Yavsc/bin/$(CONFIG)/dnx451/Yavsc.dll src/Yavsc.Server/bin/$(CONFIG)/dnx451/Yavsc.Server.dll src/Yavsc.Abstract/bin/$(CONFIG)/dnx451/Yavsc.Abstract.dll src/OAuth.AspNet.AuthServer/bin/$(CONFIG)/dnx451/OAuth.AspNet.AuthServer.dll src/OAuth.AspNet.Token/bin/$(CONFIG)/dnx451/OAuth.AspNet.Token.dll
 
-$(yavscd): yavscassemblies updatedeps
+yavscd: yavscassemblies updatedeps
 	mkdir -p binaries/$(CONFIG)
 	mkbundle --static $(DNXLIBS) src/Yavsc/bin/$(CONFIG)/dnx451/Yavsc.dll src/Yavsc/bin/$(CONFIG)/dnx451/pt/Yavsc.resources.dll src/Yavsc/bin/$(CONFIG)/dnx451/en/Yavsc.resources.dll src/Yavsc.Server/bin/$(CONFIG)/dnx451/Yavsc.Server.dll src/Yavsc.Server/bin/$(CONFIG)/dnx451/en/Yavsc.Server.resources.dll src/Yavsc.Abstract/bin/$(CONFIG)/dnx451/Yavsc.Abstract.dll src/Yavsc.Abstract/bin/$(CONFIG)/dnx451/en/Yavsc.Abstract.resources.dll src/Yavsc.Abstract/bin/$(CONFIG)/dnx451/pt/Yavsc.Abstract.resources.dll src/OAuth.AspNet.AuthServer/bin/$(CONFIG)/dnx451/OAuth.AspNet.AuthServer.dll src/OAuth.AspNet.Token/bin/$(CONFIG)/dnx451/OAuth.AspNet.Token.dll $(shell ls private/lib/*.dll) -L $(DNX_USER_HOME)/runtimes/dnx-mono.1.0.0-rc1-update2/bin --machine-config $(MONO_PREFIX)/etc/mono/4.5/machine.config -o $(yavscd)
 
 strip_yavscd: $(yavscd)
 	strip $(yavscd)
 
+yavscd-pre: yavscassemblies updatedeps
+	mkdir -p binaries/$(CONFIG)
+	mkbundle --static $(DNXLIBS) src/Yavsc/bin/$(CONFIG)/dnx451/Yavsc.dll src/Yavsc/bin/$(CONFIG)/dnx451/pt/Yavsc.resources.dll src/Yavsc/bin/$(CONFIG)/dnx451/en/Yavsc.resources.dll src/Yavsc.Server/bin/$(CONFIG)/dnx451/Yavsc.Server.dll src/Yavsc.Server/bin/$(CONFIG)/dnx451/en/Yavsc.Server.resources.dll src/Yavsc.Abstract/bin/$(CONFIG)/dnx451/Yavsc.Abstract.dll src/Yavsc.Abstract/bin/$(CONFIG)/dnx451/en/Yavsc.Abstract.resources.dll src/Yavsc.Abstract/bin/$(CONFIG)/dnx451/pt/Yavsc.Abstract.resources.dll src/OAuth.AspNet.AuthServer/bin/$(CONFIG)/dnx451/OAuth.AspNet.AuthServer.dll src/OAuth.AspNet.Token/bin/$(CONFIG)/dnx451/OAuth.AspNet.Token.dll $(shell ls private/lib/*.dll) -L $(DNX_USER_HOME)/runtimes/dnx-mono.1.0.0-rc1-update2/bin --machine-config $(MONO_PREFIX)/etc/mono/4.5/machine.config -o yavscd-pre
+
+strip_yavscd-pre: yavscd-pre
+	strip yavscd-pre
+
 cliassemblies: src/cli/bin/$(CONFIG)/dnx451/cli.dll src/cli/bin/$(CONFIG)/dnx451/fr/cli.resources.dll src/Yavsc/bin/$(CONFIG)/dnx451/Yavsc.dll src/Yavsc/bin/$(CONFIG)/dnx451/pt/Yavsc.resources.dll src/Yavsc.Server/bin/$(CONFIG)/dnx451/Yavsc.Server.dll src/Yavsc.Abstract/bin/$(CONFIG)/dnx451/Yavsc.Abstract.dll src/OAuth.AspNet.AuthServer/bin/$(CONFIG)/dnx451/OAuth.AspNet.AuthServer.dll src/OAuth.AspNet.Token/bin/$(CONFIG)/dnx451/OAuth.AspNet.Token.dll
 
 yavsccli: cliassemblies 	
diff --git a/src/Yavsc/Makefile b/src/Yavsc/Makefile
index 1c350e14..1d0b453e 100644
--- a/src/Yavsc/Makefile
+++ b/src/Yavsc/Makefile
@@ -53,7 +53,7 @@ deploy-pkg: publish
 
 deploy: pushInPre pushInProd
 
-pushInPre: cleanoutput bin/output/wwwroot/version
+pushInPre: cleanoutput bin/output/wwwroot/version ../../yavscd-pre
 	sudo service kestrel-pre stop
 	sudo rm -rf $(DESTDIR)/approot
 	sudo cp -a bin/output/* $(DESTDIR)
@@ -61,7 +61,7 @@ pushInPre: cleanoutput bin/output/wwwroot/version
 	sudo sync
 	sudo service kestrel-pre start
 
-pushInProd: cleanoutput bin/output/wwwroot/version
+pushInProd: cleanoutput bin/output/wwwroot/version ../../yavscd
 ifeq ($(git_status),0)
 	sudo service kestrel stop
 	sudo rm -rf $(PRODDESTDIR)/approot