From 154086156e27d93c1a259ef61560a8356ef62994 Mon Sep 17 00:00:00 2001 From: Rolf Bjarne Kvinge Date: Thu, 23 Jul 2009 11:33:28 +0000 Subject: [PATCH] In .: 2009-07-23 Rolf Bjarne Kvinge * Makefile: Make publish and install targets synonyms. In MonkeyWrench.Web.UI: 2009-07-23 Rolf Bjarne Kvinge * Makefile: Make publish and install targets synonyms. In MonkeyWrench.Web.WebService: 2009-07-23 Rolf Bjarne Kvinge * Makefile: Make publish and install targets synonyms. svn path=/trunk/monkeywrench/; revision=138528 --- ChangeLog | 4 ++++ Makefile | 4 +++- MonkeyWrench.Web.UI/ChangeLog | 4 ++++ MonkeyWrench.Web.UI/Makefile | 14 +++++--------- MonkeyWrench.Web.WebService/ChangeLog | 4 ++++ MonkeyWrench.Web.WebService/Makefile | 15 +++++++-------- 6 files changed, 27 insertions(+), 18 deletions(-) diff --git a/ChangeLog b/ChangeLog index dc891fd..f8d4ed6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2009-07-23 Rolf Bjarne Kvinge + + * Makefile: Make publish and install targets synonyms. + 2009-06-04 Rolf Bjarne Kvinge * MonkeyWrench.sln: Added new project. diff --git a/Makefile b/Makefile index 42e91d4..129c49e 100644 --- a/Makefile +++ b/Makefile @@ -29,7 +29,7 @@ svn: svn pd svn:executable $(SVN_NO_EXEC_FILES) svn ps svn:executable $(SVN_EXEC_FILES) -all clean publish install: +all clean install: $(MAKE) -C MonkeyWrench $@ $(MAKE) -C MonkeyWrench.DataClasses $@ $(MAKE) -C MonkeyWrench.Database $@ @@ -39,6 +39,8 @@ all clean publish install: $(MAKE) -C MonkeyWrench.Web.UI $@ $(MAKE) -C MonkeyWrench.Web.WebService $@ +publish: install + wsdl: $(MAKE) -C MonkeyWrench.Web.WebService $@ diff --git a/MonkeyWrench.Web.UI/ChangeLog b/MonkeyWrench.Web.UI/ChangeLog index 9f29384..5690ac1 100644 --- a/MonkeyWrench.Web.UI/ChangeLog +++ b/MonkeyWrench.Web.UI/ChangeLog @@ -1,3 +1,7 @@ +2009-07-23 Rolf Bjarne Kvinge + + * Makefile: Make publish and install targets synonyms. + 2009-07-23 Rolf Bjarne Kvinge * Master.master.cs: Make the login instance, not static. diff --git a/MonkeyWrench.Web.UI/Makefile b/MonkeyWrench.Web.UI/Makefile index 2957916..938e76f 100644 --- a/MonkeyWrench.Web.UI/Makefile +++ b/MonkeyWrench.Web.UI/Makefile @@ -28,13 +28,9 @@ clean: rm -f $(OUT)* rm -f bin/*.mdb bin/*.dll bin/*.pdb -publish: all - mkdir -p bin - # TODO: rsync to not trigger reloads if nothing has changed - cp $(OUT_DIR)/Npgsql.dll* bin/ - cp $(OUT_DIR)/MonkeyWrench.dll* bin/ - cp $(OUT_DIR)/MonkeyWrench.DataClasses.dll* bin/ - cp $(OUT_DIR)/MonkeyWrench.Web.UI.dll* bin/ - install: all - @: + mkdir -p bin + cp -pu $(OUT_DIR)/Npgsql.dll* bin/ + cp -pu $(OUT_DIR)/MonkeyWrench.dll* bin/ + cp -pu $(OUT_DIR)/MonkeyWrench.DataClasses.dll* bin/ + cp -pu $(OUT_DIR)/MonkeyWrench.Web.UI.dll* bin/ diff --git a/MonkeyWrench.Web.WebService/ChangeLog b/MonkeyWrench.Web.WebService/ChangeLog index 95c061e..1e978b6 100644 --- a/MonkeyWrench.Web.WebService/ChangeLog +++ b/MonkeyWrench.Web.WebService/ChangeLog @@ -1,3 +1,7 @@ +2009-07-23 Rolf Bjarne Kvinge + + * Makefile: Make publish and install targets synonyms. + 2009-07-23 Rolf Bjarne Kvinge * WebServices.asmx: diff --git a/MonkeyWrench.Web.WebService/Makefile b/MonkeyWrench.Web.WebService/Makefile index 6b7aefe..ee7125a 100644 --- a/MonkeyWrench.Web.WebService/Makefile +++ b/MonkeyWrench.Web.WebService/Makefile @@ -32,13 +32,12 @@ clean: rm -f $(OUT)* rm -f bin/*.dll bin/*.mdb bin/*.pdb -publish: all - mkdir -p bin - cp $(OUT)* bin - cp -p $(OUT_DIR)/Npgsql.dll* bin - cp -p $(OUT_DIR)/MonkeyWrench.dll* bin - cp -p $(OUT_DIR)/MonkeyWrench.DataClasses.dll* bin - cp -p $(OUT_DIR)/MonkeyWrench.Database.dll* bin +install: all + cp -pu $(OUT)* bin + cp -pu $(OUT_DIR)/Npgsql.dll* bin + cp -pu $(OUT_DIR)/MonkeyWrench.dll* bin + cp -pu $(OUT_DIR)/MonkeyWrench.DataClasses.dll* bin + cp -pu $(OUT_DIR)/MonkeyWrench.Database.dll* bin dataclasses: $(MAKE) -C $(TOPDIR)/MonkeyWrench.DataClasses @@ -46,6 +45,6 @@ dataclasses: wsdl: WebServices.wsdl -WebServices.wsdl: WebServices.asmx Download.aspx Download.aspx.cs +WebServices.wsdl: all curl http://localhost:8123/WebServices/WebServices.asmx?wsdl > WebServices.wsdl -m 5