Commits

Peter Hosey committed 355d188

Give GrowlMail its own version-number constant. Currently, this simply works the same way as Growl versions: Set the version number in the Release Makefile, then make version.

Comments (0)

Files changed (3)

Extras/GrowlMail/Info.plist

 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>GROWL_VERSION</string>
+	<string>GROWLMAIL_VERSION</string>
 	<key>CFBundleSignature</key>
 	<string>emal</string>
 	<key>CFBundleVersion</key>
-	<string>GROWL_VERSION</string>
+	<string>GROWLMAIL_VERSION</string>
 	<key>NSPrincipalClass</key>
 	<string>GrowlMail</string>
 	<key>SupportedPluginCompatibilityUUIDs</key>

GrowlVersion.h.tmpl

 #define GROWL_VERSION INSERT_VERSION_HERE
 #define GROWL_VERSION_STRING "INSERT_VERSION_HERE"
 
+#define GROWLMAIL_VERSION INSERT_GROWLMAIL_VERSION_HERE
+#define GROWLMAIL_VERSION_STRING "INSERT_GROWLMAIL_VERSION_HERE"
+
 #include "hgRevision.h"
 
 #undef COMMENT_1
 ##########################
 ### Versioning:
-###   * Set VERSION below.
+###   * Set VERSION or GROWLMAIL_VERSION below.
 ###   * make version.
 #
 VERSION=1.2.1hg
+GROWLMAIL_VERSION=1.2.1hg
 
 #
 #########################
 RELEASE_FILENAME=Growl-$(VERSION)
 RELEASE_NAME="Growl-$(VERSION)"
 RELEASE_SDK_NAME="Growl $(VERSION) SDK"
-GROWLMAIL_RELEASE_FILENAME=GrowlMail-$(VERSION)
+GROWLMAIL_RELEASE_FILENAME=GrowlMail-$(GROWLMAIL_VERSION)
 
 SRC_DIR=$(PWD)/..
 BUILD_DIR=build
 	fi
 
 version:
-	sed -e "s/INSERT_VERSION_HERE/$(VERSION)/" < "$(SRC_DIR)/GrowlVersion.h.tmpl" > "$(SRC_DIR)/GrowlVersion.h"
+	sed -e "s/INSERT_VERSION_HERE/$(VERSION)/;s/INSERT_GROWLMAIL_VERSION_HERE/$(GROWLMAIL_VERSION)/" < "$(SRC_DIR)/GrowlVersion.h.tmpl" > "$(SRC_DIR)/GrowlVersion.h"
 
 clean-all:
 	find $(SRC_DIR) -name build -prune -print0 | xargs -0 rm -R
 
 $(GROWLMAIL_DIR):
 	mkdir '$@'
-	$(PACKAGE_MAKER) --no-relocate --doc GrowlMail/GrowlMail\ Installer.pmdoc --out '$@'/GrowlMail.pkg --version $(VERSION) --id com.growl.growlmail.pkg -v	
+	$(PACKAGE_MAKER) --no-relocate --doc GrowlMail/GrowlMail\ Installer.pmdoc --out '$@'/GrowlMail.pkg --version $(GROWLMAIL_VERSION) --id com.growl.growlmail.pkg -v	
 	cp -R "Uninstall GrowlMail.app" '$@'
 	/Developer/Tools/SetFile -a E '$@'/Uninstall\ GrowlMail.app
 	cp $(SRC_DIR)/Extras/GrowlMail/*.rtf '$@'