Revision: 14771
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14771
Author: sirdude
Date: 2008-05-09 22:00:18 +0200 (Fri, 09 May 2008)
Log Message:
-----------
This is patch: [#9050] Single step .svn dir removal for Makefile (release)
>From gsr.
It cleans up removing .svn dirs from the directorys that get copied over.
Kent
Modified Paths:
--------------
trunk/blender/release/Makefile
Modified: trunk/blender/release/Makefile
===================================================================
--- trunk/blender/release/Makefile 2008-05-09 17:37:01 UTC (rev 14770)
+++ trunk/blender/release/Makefile 2008-05-09 20:00:18 UTC (rev 14771)
@@ -118,7 +118,6 @@
ifneq ($(OS), darwin)
@[ ! -d $(OCGDIR)/bin/.blender ] || \
cp -r $(OCGDIR)/bin/.blender $(DISTDIR)
- @rm -rf $(DISTDIR)/.svn $(DISTDIR)/*/.svn $(DISTDIR)/*/*/.svn
@cp $(NANBLENDERHOME)/bin/.blender/.Blanguages $(CONFDIR)
@cp $(NANBLENDERHOME)/bin/.blender/.bfont.ttf $(CONFDIR)
endif
@@ -144,8 +143,7 @@
@cp ../source/blender/blenpluginapi/*.h $(DISTDIR)/plugins/include/
@chmod 755 $(DISTDIR)/plugins/bmake
@$(MAKE) -C $(DISTDIR)/plugins all > /dev/null || exit 1;
- @rm -fr $(DISTDIR)/plugins/.svn $(DISTDIR)/plugins/*/.svn \
- $(DISTDIR)/plugins/*/*.o
+ @rm -f $(DISTDIR)/plugins/*/*.o
#on OS X the plugins move to the installation directory
ifneq ($(OS),darwin)
@@ -158,7 +156,6 @@
@echo "----> Copy python infrastructure"
@[ ! -d scripts ] || cp -r scripts $(CONFDIR)/scripts
- @[ ! -d $(CONFDIR)/scripts ] || rm -fr $(CONFDIR)/scripts/.svn
$(CONFDIR)/scripts/*/.svn $(CONFDIR)/scripts/*/*/.svn
ifeq ($(OS),darwin)
@echo "----> Move .blender to .app/Contents/MacOS/"
@@ -180,6 +177,8 @@
@[ ! -x $(CONFIG_GUESS)/specific.sh ] || (\
echo "**--> Execute specific.sh in $(CONFIG_GUESS)/" && \
cd $(CONFIG_GUESS) && ./specific.sh )
+ @echo "----> Cleaning .svn metadata directories"
+ @find $(DISTDIR) -type d -name ".svn" | xargs rm -fr
pkg: install
@echo "----> Create distribution file $(BLENDNAME)$(EXT1)"
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
