Make sure the mac bundle Info.plist has the version string set

git-svn-id: http://comictagger.googlecode.com/svn/trunk@524 6c5673fe-1810-88d6-992b-cd32ca31540c

Makefile

@@ -52,10 +52,7 @@ upload:
 	$(UPLOAD_TOOL) -p comictagger -s "ComicTagger $(VERSION_STR) Source" -l Featured,Type-Source -u beville -w $(PASSWORD) "release/comictagger-$(VERSION_STR).zip"
 	$(UPLOAD_TOOL) -p comictagger -s "ComicTagger $(VERSION_STR)  Mac OS X" -l Featured,Type-Archive -u beville -w $(PASSWORD) "release/ComicTagger-$(VERSION_STR).dmg"
 	$(UPLOAD_TOOL) -p comictagger -s "ComicTagger $(VERSION_STR)  Windows" -l Featured,Type-Installer -u beville -w $(PASSWORD) "release/ComicTagger v$(VERSION_STR).exe"
-
-	@echo ----------------------------------- 
-	@echo	??? python setup.py register
-	@echo ----------------------------------- 
+	python setup.py register
  
 svn_tag:
 	svn copy https://comictagger.googlecode.com/svn/trunk \

comictaggerlib/comicinfoxml.py

@@ -89,36 +89,21 @@ class ComicInfoXml:
 			if md_entry is not None:
 				ET.SubElement(root, cix_entry).text = u"{0}".format(md_entry)
 
+		assign( 'Title', md.title )
 		assign( 'Series', md.series )
 		assign( 'Number', md.issue )
-		assign( 'Title', md.title )
 		assign( 'Count', md.issueCount )
 		assign( 'Volume', md.volume )
 		assign( 'AlternateSeries', md.alternateSeries )
 		assign( 'AlternateNumber', md.alternateNumber )
+		assign( 'StoryArc', md.storyArc )
+		assign( 'SeriesGroup', md.seriesGroup )
 		assign( 'AlternateCount', md.alternateCount )
 		assign( 'Summary', md.comments )
 		assign( 'Notes', md.notes )
 		assign( 'Year', md.year )
 		assign( 'Month', md.month )
-		assign( 'Publisher', md.publisher )
-		assign( 'Imprint', md.imprint )
-		assign( 'Genre', md.genre )
-		assign( 'Web', md.webLink )
-		assign( 'PageCount', md.pageCount )
-		assign( 'Format', md.format )
-		assign( 'LanguageISO', md.language )
-		assign( 'Manga', md.manga )
-		assign( 'Characters', md.characters )
-		assign( 'Teams', md.teams )
-		assign( 'Locations', md.locations )
-		assign( 'ScanInformation', md.scanInfo )
-		assign( 'StoryArc', md.storyArc )
-		assign( 'SeriesGroup', md.seriesGroup )
-		assign( 'AgeRating', md.maturityRating )
-
-		if md.blackAndWhite is not None and md.blackAndWhite:
-			ET.SubElement(root, 'BlackAndWhite').text = "Yes"
+		assign( 'Day', md.day )
 
 		# need to specially process the credits, since they are structured differently than CIX	
 		credit_writer_list    = list()
@@ -181,7 +166,23 @@ class ComicInfoXml:
 		if len( credit_editor_list ) > 0:
 			node = ET.SubElement(root, 'Editor')
 			node.text = utils.listToString( credit_editor_list )
-		
+
+		assign( 'Publisher', md.publisher )
+		assign( 'Imprint', md.imprint )
+		assign( 'Genre', md.genre )
+		assign( 'Web', md.webLink )
+		assign( 'PageCount', md.pageCount )
+		assign( 'LanguageISO', md.language )
+		assign( 'Format', md.format )
+		assign( 'AgeRating', md.maturityRating )
+		if md.blackAndWhite is not None and md.blackAndWhite:
+			ET.SubElement(root, 'BlackAndWhite').text = "Yes"
+		assign( 'Manga', md.manga )
+		assign( 'Characters', md.characters )
+		assign( 'Teams', md.teams )
+		assign( 'Locations', md.locations )
+		assign( 'ScanInformation', md.scanInfo )
+
 		#  loop and add the page entries under pages node
 		if len( md.pages ) > 0:
 			pages_node = ET.SubElement(root, 'Pages')
@@ -229,6 +230,7 @@ class ComicInfoXml:
 		md.notes =            xlate( 'Notes' )
 		md.year =             xlate( 'Year' )
 		md.month =            xlate( 'Month' )
+		md.day =              xlate( 'Day' )
 		md.publisher =        xlate( 'Publisher' )
 		md.imprint =          xlate( 'Imprint' )
 		md.genre =            xlate( 'Genre' )

comictaggerlib/ctversion.py

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

comictaggerlib/genericmetadata.py

@@ -63,6 +63,7 @@ class GenericMetadata:
 		self.publisher          = None
 		self.month              = None
 		self.year               = None
+		self.day                = None
 		self.issueCount         = None
 		self.volume             = None
 		self.genre              = None
@@ -125,6 +126,7 @@ class GenericMetadata:
 		assign( "issueCount",        new_md.issueCount )
 		assign( "title",             new_md.title )
 		assign( "publisher",         new_md.publisher )
+		assign( "day",               new_md.day )
 		assign( "month",             new_md.month )
 		assign( "year",              new_md.year )
 		assign( "volume",            new_md.volume )
@@ -256,8 +258,9 @@ class GenericMetadata:
 		add_attr_string( "issueCount" )
 		add_attr_string( "title" )
 		add_attr_string( "publisher" )
-		add_attr_string( "month" )
 		add_attr_string( "year" )
+		add_attr_string( "month" )
+		add_attr_string( "day" )
 		add_attr_string( "volume" )
 		add_attr_string( "volumeCount" )
 		add_attr_string( "genre" )

mac/Makefile

@@ -19,6 +19,8 @@ dist:
 	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
+	# fix the version string in the Info.plist
+	sed -i -e 's/0\.0\.0/$(VERSION_STR)/' $(MAC_BASE)/dist/ComicTagger.app/Contents/Info.plist
 	
 clean:
 	rm -rf $(DIST_DIR) $(MAC_BASE)/build

scripts/README.txt

@@ -17,12 +17,12 @@ via the app.
 
 -----------------------------------------------------------------------------
 
-This feature is UNSUPPORTED, and is for the convienience of developement-minded
+This feature is UNSUPPORTED, and is for the convenience of development-minded
 users of ComicTagger.  The comictaggerlib module will remain largely
 undocumented, and it will up to the crafty script developer to look through
 the code to discern APIs and such.
 
-That said, there are questions, please post on the forums, and hopefully we
+That said, if there are questions, please post in the forums, and hopefully we
 can get your add-on scripts working!
 
 http://comictagger.forumotion.com/