Updates to tar commands to exclude CVS and .svn files

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@19973 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Nicola Pero 2004-09-02 16:14:21 +00:00
parent bf32282424
commit a8c4bb3d3a
9 changed files with 40 additions and 11 deletions

View file

@ -1,3 +1,15 @@
Thu Sep 02 17:01:11 2004 Nicola Pero <n.pero@mi.flashnet.it>
* tar-exclude-list: New file currently containing CVS and .svn.
* GNUmakefile.in: Install the new file.
* Instance/Shared/bundle.make: Modified TAR commands to exclude
files listed in the tar-exclude-list file.
* Instance/framework.make: Same changes.
* Instance/gswbundle.make: Same changes.
* Instance/Documentation/autogsdoc.make: Same changes.
* Instance/Documentation/javadoc.make: Same changes.
* Instance/Documentation/latex.make: Same changes.
Tue Aug 31 16:21:41 2004 Nicola Pero <n.pero@mi.flashnet.it>
* Instance/library.make: If xxx_INTERFACE_VERSION or xxx_SOVERSION

View file

@ -78,7 +78,8 @@ MAKE_FILES = aggregate.make application.make bundle.make service.make \
documentation.make \
java-executable.template java-tool.make framework.make \
native-library.make spec-rules.template spec-debug-rules.template \
spec-debug-alone-rules.template
spec-debug-alone-rules.template \
tar-exclude-list
MASTER_MAKE_FILES = \
aggregate.make source-distribution.make rpm.make rules.make \

View file

@ -47,7 +47,7 @@ $(GNUSTEP_INSTANCE)/dependencies:
internal-doc-install_::
$(ECHO_INSTALLING)rm -rf $(GNUSTEP_DOCUMENTATION)/$(DOC_INSTALL_DIR)/$(GNUSTEP_INSTANCE); \
$(TAR) cf - $(GNUSTEP_INSTANCE) | \
$(TAR) cfX - $(GNUSTEP_MAKEFILES)/tar-exclude-list $(GNUSTEP_INSTANCE) | \
(cd $(GNUSTEP_DOCUMENTATION)/$(DOC_INSTALL_DIR); $(TAR) xf -)$(END_ECHO)
ifneq ($(CHOWN_TO),)
$(ECHO_CHOWNING)$(CHOWN) -R $(CHOWN_TO) \

View file

@ -67,7 +67,7 @@ ifneq ($(JAVADOC_FILES),)
internal-doc-install_::
$(ECHO_INSTALLING)rm -rf $(GNUSTEP_DOCUMENTATION)/$(DOC_INSTALL_DIR)/$(GNUSTEP_INSTANCE); \
$(TAR) cf - $(GNUSTEP_INSTANCE) | \
$(TAR) cfX - $(GNUSTEP_MAKEFILES)/tar-exclude-list $(GNUSTEP_INSTANCE) | \
(cd $(GNUSTEP_DOCUMENTATION)/$(DOC_INSTALL_DIR); $(TAR) xf -)$(END_ECHO)
ifneq ($(CHOWN_TO),)
$(ECHO_CHOWNING)$(CHOWN) -R $(CHOWN_TO) \

View file

