From cd39847aa8a67e249c3c8c0309e1a88c5a81d466 Mon Sep 17 00:00:00 2001 From: "beville@gmail.com" Date: Thu, 15 Nov 2012 07:38:42 +0000 Subject: [PATCH] Get the version from py file for dmg build git-svn-id: http://comictagger.googlecode.com/svn/trunk@45 6c5673fe-1810-88d6-992b-cd32ca31540c --- mac/Makefile | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/mac/Makefile b/mac/Makefile index b73e0d4..a5ff9ee 100644 --- a/mac/Makefile +++ b/mac/Makefile @@ -2,7 +2,9 @@ PY2INSTALLER_CMD := python $(HOME)/pyinstaller-2.0/pyinstaller.py TAGGER_BASE := $(HOME)/Dropbox/tagger/comictagger APP_NAME := ComicTagger -VERSION_STR := 1.0 +VERSION_STR := $(shell grep version $(TAGGER_BASE)/ctversion.py| cut -d= -f2 | sed 's/\"//g') + + MAC_BASE := $(TAGGER_BASE)/mac DIST_DIR := $(MAC_BASE)/dist @@ -11,20 +13,20 @@ APP_BUNDLE := $(DIST_DIR)/$(APP_NAME).app VOLUME_NAME := $(APP_NAME)-$(VERSION_STR) DMG_FILE := $(VOLUME_NAME).dmg -all: clean dist +all: clean dist diskimage dist: $(PY2INSTALLER_CMD) tagger.py -o $(MAC_BASE) -w -n $(APP_NAME) -s cp $(TAGGER_BASE)/*.ui $(TAGGER_BASE)/*.png $(APP_BUNDLE)/Contents/MacOS + cp -a $(TAGGER_BASE)/graphics $(APP_BUNDLE)/Contents/MacOS cp $(MAC_BASE)/app.icns $(APP_BUNDLE)/Contents/Resources/icon-windowed.icns + clean: rm -rf $(DIST_DIR) $(MAC_BASE)/build rm -f $(MAC_BASE)/*.spec rm -f "*~" *.pyc *.pyo - + echo $(VERSION_STR) diskimage: - - #Set up disk image staging folder rm -rf $(STAGING) mkdir $(STAGING)