From fa309cfcefa28223d4fd2e349465ac227e2c7336 Mon Sep 17 00:00:00 2001 From: "beville@gmail.com" Date: Thu, 7 Feb 2013 17:35:25 +0000 Subject: [PATCH] Got mac build working with new structure git-svn-id: http://comictagger.googlecode.com/svn/trunk@461 6c5673fe-1810-88d6-992b-cd32ca31540c --- mac/Makefile | 9 ++++----- windows/nsis/license.txt | 4 ++-- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/mac/Makefile b/mac/Makefile index 643bb6a..65539e7 100644 --- a/mac/Makefile +++ b/mac/Makefile @@ -1,10 +1,9 @@ PYINSTALLER_CMD := python $(HOME)/pyinstaller-2.0/pyinstaller.py TAGGER_BASE := $(HOME)/Dropbox/tagger/comictagger +TAGGER_SRC := $(TAGGER_BASE)/comictaggerlib APP_NAME := ComicTagger -VERSION_STR := $(shell grep version $(TAGGER_BASE)/ctversion.py| cut -d= -f2 | sed 's/\"//g') - - +VERSION_STR := $(shell grep version $(TAGGER_SRC)/ctversion.py| cut -d= -f2 | sed 's/\"//g') MAC_BASE := $(TAGGER_BASE)/mac DIST_DIR := $(MAC_BASE)/dist @@ -17,8 +16,8 @@ all: clean dist diskimage dist: $(PYINSTALLER_CMD) $(TAGGER_BASE)/comictagger.py -o $(MAC_BASE) -w -n $(APP_NAME) -s - cp $(TAGGER_BASE)/*.ui $(APP_BUNDLE)/Contents/MacOS - cp -a $(TAGGER_BASE)/graphics $(APP_BUNDLE)/Contents/MacOS + cp -a $(TAGGER_SRC)/ui $(APP_BUNDLE)/Contents/MacOS + cp -a $(TAGGER_SRC)/graphics $(APP_BUNDLE)/Contents/MacOS cp $(MAC_BASE)/app.icns $(APP_BUNDLE)/Contents/Resources/icon-windowed.icns clean: diff --git a/windows/nsis/license.txt b/windows/nsis/license.txt index 8699572..e342491 100644 --- a/windows/nsis/license.txt +++ b/windows/nsis/license.txt @@ -1,4 +1,4 @@ -Copyright 2012 Anthony Beville +ComicTagger - Copyright 2012 Anthony Beville Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -10,4 +10,4 @@ Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and -limitations under the License. \ No newline at end of file +limitations under the License.