From cf31e7cf644e3861adf306328b0b895ef7a6c30a Mon Sep 17 00:00:00 2001 From: helge Date: Thu, 2 Sep 2004 17:54:50 +0000 Subject: [PATCH] do not include .svn directories when installing bundles git-svn-id: http://svn.opengroupware.org/SOPE/trunk@103 e4a50df8-12e2-0310-a44c-efbce7f8a7e3 --- sope-appserver/NGObjWeb/ChangeLog | 5 +++++ sope-appserver/NGObjWeb/Version | 2 +- sope-appserver/NGObjWeb/woapp-gs.make | 2 +- sope-appserver/NGObjWeb/woapp.make | 2 +- sope-appserver/NGObjWeb/wobundle-gs.make | 2 +- 5 files changed, 9 insertions(+), 4 deletions(-) diff --git a/sope-appserver/NGObjWeb/ChangeLog b/sope-appserver/NGObjWeb/ChangeLog index d6157bcb..cbc3c286 100644 --- a/sope-appserver/NGObjWeb/ChangeLog +++ b/sope-appserver/NGObjWeb/ChangeLog @@ -1,3 +1,8 @@ +2004-09-02 Helge Hess + + * wo*.make: when copying bundles to the install location, ensure that + .svn directories (Subversion tracking dirs) are excluded (v4.3.24) + 2004-09-01 Helge Hess * WOApplication.m: added a fix to find the appwrapper in flattened diff --git a/sope-appserver/NGObjWeb/Version b/sope-appserver/NGObjWeb/Version index b06f94c6..08f45011 100644 --- a/sope-appserver/NGObjWeb/Version +++ b/sope-appserver/NGObjWeb/Version @@ -1,6 +1,6 @@ # version file -SUBMINOR_VERSION:=23 +SUBMINOR_VERSION:=24 # v4.2.413 requires libSaxObjC v4.2.33 # v4.2.341 requires libNGExtensions v4.2.77 diff --git a/sope-appserver/NGObjWeb/woapp-gs.make b/sope-appserver/NGObjWeb/woapp-gs.make index 93355435..e2ca691d 100644 --- a/sope-appserver/NGObjWeb/woapp-gs.make +++ b/sope-appserver/NGObjWeb/woapp-gs.make @@ -365,7 +365,7 @@ $(WOAPP_DIR_NAME)/WebServerResources: internal-woapp-install_:: @($(MKINSTALLDIRS) $(GNUSTEP_WOAPPS); \ rm -rf $(GNUSTEP_WOAPPS)/$(WOAPP_DIR_NAME); \ - $(TAR) chf - --exclude=CVS --to-stdout $(WOAPP_DIR_NAME) | (cd $(GNUSTEP_WOAPPS); $(TAR) xf -)) + $(TAR) chf - --exclude=CVS --exclude=.svn --to-stdout $(WOAPP_DIR_NAME) | (cd $(GNUSTEP_WOAPPS); $(TAR) xf -)) ifneq ($(CHOWN_TO),) $(CHOWN) -R $(CHOWN_TO) $(GNUSTEP_WOAPPS)/$(WOAPP_DIR_NAME) endif diff --git a/sope-appserver/NGObjWeb/woapp.make b/sope-appserver/NGObjWeb/woapp.make index fd73d777..60ddbb0a 100644 --- a/sope-appserver/NGObjWeb/woapp.make +++ b/sope-appserver/NGObjWeb/woapp.make @@ -349,7 +349,7 @@ $(WOAPP_DIR_NAME)/WebServerResources: internal-woapp-install:: @($(MKINSTALLDIRS) $(GNUSTEP_WOAPPS); \ rm -rf $(GNUSTEP_WOAPPS)/$(WOAPP_DIR_NAME); \ - $(TAR) ch --exclude=CVS --to-stdout $(WOAPP_DIR_NAME) | (cd $(GNUSTEP_WOAPPS); $(TAR) xf -)) + $(TAR) ch --exclude=CVS --exclude=.svn --to-stdout $(WOAPP_DIR_NAME) | (cd $(GNUSTEP_WOAPPS); $(TAR) xf -)) ifneq ($(CHOWN_TO),) $(CHOWN) -R $(CHOWN_TO) $(GNUSTEP_WOAPPS)/$(WOAPP_DIR_NAME) endif diff --git a/sope-appserver/NGObjWeb/wobundle-gs.make b/sope-appserver/NGObjWeb/wobundle-gs.make index 0d306f56..43371245 100644 --- a/sope-appserver/NGObjWeb/wobundle-gs.make +++ b/sope-appserver/NGObjWeb/wobundle-gs.make @@ -284,7 +284,7 @@ $(WOBUNDLE_DIR_NAME)/Resources/WebServer: internal-wobundle-install_:: $(WOBUNDLE_INSTALL_DIR) shared-instance-headers-install rm -rf $(WOBUNDLE_INSTALL_DIR)/$(WOBUNDLE_DIR_NAME); \ - $(TAR) chf - --exclude=CVS --to-stdout $(WOBUNDLE_DIR_NAME) | (cd $(WOBUNDLE_INSTALL_DIR); $(TAR) xf -) + $(TAR) chf - --exclude=CVS --exclude=.svn --to-stdout $(WOBUNDLE_DIR_NAME) | (cd $(WOBUNDLE_INSTALL_DIR); $(TAR) xf -) ifneq ($(CHOWN_TO),) $(CHOWN) -R $(CHOWN_TO) $(WOBUNDLE_INSTALL_DIR)/$(WOBUNDLE_DIR_NAME) endif -- 2.39.5