darwin Makefiles: copy release scripts and python modules to where blender looks...
authorStefan Gartner <stefang@aon.at>
Thu, 14 Oct 2010 19:30:55 +0000 (19:30 +0000)
committerStefan Gartner <stefang@aon.at>
Thu, 14 Oct 2010 19:30:55 +0000 (19:30 +0000)
i.e. blender.app/Content/MacOS/$(VERSION) instead if blender.app/Content/MacOS/.blender

source/darwin/Makefile

index 5c68f43f606dd78a93d8d749b7f7adbd9660db6c..a9d9d7f2f2088d2554117e4d4e3189b829703554 100644 (file)
@@ -30,6 +30,7 @@
 include nan_definitions.mk
 
 DIR = $(OCGDIR)/$(DEBUG_DIR)
+VERSION = $(shell $(NANBLENDERHOME)/release/getversion.py)
 
 PYARCHIVE = python_$(MACOSX_ARCHITECTURE).zip
 
@@ -38,22 +39,25 @@ all::
        @echo "---> creating directory structure for $(APPLICATION)"
        @rm -rf $(DIR)/bin/$(APPLICATION).app
        @cp -R $(APPLICATION).app $(DIR)/bin
-       @cat $(APPLICATION).app/Contents/Info.plist | sed s/VERSION/`cat ../../release/VERSION`/ | sed s/DATE/`date +'%Y-%b-%d'`/ > $(DIR)/bin/$(APPLICATION).app/Contents/Info.plist
+       @cat $(APPLICATION).app/Contents/Info.plist | sed s/VERSION/$(VERSION)/ | sed s/DATE/`date +'%Y-%b-%d'`/ > $(DIR)/bin/$(APPLICATION).app/Contents/Info.plist
        @echo "---> copying binary"
        @cp $(DIR)/bin/$(APPLICATION) $(DIR)/bin/$(APPLICATION).app/Contents/MacOS/
        @echo "---> adding excutable attributes"
        @chmod +x $(DIR)/bin/$(APPLICATION).app/Contents/MacOS/$(APPLICATION)
 ifeq ($(APPLICATION), blender)
+       @mkdir -p $(DIR)/bin/$(APPLICATION).app/Contents/MacOS/$(VERSION)
        @echo "---> copying message files"
        @cp -R $(NANBLENDERHOME)/release/bin/.blender/locale $(DIR)/bin/$(APPLICATION).app/Contents/Resources
        @echo "---> copying .Blanguages"
        @cp $(NANBLENDERHOME)/release/bin/.blender/.Blanguages $(DIR)/bin/$(APPLICATION).app/Contents/Resources
-       @echo "---> copying .blender/ scripts"
-       @cp -R $(NANBLENDERHOME)/release/bin/.blender $(DIR)/bin/$(APPLICATION).app/Contents/MacOS
-       @cp -R $(NANBLENDERHOME)/release/scripts $(DIR)/bin/$(APPLICATION).app/Contents/MacOS/.blender/
+       @echo "---> copying bfont.ttf"
+       @cp $(NANBLENDERHOME)/release/datafiles/bfont.ttf $(DIR)/bin/$(APPLICATION).app/Contents/Resources/
+       @cp $(NANBLENDERHOME)/release/datafiles/bmonofont.ttf $(DIR)/bin/$(APPLICATION).app/Contents/Resources/
+       @echo "---> copying release scripts"
+       @cp -R $(NANBLENDERHOME)/release/scripts $(DIR)/bin/$(APPLICATION).app/Contents/MacOS/$(VERSION)/
        @echo "---> copying python modules"
-       @mkdir $(DIR)/bin/$(APPLICATION).app/Contents/MacOS/.blender/python
-       @unzip -q $(LCGDIR)/release/$(PYARCHIVE) -d $(DIR)/bin/$(APPLICATION).app/Contents/MacOS/.blender/python/       
+       @mkdir $(DIR)/bin/$(APPLICATION).app/Contents/MacOS/$(VERSION)/python
+       @unzip -q $(LCGDIR)/release/$(PYARCHIVE) -d $(DIR)/bin/$(APPLICATION).app/Contents/MacOS/$(VERSION)/python/     
 endif
        @echo "---> removing SVN directories and Mac hidden files from distribution"
        @find $(DIR)/bin/$(APPLICATION).app -name CVS -prune -exec rm -rf {} \;