Dynamically generate version information for Thunderbird based on the value of version.txt

thanks to stephen walker for the patch.
This commit is contained in:
scott%scott-macgregor.org 2004-01-27 02:49:45 +00:00
Родитель fbbdd7c8ad
Коммит 58935d2f25
5 изменённых файлов: 45 добавлений и 258 удалений

Просмотреть файл

@ -85,15 +85,6 @@ LIBS = \
include $(topsrcdir)/config/config.mk
## HACK ALERT...I can't seem to get the console to go away in optimized builds
## the MOZWINCONSOLE lines above are doing anything...for now, force the right
## subsytem
ifndef MOZ_DEBUG
WIN32_EXE_LDFLAGS += /SUBSYSTEM:WINDOWS
endif
ifeq ($(OS_ARCH),WINNT)
OS_LIBS += $(call EXPAND_LIBNAME,comctl32 comdlg32 uuid shell32 ole32 oleaut32 version winspool gdi32)
RCINCLUDE = splash.rc
@ -110,6 +101,9 @@ endif
include $(topsrcdir)/config/rules.mk
APP_VERSION = $(shell cat $(srcdir)/../config/version.txt)
DEFINES += -DAPP_VERSION=\"$(APP_VERSION)\"
ifeq ($(OS_ARCH),WINNT)
#
# Control the default heap size.
@ -187,6 +181,7 @@ install:: thunderbird
$(SYSINSTALL) $< $(DESTDIR)$(bindir)
GARBAGE += thunderbird
GARBAGE += $(addprefix $(DIST)/bin/defaults/pref/, all.js thunderbird.js mailnews.js)
endif
ifneq (,$(filter gtk gtk2,$(MOZ_WIDGET_TOOLKIT)))
@ -215,10 +210,15 @@ endif
libs:: $(PROGRAM)
mkdir -p $(DIST)/$(APP_NAME).app/Contents/MacOS
rsync -a $(srcdir)/macbuild/Contents $(DIST)/$(APP_NAME).app
rsync -aL $(DIST)/bin/ $(DIST)/$(APP_NAME).app/Contents/MacOS
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
cp -RL $(srcdir)/macbuild/mach.icns $(DIST)/$(APP_NAME).app/Contents/Resources/mach.icns
echo -n APPLMOZM > $(DIST)/$(APP_NAME).app/Contents/PkgInfo
# remove CVS dirs from packaged app
find $(DIST)/$(APP_NAME).app -type d -name "CVS" -prune -exec rm -rf {} \;
clean clobber::
rm -rf $(DIST)/$(APP_NAME).app

Просмотреть файл

@ -0,0 +1,30 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>CFBundleDevelopmentRegion</key>
<string>English</string>
<key>CFBundleExecutable</key>
<string>thunderbird-bin</string>
<key>CFBundleGetInfoString</key>
<string>Thunderbird APP_VERSION, © 2003 The Mozilla Organization</string>
<key>CFBundleIconFile</key>
<string>mach</string>
<key>CFBundleIdentifier</key>
<string>org.mozilla.thunderbird</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>Thunderbird</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>@APP_VERSION@</string>
<key>CFBundleSignature</key>
<string>MOZM</string>
<key>CFBundleVersion</key>
<string>@APP_VERSION@</string>
<key>NSAppleScriptEnabled</key>
<true/>
</dict>
</plist>

Просмотреть файл

