diff options
Diffstat (limited to 'release/Makefile')
| -rw-r--r-- | release/Makefile | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/release/Makefile b/release/Makefile index 29369487d48..f440e2dface 100644 --- a/release/Makefile +++ b/release/Makefile @@ -28,7 +28,7 @@ include nan_definitions.mk -export VERSION := $(shell cat VERSION) +export VERSION := $(shell ./getversion.py) BLENDNAME=blender-$(VERSION)-$(CONFIG_GUESS)-py$(NAN_PYTHON_VERSION)$(TYPE) export DISTDIR=$(NAN_OBJDIR)/$(BLENDNAME) @@ -118,7 +118,6 @@ install: package 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 @@ ifneq ($(NOPLUGINS),true) @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 @@ endif @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 @@ endif @[ ! -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)" |