restructre

git-svn-id: http://comictagger.googlecode.com/svn/trunk@450 6c5673fe-1810-88d6-992b-cd32ca31540c
This commit is contained in:
beville@gmail.com 2013-02-06 22:29:52 +00:00
parent 75d5b1a695
commit fb5fca1dc4
3 changed files with 8 additions and 6 deletions

View File

@ -1,7 +1,8 @@
TAGGER_BASE := $(HOME)/Dropbox/tagger/comictagger
VERSION_STR := $(shell grep version $(TAGGER_BASE)/ctversion.py| cut -d= -f2 | sed 's/\"//g')
TAGGER_SRC := $(TAGGER_BASE)/src
VERSION_STR := $(shell grep version $(TAGGER_SRC)/ctversion.py| cut -d= -f2 | sed 's/\"//g')
PASSWORD := $(shell cat $(TAGGER_BASE)/project_password.txt)
UPLOAD_TOOL := $(TAGGER_BASE)/googlecode_upload.py
UPLOAD_TOOL := $(TAGGER_BASE)/google/googlecode_upload.py
all: clean
clean:

View File

@ -1,3 +1,3 @@
# This file should contan only these comments, and the line below.
# Used by packaging makefiles and app
version="1.1.0-beta"
version="1.1.1-beta"

View File

@ -2,6 +2,7 @@
# rm, cp, grep, cut, cat
TAGGER_BASE:= c:\Users\tony\Dropbox\tagger\comictagger
TAGGER_SRC := $(TAGGER_BASE)\src
DIST_DIR := $(TAGGER_BASE)\windows\dist
NSIS_CMD := "C:\Program Files (x86)\NSIS\makensis.exe"
VERSION := $(shell grep version "$(TAGGER_BASE)\ctversion.py" | cut -d= -f2)
@ -10,10 +11,10 @@ all: clean dist package
dist:
cd "$(TAGGER_BASE)" &
"C:\Python27\Scripts\cxfreeze.bat" $(TAGGER_BASE)\comictagger.py --icon nsis\app.ico
"C:\Python27\Scripts\cxfreeze.bat" $(TAGGER_SRC)\comictagger.py --icon nsis\app.ico
#--base-name=Win32GUI
cp -R C:\Python27\Lib\site-packages\PyQt4\plugins\imageformats $(DIST_DIR)
cp "$(TAGGER_BASE)\UnRAR2\UnRARDLL\unrar.dll" $(DIST_DIR)
cp "$(TAGGER_SRC)\UnRAR2\UnRARDLL\unrar.dll" $(DIST_DIR)
cp "$(TAGGER_BASE)\*.ui" $(DIST_DIR)
cp -r "$(TAGGER_BASE)\graphics" $(DIST_DIR)
@ -32,4 +33,4 @@ clean:
test:
echo !define RELEASE_STR $(VERSION) > test.nsh