@ -1,245 +0,0 @@
/* -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/* ***** BEGIN LICENSE BLOCK *****
* Version: NPL 1.1/GPL 2.0/LGPL 2.1
*
* The contents of this file are subject to the Netscape Public License
* Version 1.1 (the "License"); you may not use this file except in
* compliance with the License. You may obtain a copy of the License at
* http://www.mozilla.org/NPL/
*
* Software distributed under the License is distributed on an "AS IS" basis,
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
* for the specific language governing rights and limitations under the
* License.
*
* The Original Code is mozilla.org code.
*
* The Initial Developer of the Original Code is
* Netscape Communications Corporation.
* Portions created by the Initial Developer are Copyright (C) 1998
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
*
* Alternatively, the contents of this file may be used under the terms of
* either the GNU General Public License Version 2 or later (the "GPL"), or
* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
* in which case the provisions of the GPL or the LGPL are applicable instead
* of those above. If you wish to allow use of your version of this file only
* under the terms of either the GPL or the LGPL, and not to allow others to
* use your version of this file under the terms of the NPL, indicate your
* decision by deleting the provisions above and replace them with the notice
* and other provisions required by the GPL or the LGPL. If you do not delete
* the provisions above, a recipient may use your version of this file under
* the terms of any one of the NPL, the GPL or the LGPL.
*
* ***** END LICENSE BLOCK ***** */
pref("browser.hiddenWindowChromeURL", "chrome://messenger/content/hiddenWindow.xul");
pref("network.search.url","http://cgi.netscape.com/cgi-bin/url_search.cgi?search=");
pref("general.useragent.vendor", "Thunderbird");
pref("general.useragent.vendorSub", "0.5a");
pref("signon.rememberSignons", true);
pref("signon.expireMasterPassword", false);
pref("general.startup.browser", false);
pref("general.startup.mail", false);
pref("general.startup.news", false);
pref("general.startup.editor", false);
pref("general.startup.compose", false);
pref("general.startup.addressbook", false);
pref("general.open_location.last_url", "");
pref("general.open_location.last_window_choice", 0);
pref("general.config.obscure_value", 0); // for MCD .cfg files
// 0 = blank, 1 = home (browser.startup.homepage), 2 = last
pref("browser.startup.page", 1);
pref("browser.startup.homepage", "chrome://navigator-region/locale/region.properties");
pref("browser.startup.homepage.count", 1);
// "browser.startup.homepage_override" was for 4.x
pref("browser.startup.homepage_override.1", true);
pref("browser.startup.autoload_homepage", true);
pref("browser.cache.memory.capacity", 4096);
pref("browser.urlbar.autoFill", false);
pref("browser.urlbar.showPopup", true);
pref("browser.urlbar.showSearch", true);
pref("browser.urlbar.matchOnlyTyped", false);
pref("browser.chrome.site_icons", true);
pref("browser.chrome.favicons", false);
pref("browser.chrome.toolbar_tips", true);
// 0 = Pictures Only, 1 = Text Only, 2 = Pictures and Text
pref("browser.chrome.toolbar_style", 2);
pref("browser.toolbars.showbutton.bookmarks", true);
pref("browser.toolbars.showbutton.go", false);
pref("browser.toolbars.showbutton.home", true);
pref("browser.toolbars.showbutton.print", true);
pref("browser.toolbars.showbutton.search", true);
pref("browser.turbo.enabled", false);
// Dialog modality issues
pref("browser.prefWindowModal", true);
pref("browser.show_about_as_stupid_modal_window", false);
pref("browser.download.progressDnldDialog.keepAlive", true); // keep the dnload progress dialog up after dnload is complete
pref("browser.download.progressDnldDialog.enable_launch_reveal_buttons", true);
pref("browser.download.useDownloadDir", false);
pref("browser.download.folderList", 0);
// various default search settings
pref("browser.search.defaulturl", "chrome://navigator-region/locale/region.properties");
pref("browser.search.opensidebarsearchpanel", true);
pref("browser.search.last_search_category", "NC:SearchCategory?category=urn:search:category:1");
pref("browser.search.mode", 0);
pref("browser.search.powermode", 0);
// basic search popup constraint: minimum sherlock plugin version displayed
// (note: must be a string representation of a float or it'll default to 0.0)
pref("browser.search.basic.min_ver", "0.0");
pref("browser.urlbar.autocomplete.enabled", true);
pref("browser.urlbar.clickSelectsAll", true);
pref("browser.history.grouping", "day");
pref("browser.sessionhistory.max_entries", 50);
// Translation service
pref("browser.translation.service", "http://www.teletranslator.com:8120/?AlisUI=frames_ex/moz_home&alis_info=moz&AlisTargetURI=");
pref("browser.translation.serviceDomain", "teletranslator.com");
// Platform for Internet Content Selection
pref("browser.PICS.ratings_enabled", false);
pref("browser.PICS.pages_must_be_rated", false);
pref("browser.PICS.disable_for_this_session", false);
pref("browser.PICS.reenable_for_this_session", false);
pref("browser.PICS.service.http___home_netscape_com_default_rating.service_enabled", true);
pref("browser.PICS.service.http___home_netscape_com_default_rating.s", 0);
// css2 hover pref
pref("nglayout.events.showHierarchicalHover", false);
// Smart Browsing prefs
pref("browser.related.enabled", true);
pref("browser.related.autoload", 1); // 0 = Always, 1 = After first use, 2 = Never
pref("browser.related.provider", "http://www-rl.netscape.com/wtgn?");
pref("browser.related.disabledForDomains", "");
pref("browser.goBrowsing.enabled", true);
// Default bookmark sorting
pref("browser.bookmarks.sort.direction", "descending");
pref("browser.bookmarks.sort.resource", "rdf:http://home.netscape.com/NC-rdf#Name");
//Internet Search
pref("browser.search.defaultenginename", "chrome://communicator-region/locale/region.properties");
pref("javascript.options.showInConsole", true);
pref("offline.startup_state", 2);
pref("offline.send.unsent_messages", 0);
pref("offline.download.download_messages", 0);
pref("offline.prompt_synch_on_exit", true);
// Expose only select protocol handlers. All others should go
// through the external protocol handler route.
pref("network.protocol-handler.expose-all", false);
pref("network.protocol-handler.expose.mailto", true);
pref("network.protocol-handler.expose.news", true);
pref("network.protocol-handler.expose.snews", true);
pref("network.protocol-handler.expose.nntp", true);
pref("network.protocol-handler.expose.imap", true);
pref("network.protocol-handler.expose.addbook", true);
pref("network.protocol-handler.expose.pop", true);
pref("network.protocol-handler.expose.mailbox", true);
pref("network.protocols.useSystemDefaults", false);
pref("network.hosts.smtp_server", "mail");
pref("network.hosts.pop_server", "mail");
pref("network.enableIDN", false); // Turn on/off IDN (Internationalized Domain Name) resolution
pref("wallet.captureForms", true);
pref("wallet.notified", false);
pref("wallet.TutorialFromMenu", "chrome://navigator/locale/navigator.properties");
pref("wallet.Server", "chrome://navigator/locale/navigator.properties");
pref("wallet.Samples", "chrome://navigator/locale/navigator.properties");
pref("wallet.version", "1");
pref("wallet.enabled", true);
pref("wallet.crypto", false);
pref("wallet.crypto.autocompleteoverride", false); // Ignore 'autocomplete=off' - available only when wallet.crypto is enabled.
pref("wallet.namePanel.hide", false);
pref("wallet.addressPanel.hide", false);
pref("wallet.phonePanel.hide", false);
pref("wallet.creditPanel.hide", false);
pref("wallet.employPanel.hide", false);
pref("wallet.miscPanel.hide", false);
pref("imageblocker.enabled", true);
// -- folders (Mac: these are binary aliases.)
pref("mail.signature_file", "");
pref("mail.directory", "");
pref("news.directory", "");
pref("autoupdate.enabled", true);
pref("browser.editor.disabled", false);
pref("spellchecker.dictionary", "");
pref("profile.allow_automigration", false); // setting to false bypasses automigration in the profile code
// profile.migration_behavior determines how the profiles root is set
// 0 - use NS_APP_USER_PROFILES_ROOT_DIR
// 1 - create one based on the NS4.x profile root
// 2 - use, if not empty, profile.migration_directory otherwise same as 0
pref("profile.migration_behavior",0);
pref("profile.migration_directory", "");
// Customizable toolbar stuff
pref("custtoolbar.personal_toolbar_folder", "");
pref("sidebar.customize.all_panels.url", "http://sidebar-rdf.netscape.com/%LOCALE%/sidebar-rdf/%SIDEBAR_VERSION%/all-panels.rdf");
pref("sidebar.customize.directory.url", "http://dmoz.org/Netscape/Sidebar/");
pref("sidebar.customize.more_panels.url", "http://dmoz.org/Netscape/Sidebar/");
pref("sidebar.num_tabs_in_view", 8);
// XXXbsmedberg why are changing the default value here?
// ------------------
// Numeral Style
// ------------------
// 1 = regularcontextnumeralBidi *
// 2 = hindicontextnumeralBidi
// 3 = arabicnumeralBidi
// 4 = hindinumeralBidi
pref("bidi.numeral", 1);
pref("browser.throbber.url","chrome://navigator-region/locale/region.properties");
// pref to control the alert notification
pref("alerts.slideIncrement", 1);
pref("alerts.slideIncrementTime", 10);
pref("alerts.totalOpenTime", 4000);
pref("alerts.height", 50);
// update notifications prefs
pref("update_notifications.enabled", true);
pref("update_notifications.provider.0.frequency", 7); // number of days
pref("update_notifications.provider.0.datasource", "chrome://communicator-region/locale/region.properties");
// 0 opens the download manager
// 1 opens a progress dialog
// 2 and other values, no download manager, no progress dialog.
pref("browser.downloadmanager.behavior", 1);
pref("privacy.popups.sound_enabled", true);
pref("privacy.popups.sound_url", "");
pref("privacy.popups.statusbar_icon_enabled", true);
#ifndef XP_MACOSX
#ifdef XP_UNIX
// Most Unix people think modal pref windows are stupid:
pref("browser.prefWindowModal", false);
// For the download dialog
pref("browser.download.progressDnldDialog.enable_launch_reveal_buttons", false);
pref("browser.urlbar.clickSelectsAll", false);
#endif
#endif

Просмотреть файл

@ -36,11 +36,12 @@
* ***** END LICENSE BLOCK ***** */
pref("browser.hiddenWindowChromeURL", "chrome://messenger/content/hiddenWindow.xul");
pref("network.search.url","http://cgi.netscape.com/cgi-bin/url_search.cgi?search=");
pref("general.useragent.vendor", "Thunderbird");
pref("general.useragent.vendorSub", "0.5a");
pref("general.useragent.vendorSub",
#expand __APP_VERSION__
);
pref("signon.rememberSignons", true);
pref("signon.expireMasterPassword", false);

1
mail/config/version.txt Normal file
Просмотреть файл

@ -0,0 +1 @@
0.5a