Bug 224818 - centralize firebird version string and use it where appropriate

browser/app/Makefile.in

@@ -140,6 +140,9 @@ ifdef BUILD_STATIC_LIBS
 include $(topsrcdir)/config/static-rules.mk
 endif
 
+APP_VERSION = $(shell cat $(srcdir)/../config/version.txt)
+DEFINES += -DAPP_VERSION=\"$(APP_VERSION)\"
+
 ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
 ifdef BUILD_STATIC_LIBS
 LIBS	+= -framework QuickTime -framework IOKit
@@ -236,7 +239,8 @@ APP_NAME = Mozilla\ Firebird
 
 libs:: $(PROGRAM)
 	mkdir -p $(DIST)/$(APP_NAME).app/Contents/MacOS
-	rsync -a $(srcdir)/macbuild/Contents $(DIST)/$(APP_NAME).app
+	rsync -a --exclude CVS --exclude "*.in" $(srcdir)/macbuild/Contents $(DIST)/$(APP_NAME).app
+	sed -e "s/APP_VERSION/$(APP_VERSION)/" $(srcdir)/macbuild/Contents/Info.plist.in > $(DIST)/$(APP_NAME).app/Contents/Info.plist
 	rsync -a $(DIST)/bin/ $(DIST)/$(APP_NAME).app/Contents/MacOS
 	rm -f $(DIST)/$(APP_NAME).app/Contents/MacOS/$(PROGRAM)
 	rsync -aL $(PROGRAM) $(DIST)/$(APP_NAME).app/Contents/MacOS

browser/app/brand.dtd

@@ -1,7 +1,9 @@
 <!ENTITY  lang.version          "1.5a">
 <!ENTITY  brandShortName        "Mozilla Firebird">
 <!ENTITY  brandFullName         "Mozilla Firebird">
-<!ENTITY  version               "0.7+">
+<!ENTITY  version               
+#expand __APP_VERSION__
+>
 <!ENTITY  vendorShortName       "Mozilla">
 
 <!ENTITY  releaseURL            "http://www.mozilla.org/projects/firebird/release-notes.html">

browser/app/jar.mn

@@ -1,3 +1,3 @@
 en-US.jar:
-+        locale/en-US/global/brand.dtd                      (brand.dtd)
+*+        locale/en-US/global/brand.dtd                      (brand.dtd)
 +        locale/en-US/global/brand.properties               (brand.properties)

browser/app/macbuild/Contents/Info.plist.in

@@ -70,7 +70,7 @@
 	<key>CFBundleExecutable</key>
 	<string>MozillaFirebird-bin</string>
 	<key>CFBundleGetInfoString</key>
-	<string>Mozilla 1.4a, © 1998-2003 The Mozilla Organization</string>
+	<string>Mozilla Firebird APP_VERSION, © 1998-2003 The Mozilla Organization</string>
 	<key>CFBundleIconFile</key>
 	<string>mach</string>
 	<key>CFBundleIdentifier</key>
@@ -82,7 +82,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.4a</string>
+	<string>@BROWSER_VERSION@</string>
 	<key>CFBundleSignature</key>
 	<string>MOZZ</string>
 	<key>CFBundleURLTypes</key>
@@ -133,7 +133,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>0.6.1</string>
+	<string>@BROWSER_VERSION@</string>
 	<key>NSAppleScriptEnabled</key>
 	<true/>
 </dict>

browser/app/profile/all.js

@@ -51,7 +51,9 @@ pref("keyword.URL", "http://www.google.com/search?btnI=I%27m+Feeling+Lucky&ie=UT
 pref("general.useragent.locale", "chrome://global/locale/intl.properties");
 pref("general.useragent.contentlocale", "chrome://browser-region/locale/region.properties");
 pref("general.useragent.vendor", "Firebird");
-pref("general.useragent.vendorSub", "0.7+");
+pref("general.useragent.vendorSub",
+#expand __APP_VERSION__
+);
 
 pref("general.smoothScroll", false);
 #ifndef XP_UNIX

browser/app/profile/firebird.js

@@ -51,7 +51,9 @@ pref("keyword.URL", "http://www.google.com/search?btnI=I%27m+Feeling+Lucky&ie=UT
 pref("general.useragent.locale", "chrome://global/locale/intl.properties");
 pref("general.useragent.contentlocale", "chrome://browser-region/locale/region.properties");
 pref("general.useragent.vendor", "Firebird");
-pref("general.useragent.vendorSub", "0.7+");
+pref("general.useragent.vendorSub",
+#expand __APP_VERSION__
+);
 
 pref("general.smoothScroll", false);
 #ifndef XP_UNIX

browser/config/version.txt

@@ -0,0 +1 @@
+0.8.0+