@ -78,7 +78,7 @@ $(GNUSTEP_INSTANCE)/$(GNUSTEP_INSTANCE).html: $(GNUSTEP_INSTANCE).dvi
$(LATEX2HTML) $(GNUSTEP_INSTANCE)
$(GNUSTEP_INSTANCE).tar.gz: $(GNUSTEP_INSTANCE)/$(GNUSTEP_INSTANCE).html
$(TAR) cfz $(GNUSTEP_INSTANCE).tar.gz $(GNUSTEP_INSTANCE)
$(TAR) cfzX $(GNUSTEP_INSTANCE).tar.gz $(GNUSTEP_MAKEFILES)/tar-exclude-list $(GNUSTEP_INSTANCE)
internal-doc-install_::
$(INSTALL_DATA) $(GNUSTEP_INSTANCE)/*.html \

View file

@ -362,9 +362,23 @@ endif
# files; and the symlinks are dereferenced when the bundle is
# installed (which is why the 'h' option is there). I've never used
# this feature, but it was requested by some of our users.
#
# Another common request is to ignore/drop CVS and .svn
# directories/files from the bundle when installing. You don't really
# want to install those in case they ended up in the bundle when you
# recursively copied some resources in it from your source code.
# This is obtained by using the 'X' flag.
#
# Because of compatibility issues with older versions of GNU tar (not
# to speak of non-GNU tars), we use the X option rather than the
# --exclude= option. The X option requires as argument a file listing
# files to exclude. We use a standard exclude file list which we store
# in GNUSTEP_MAKEFILES.
#
shared-instance-bundle-install:: $(GNUSTEP_SHARED_BUNDLE_INSTALL_DIR)
$(ECHO_INSTALLING_BUNDLE)rm -rf $(GNUSTEP_SHARED_BUNDLE_INSTALL_DIR)/$(GNUSTEP_SHARED_BUNDLE_MAIN_PATH); \
(cd $(GNUSTEP_BUILD_DIR); $(TAR) chf - $(GNUSTEP_SHARED_BUNDLE_MAIN_PATH)) \
(cd $(GNUSTEP_BUILD_DIR); $(TAR) chfX - $(GNUSTEP_MAKEFILES)/tar-exclude-list $(GNUSTEP_SHARED_BUNDLE_MAIN_PATH)) \
| (cd $(GNUSTEP_SHARED_BUNDLE_INSTALL_DIR); $(TAR) xf -)$(END_ECHO)
ifneq ($(CHOWN_TO),)
$(ECHO_CHOWNING)$(CHOWN) -R $(CHOWN_TO) \
@ -373,7 +387,7 @@ endif
shared-instance-bundle-copy_into_dir::
$(ECHO_COPYING_BUNDLE_INTO_DIR)rm -rf $(COPY_INTO_DIR)/$(GNUSTEP_SHARED_BUNDLE_MAIN_PATH); \
(cd $(GNUSTEP_BUILD_DIR); $(TAR) chf - $(GNUSTEP_SHARED_BUNDLE_MAIN_PATH)) \
(cd $(GNUSTEP_BUILD_DIR); $(TAR) chfX - $(GNUSTEP_MAKEFILES)/tar-exclude-list $(GNUSTEP_SHARED_BUNDLE_MAIN_PATH)) \
| (cd $(COPY_INTO_DIR); $(TAR) xf -)$(END_ECHO)
shared-instance-bundle-uninstall::

View file

@ -479,7 +479,7 @@ internal-framework-install_:: $(FRAMEWORK_INSTALL_DIR) \
$(GNUSTEP_LIBRARIES)/$(GNUSTEP_TARGET_LDIR) \
$(GNUSTEP_HEADERS)
$(ECHO_INSTALLING)rm -rf $(FRAMEWORK_INSTALL_DIR)/$(FRAMEWORK_DIR_NAME); \
(cd $(GNUSTEP_BUILD_DIR); $(TAR) cf - $(FRAMEWORK_DIR_NAME)) | (cd $(FRAMEWORK_INSTALL_DIR); $(TAR) xf -)$(END_ECHO)
(cd $(GNUSTEP_BUILD_DIR); $(TAR) cfX - $(GNUSTEP_MAKEFILES)/tar-exclude-list $(FRAMEWORK_DIR_NAME)) | (cd $(FRAMEWORK_INSTALL_DIR); $(TAR) xf -)$(END_ECHO)
ifneq ($(CHOWN_TO),)
$(ECHO_CHOWNING)$(CHOWN) -R $(CHOWN_TO) $(FRAMEWORK_INSTALL_DIR)/$(FRAMEWORK_DIR_NAME)$(END_ECHO)
endif
@ -521,7 +521,7 @@ else
internal-framework-install_:: $(FRAMEWORK_INSTALL_DIR)
$(ECHO_INSTALLING)rm -rf $(FRAMEWORK_INSTALL_DIR)/$(FRAMEWORK_DIR_NAME); \
(cd $(GNUSTEP_BUILD_DIR); $(TAR) cf - $(FRAMEWORK_DIR_NAME)) | (cd $(FRAMEWORK_INSTALL_DIR); $(TAR) xf -)$(END_ECHO)
(cd $(GNUSTEP_BUILD_DIR); $(TAR) cfX - $(GNUSTEP_MAKEFILES)/tar-exclude-list $(FRAMEWORK_DIR_NAME)) | (cd $(FRAMEWORK_INSTALL_DIR); $(TAR) xf -)$(END_ECHO)
ifneq ($(CHOWN_TO),)
$(ECHO_CHOWNING)$(CHOWN) -R $(CHOWN_TO) $(FRAMEWORK_INSTALL_DIR)/$(FRAMEWORK_DIR_NAME)$(END_ECHO)
endif
@ -538,7 +538,7 @@ internal-framework-install_:: $(FRAMEWORK_INSTALL_DIR) \
$(GNUSTEP_HEADERS) \
$(DLL_INSTALLATION_DIR)
$(ECHO_INSTALLING)rm -rf $(FRAMEWORK_INSTALL_DIR)/$(FRAMEWORK_DIR_NAME); \
(cd $(GNUSTEP_BUILD_DIR); $(TAR) cf - $(FRAMEWORK_DIR_NAME)) | (cd $(FRAMEWORK_INSTALL_DIR); $(TAR) xf -)$(END_ECHO)
(cd $(GNUSTEP_BUILD_DIR); $(TAR) cfX - $(GNUSTEP_MAKEFILES)/tar-exclude-list $(FRAMEWORK_DIR_NAME)) | (cd $(FRAMEWORK_INSTALL_DIR); $(TAR) xf -)$(END_ECHO)
ifneq ($(CHOWN_TO),)
$(ECHO_CHOWNING)$(CHOWN) -R $(CHOWN_TO) $(FRAMEWORK_INSTALL_DIR)/$(FRAMEWORK_DIR_NAME)$(END_ECHO)
endif
@ -552,7 +552,7 @@ endif
fi; \
$(MKINSTALLDIRS) $(HEADER_FILES_INSTALL_DIR); \
cd $(FRAMEWORK_INSTALL_DIR)/$(FRAMEWORK_VERSION_DIR_NAME)/Headers ; \
$(TAR) cf - . | (cd $(GNUSTEP_HEADERS)/$(HEADER_FILES_INSTALL_DIR); \
$(TAR) cfX - $(GNUSTEP_MAKEFILES)/tar-exclude-list . | (cd $(GNUSTEP_HEADERS)/$(HEADER_FILES_INSTALL_DIR); \
$(TAR) xf - ); \
fi;$(END_ECHO)
ifneq ($(CHOWN_TO),)

View file

@ -252,7 +252,7 @@ $(GSWBUNDLE_DIR)/Resources/WebServer:
internal-gswbundle-install_:: $(GSWBUNDLE_INSTALL_DIR) shared-instance-headers-install
$(ECHO_INSTALLING)rm -rf $(GSWBUNDLE_INSTALL_DIR)/$(GSWBUNDLE_DIR_NAME); \
(cd $(GNUSTEP_BUILD_DIR); $(TAR) ch --exclude=CVS --to-stdout $(GSWBUNDLE_DIR_NAME)) | (cd $(GSWBUNDLE_INSTALL_DIR); $(TAR) xf -)$(END_ECHO)
(cd $(GNUSTEP_BUILD_DIR); $(TAR) chX - $(GNUSTEP_MAKEFILES)/tar-exclude-list $(GSWBUNDLE_DIR_NAME)) | (cd $(GSWBUNDLE_INSTALL_DIR); $(TAR) xf -)$(END_ECHO)
ifneq ($(CHOWN_TO),)
$(ECHO_CHOWNING)$(CHOWN) -R $(CHOWN_TO) $(GSWBUNDLE_INSTALL_DIR)/$(GSWBUNDLE_DIR_NAME)$(END_ECHO)
endif

2
tar-exclude-list Normal file
View file

@ -0,0 +1,2 @@
CVS
.svn