зеркало из https://github.com/mozilla/gecko-dev.git
bug 285696 - suite rebranding, stage 1: using configure variables in a number of places, some small cleanups; rs=biesi,smfr sr=Neil
This commit is contained in:
kairo%kairo.at
Родитель
e292ef6982
Коммит
b0ed9d166d
|
|
@ -71,7 +71,6 @@
|
|||
</ul>
|
||||
<h2>&info.title;</h2>
|
||||
<p>&info_bugs.label;</p>
|
||||
<p>&info_standalone.label;</p>
|
||||
</div>
|
||||
|
||||
</body>
|
||||
|
|
|
|||
|
|
@ -54,7 +54,4 @@ client, supporting advanced junk mail detection and other useful features.">
|
|||
<!ENTITY info_bugs.label
|
||||
'<a href="http://www.mozilla.org/mailnews/">We</a> welcome bug reports and feature
|
||||
requests, but please read the <a href="&releaseURL;">release notes</a> and query
|
||||
<a href="http://bugzilla.mozilla.org/query.cgi">Bugzilla</a> first.'>
|
||||
<!ENTITY info_standalone.label
|
||||
'If you are looking for a stand alone version, see
|
||||
<a href="http://www.mozilla.org/products/thunderbird/">Thunderbird Mail</a>.'>
|
||||
<a href="https://bugzilla.mozilla.org/query.cgi">Bugzilla</a> first.'>
|
||||
|
|
|
|||
|
|
@ -14,4 +14,4 @@ promptTitle=Running Filters
|
|||
promptMsg=You are currently in the process of filtering messages.\nWould you like to continue applying filters?
|
||||
stopButtonLabel=Stop
|
||||
continueButtonLabel=Continue
|
||||
cannotEnableFilter=This filter was probably created by future version of mozilla/netscape. You cannot enable this filter because we don't know how to apply it.
|
||||
cannotEnableFilter=This filter was probably created by a future version of this software. You cannot enable this filter because we don't know how to apply it.
|
||||
|
|
|
|||
|
|
@ -68,6 +68,10 @@ ifdef GRE_BUILD
|
|||
DEFINES += -DXPCOM_GLUE -DMOZILLA_STRICT_API
|
||||
endif
|
||||
|
||||
DEFINES += -DMOZ_APP_NAME=\"$(MOZ_APP_NAME)\"
|
||||
DEFINES += -DMOZ_APP_DISPLAYNAME=\"$(MOZ_APP_DISPLAYNAME)\"
|
||||
DEFINES += -DMOZ_APP_VERSION=\"$(MOZ_APP_VERSION)\"
|
||||
|
||||
MODULE = apprunner
|
||||
REQUIRES = xpcom \
|
||||
string \
|
||||
|
|
@ -103,9 +107,9 @@ endif
|
|||
include $(topsrcdir)/config/config.mk
|
||||
|
||||
ifeq ($(USE_SHORT_LIBNAME),1)
|
||||
PROGRAM = mozilla$(BIN_SUFFIX)
|
||||
PROGRAM = $(MOZ_APP_NAME)$(BIN_SUFFIX)
|
||||
else
|
||||
PROGRAM = mozilla-bin$(BIN_SUFFIX)
|
||||
PROGRAM = $(MOZ_APP_NAME)-bin$(BIN_SUFFIX)
|
||||
endif
|
||||
|
||||
# Force applications to be built non-statically
|
||||
|
|
@ -385,7 +389,9 @@ LOCAL_INCLUDES = -I$(srcdir) -I.
|
|||
ifneq (,$(filter-out OS2 WINNT,$(OS_ARCH)))
|
||||
$(MOZ_APP_NAME).1: mozilla.man.in Makefile.in Makefile $(DEPTH)/config/autoconf.mk
|
||||
@sed -e "s|\@bindir\@|${bindir}|" -e "s|\@libdir\@|${libdir}|" \
|
||||
-e "s|\@mozilla_version\@|${MOZ_APP_VERSION}|" < $< > $@
|
||||
-e "s|\@MOZ_APP_DISPLAYNAME\@|$(MOZ_APP_DISPLAYNAME)|" \
|
||||
-e "s|\@MOZ_APP_NAME\@|$(MOZ_APP_NAME)|" \
|
||||
-e "s|\@MOZ_APP_VERSION\@|${MOZ_APP_VERSION}|" < $< > $@
|
||||
|
||||
libs:: $(MOZ_APP_NAME).1
|
||||
$(INSTALL) $< $(DIST)/man/man1
|
||||
|
|
@ -393,12 +399,13 @@ libs:: $(MOZ_APP_NAME).1
|
|||
install:: $(MOZ_APP_NAME).1
|
||||
$(SYSINSTALL) $(IFLAGS1) $< $(DESTDIR)$(mandir)/man1
|
||||
|
||||
MOZILLA_SCRIPT=mozilla
|
||||
MOZILLA_SCRIPT=$(MOZ_APP_NAME)
|
||||
|
||||
$(MOZILLA_SCRIPT):: mozilla.in Makefile.in Makefile $(DEPTH)/config/autoconf.mk
|
||||
cat $< | sed -e "s|%MOZAPPDIR%|$(mozappdir)|" \
|
||||
-e "s|%MOZ_USER_DIR%|.mozilla|" \
|
||||
-e "s|%MREDIR%|$(mredir)|" \
|
||||
-e "s|%MOZ_APP_DISPLAYNAME%|$(MOZ_APP_DISPLAYNAME)|" \
|
||||
-e "s|%MOZILLA-BIN%|$(PROGRAM)|g" > $@
|
||||
chmod +x $@
|
||||
|
||||
|
|
@ -453,15 +460,15 @@ ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
|
|||
INCLUDES += -I$(srcdir)/../appshell/src -I$(srcdir)/appleevents
|
||||
|
||||
ifdef MOZ_DEBUG
|
||||
APP_NAME = MozillaDebug
|
||||
APP_NAME = $(MOZ_APP_DISPLAYNAME)Debug
|
||||
else
|
||||
APP_NAME = Mozilla
|
||||
APP_NAME = $(MOZ_APP_DISPLAYNAME)
|
||||
endif
|
||||
|
||||
libs:: $(PROGRAM)
|
||||
mkdir -p $(DIST)/$(APP_NAME).app/Contents/MacOS
|
||||
rsync -a --exclude CVS --exclude "*.in" $(srcdir)/macbuild/Contents $(DIST)/$(APP_NAME).app
|
||||
sed -e "s/MOZILLA_VERSION/$(MOZILLA_VERSION)/" $(srcdir)/macbuild/Contents/Info.plist.in > $(DIST)/$(APP_NAME).app/Contents/Info.plist
|
||||
sed -e "s/MOZ_APP_NAME/$(MOZ_APP_NAME)/" -e "s/MOZ_APP_DISPLAYNAME/$(MOZ_APP_DISPLAYNAME)/" -e "s/MOZ_APP_VERSION/$(MOZ_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
|
||||
|
|
|
|||
|
|
@ -46,8 +46,8 @@ MODULE = apprunner
|
|||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
# Only install the init.d/ files when we use the "mozilla" shell script
|
||||
# to start mozilla
|
||||
# Only install the init.d/ files when we use the application shell script
|
||||
# to start the application
|
||||
ifneq (,$(filter-out OS2 WINNT,$(OS_ARCH)))
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -5,15 +5,15 @@
|
|||
<key>CFBundleInfoDictionaryVersion</key>
|
||||
<string>6.0</string>
|
||||
<key>CFBundleExecutable</key>
|
||||
<string>mozilla-bin</string>
|
||||
<string>MOZ_APP_NAME-bin</string>
|
||||
<key>CFBundleIdentifier</key>
|
||||
<string>org.mozilla.mozilla</string>
|
||||
<string>org.mozilla.MOZ_APP_NAME</string>
|
||||
<key>CFBundleVersion</key>
|
||||
<string>MOZILLA_VERSION</string>
|
||||
<string>MOZ_APP_VERSION</string>
|
||||
<key>CFBundleDevelopmentRegion</key>
|
||||
<string>English</string>
|
||||
<key>CFBundleName</key>
|
||||
<string>Mozilla</string>
|
||||
<string>MOZ_APP_DISPLAYNAME</string>
|
||||
<key>CFBundlePackageType</key>
|
||||
<string>APPL</string>
|
||||
<key>CFBundleSignature</key>
|
||||
|
|
@ -21,9 +21,9 @@
|
|||
<key>CFBundleIconFile</key>
|
||||
<string>mozilla.icns</string>
|
||||
<key>CFBundleShortVersionString</key>
|
||||
<string>MOZILLA_VERSION</string>
|
||||
<string>MOZ_APP_VERSION</string>
|
||||
<key>CFBundleGetInfoString</key>
|
||||
<string>Mozilla MOZILLA_VERSION, © 1998-2005 The Mozilla Organization</string>
|
||||
<string>MOZ_APP_DISPLAYNAME MOZ_APP_VERSION, © 1998-2005 The Mozilla Organization</string>
|
||||
<key>NSAppleScriptEnabled</key>
|
||||
<true/>
|
||||
<key>CFBundleDocumentTypes</key>
|
||||
|
|
@ -57,7 +57,7 @@
|
|||
|
||||
<dict>
|
||||
<key>CFBundleTypeName</key>
|
||||
<string>Mozilla Preferences File</string>
|
||||
<string>MOZ_APP_DISPLAYNAME Preferences File</string>
|
||||
<key>CFBundleTypeRole</key>
|
||||
<string>None</string>
|
||||
<key>CFBundleTypeOSTypes</key>
|
||||
|
|
@ -70,7 +70,7 @@
|
|||
|
||||
<dict>
|
||||
<key>CFBundleTypeName</key>
|
||||
<string>Mozilla Plugin</string>
|
||||
<string>MOZ_APP_DISPLAYNAME Plugin</string>
|
||||
<key>CFBundleTypeRole</key>
|
||||
<string>None</string>
|
||||
<key>CFBundleTypeOSTypes</key>
|
||||
|
|
@ -89,7 +89,7 @@
|
|||
|
||||
<dict>
|
||||
<key>CFBundleTypeName</key>
|
||||
<string>Mozilla Command Line File</string>
|
||||
<string>MOZ_APP_DISPLAYNAME Command Line File</string>
|
||||
<key>CFBundleTypeRole</key>
|
||||
<string>Viewer</string>
|
||||
<key>CFBundleTypeOSTypes</key>
|
||||
|
|
@ -102,7 +102,7 @@
|
|||
|
||||
<dict>
|
||||
<key>CFBundleTypeName</key>
|
||||
<string>Mozilla Shared Library</string>
|
||||
<string>MOZ_APP_DISPLAYNAME Shared Library</string>
|
||||
<key>CFBundleTypeRole</key>
|
||||
<string>None</string>
|
||||
<key>CFBundleTypeOSTypes</key>
|
||||
|
|
@ -120,7 +120,7 @@
|
|||
|
||||
<dict>
|
||||
<key>CFBundleTypeName</key>
|
||||
<string>Mozilla Binary File</string>
|
||||
<string>MOZ_APP_DISPLAYNAME Binary File</string>
|
||||
<key>CFBundleTypeRole</key>
|
||||
<string>None</string>
|
||||
<key>CFBundleTypeOSTypes</key>
|
||||
|
|
@ -161,7 +161,7 @@
|
|||
<string>html.icns</string>
|
||||
</dict>
|
||||
|
||||
<!--Image Icon img.icns does not yet exist, but associating Images with Mozilla here-->
|
||||
<!--Image Icon image.icns does not yet exist, but associating Images with the application here-->
|
||||
|
||||
<dict>
|
||||
<key>CFBundleTypeName</key>
|
||||
|
|
|
|||
|
|
@ -36,17 +36,17 @@
|
|||
#
|
||||
# ***** END LICENSE BLOCK *****
|
||||
|
||||
## $Id: mozilla.in,v 1.7 2004/04/17 16:51:11 gerv%gerv.net Exp $
|
||||
## $Id: mozilla.in,v 1.8 2005/03/29 22:02:22 kairo%kairo.at Exp $
|
||||
##
|
||||
## Usage:
|
||||
##
|
||||
## $ mozilla [args]
|
||||
##
|
||||
## This script is meant to run the mozilla-bin binary from either
|
||||
## This script is meant to run the application binary from either
|
||||
## mozilla/xpfe/bootstrap or mozilla/dist/bin.
|
||||
##
|
||||
## The script will setup all the environment voodoo needed to make
|
||||
## the mozilla-bin binary to work.
|
||||
## the application binary to work.
|
||||
##
|
||||
|
||||
moz_pis_startstop_scripts()
|
||||
|
|
@ -133,7 +133,7 @@ else
|
|||
if [ -x "$moz_libdir/run-mozilla.sh" ]; then
|
||||
dist_bin=$moz_libdir
|
||||
else
|
||||
echo "Cannot find mozilla runtime directory. Exiting."
|
||||
echo "Cannot find %MOZ_APP_DISPLAYNAME% runtime directory. Exiting."
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
|
|
|
|||
|
|
@ -1,24 +1,24 @@
|
|||
.TH MOZILLA 1 "August 07, 2001" mozilla "Linux User's Manual"
|
||||
.TH @MOZ_APP_NAME@ 1 "March 28, 2005" @MOZ_APP_NAME@ "Linux User's Manual"
|
||||
.SH NAME
|
||||
mozilla \- a Web browser for X11 derived from Netscape Communicator
|
||||
@MOZ_APP_NAME@ \- an internet application suite (browser, mail, etc.)
|
||||
|
||||
.SH SYNOPSIS
|
||||
.B mozilla
|
||||
.B @MOZ_APP_NAME@
|
||||
[\fIOPTIONS\fR] [\fIURL\fR]
|
||||
|
||||
.B mozilla-bin
|
||||
.B @MOZ_APP_NAME@-bin
|
||||
[\fIOPTIONS\fR] [\fIURL\fR]
|
||||
|
||||
.SH DESCRIPTION
|
||||
\fBMozilla\fR is an open-source web browser, designed for standards compliance,
|
||||
\fB@MOZ_APP_DISPLAYNAME@\fR is an open-source web browser, designed for standards compliance,
|
||||
performance and portability.
|
||||
|
||||
.SH USAGE
|
||||
\fBmozilla\fR is a simple shell script that will set up the environment for
|
||||
the actual executable, \fBmozilla-bin\fR.
|
||||
\fB@MOZ_APP_NAME@\fR is a simple shell script that will set up the environment for
|
||||
the actual executable, \fB@MOZ_APP_NAME@-bin\fR.
|
||||
|
||||
.SH OPTIONS
|
||||
A summary of the options supported by \fBmozilla\fR is included below.
|
||||
A summary of the options supported by \fB@MOZ_APP_NAME@\fR is included below.
|
||||
|
||||
.SS "GTK options"
|
||||
\fB\-\-gdk-debug=\fR\fIFLAGS\fR
|
||||
|
|
@ -54,7 +54,7 @@ Don't use X shared memory extension
|
|||
.B \-\-g-fatal-warnings
|
||||
Make all warnings fatal
|
||||
|
||||
.SS "Mozilla options"
|
||||
.SS "@MOZ_APP_DISPLAYNAME@ options"
|
||||
.TP
|
||||
\fB\-height\fR \fIvalue\fR
|
||||
Set height of startup window to \fIvalue\fR.
|
||||
|
|
@ -69,7 +69,7 @@ Start with 4.x migration window.
|
|||
Set width of startup window to \fIvalue\fR.
|
||||
.TP
|
||||
.B \-v, \-version
|
||||
Print \fB/usr/bin/mozilla-bin\fR version.
|
||||
Print \fB@libdir@/@MOZ_APP_NAME@/@MOZ_APP_NAME@-bin\fR version.
|
||||
.TP
|
||||
\fB\-CreateProfile\fR \fIprofile\fR
|
||||
Create \fIprofile\fR.
|
||||
|
|
@ -90,7 +90,7 @@ Start with profile selection dialog.
|
|||
Start with \fIlang-region\fR resources.
|
||||
.TP
|
||||
\fB\-remote\fR \fIcommand\fR
|
||||
Execute \fIcommand\fR in an already running Mozilla process. For more info,
|
||||
Execute \fIcommand\fR in an already running @MOZ_APP_DISPLAYNAME@ process. For more info,
|
||||
see: \fIhttp://www.mozilla.org/unix/remote.html\fR
|
||||
.TP
|
||||
.B \-splash
|
||||
|
|
@ -115,18 +115,18 @@ Load the specified chrome.
|
|||
Start with mail.
|
||||
.TP
|
||||
\fB\-compose\fR \fIurl\fR
|
||||
Start with messenger compose.
|
||||
Start with mail compose.
|
||||
|
||||
.SH FILES
|
||||
\fI@bindir@/mozilla\fR - shell script wrapping \fBmozilla\fR
|
||||
\fI@bindir@/@MOZ_APP_NAME@\fR - shell script wrapping \fB@MOZ_APP_NAME@\fR
|
||||
.br
|
||||
\fI@libdir@/mozilla/mozilla-bin\fR - \fBmozilla\fR executable
|
||||
\fI@libdir@/@MOZ_APP_NAME@/@MOZ_APP_NAME@-bin\fR - \fB@MOZ_APP_NAME@\fR executable
|
||||
|
||||
.SH VERSION
|
||||
@mozilla_version@
|
||||
@MOZ_APP_VERSION@
|
||||
|
||||
.SH BUGS
|
||||
To report a bug, please visit \fIhttp://bugzilla.mozilla.org/\fR
|
||||
To report a bug, please visit \fIhttps://bugzilla.mozilla.org/\fR
|
||||
|
||||
.SH "SEE ALSO"
|
||||
.BR galeon(1)
|
||||
|
|
|
|||
|
|
@ -151,8 +151,6 @@ extern "C" void ShowOSAlert(const char* aMessage);
|
|||
#include "jprof.h"
|
||||
#endif
|
||||
|
||||
#define MOZ_APP_NAME "mozilla"
|
||||
|
||||
// on x86 linux, the current builds of some popular plugins (notably
|
||||
// flashplayer and real) expect a few builtin symbols from libgcc
|
||||
// which were available in some older versions of gcc. However,
|
||||
|
|
@ -1383,7 +1381,7 @@ static void DumpHelp(char *appname)
|
|||
#ifdef XP_UNIX
|
||||
printf("%s--g-fatal-warnings%sMake all warnings fatal\n", HELP_SPACER_1, HELP_SPACER_2);
|
||||
|
||||
printf("\nMozilla options\n");
|
||||
printf("\n%s options\n", MOZ_APP_DISPLAYNAME);
|
||||
#endif
|
||||
|
||||
printf("%s-height <value>%sSet height of startup window to <value>.\n",HELP_SPACER_1,HELP_SPACER_2);
|
||||
|
|
@ -1399,13 +1397,13 @@ static void DumpHelp(char *appname)
|
|||
printf("%s-UILocale <locale>%sStart with <locale> resources as UI Locale.\n",HELP_SPACER_1,HELP_SPACER_2);
|
||||
printf("%s-contentLocale <locale>%sStart with <locale> resources as content Locale.\n",HELP_SPACER_1,HELP_SPACER_2);
|
||||
#if defined(XP_WIN32) || defined(XP_OS2)
|
||||
printf("%s-console%sStart Mozilla with a debugging console.\n",HELP_SPACER_1,HELP_SPACER_2);
|
||||
printf("%s-console%sStart %s with a debugging console.\n",HELP_SPACER_1,HELP_SPACER_2,MOZ_APP_DISPLAYNAME);
|
||||
#endif
|
||||
#ifdef MOZ_ENABLE_XREMOTE
|
||||
printf("%s-remote <command>%sExecute <command> in an already running\n"
|
||||
"%sMozilla process. For more info, see:\n"
|
||||
"%s%s process. For more info, see:\n"
|
||||
"\n%shttp://www.mozilla.org/unix/remote.html\n\n",
|
||||
HELP_SPACER_1,HELP_SPACER_1,HELP_SPACER_4,HELP_SPACER_2);
|
||||
HELP_SPACER_1,HELP_SPACER_1,HELP_SPACER_4,MOZ_APP_DISPLAYNAME,HELP_SPACER_2);
|
||||
printf("%s-splash%sEnable splash screen.\n",HELP_SPACER_1,HELP_SPACER_2);
|
||||
#else
|
||||
printf("%s-nosplash%sDisable splash screen.\n",HELP_SPACER_1,HELP_SPACER_2);
|
||||
|
|
@ -1426,7 +1424,7 @@ static nsresult DumpVersion(char *appname)
|
|||
nsresult rv = NS_OK;
|
||||
long buildID = NS_BUILD_ID; // 10-digit number
|
||||
|
||||
printf("Mozilla %s, Copyright (c) 2003-2004 mozilla.org", MOZILLA_VERSION);
|
||||
printf("%s %s, Copyright (c) 2003-2005 mozilla.org", MOZ_APP_DISPLAYNAME, MOZ_APP_VERSION);
|
||||
|
||||
if(buildID) {
|
||||
printf(", build %u\n", (unsigned int)buildID);
|
||||
|
|
|
|||
|
|
@ -48,6 +48,8 @@ CHROME_DEPS = build.dtd buildconfig.html
|
|||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
DEFINES += -DMOZ_APP_VERSION=$(MOZ_APP_VERSION)
|
||||
|
||||
ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
|
||||
CHROME_PLATFORM = mac
|
||||
else
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
|
||||
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd" [
|
||||
<!ENTITY % versionDTD SYSTEM "chrome://global/content/version.dtd" >
|
||||
<!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd" >
|
||||
<!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" >
|
||||
<!ENTITY % regionDTD SYSTEM "chrome://global-region/locale/region.dtd" >
|
||||
%versionDTD;
|
||||
%brandDTD;
|
||||
|
|
|
|||
|
|
@ -34,4 +34,4 @@
|
|||
-
|
||||
- ***** END LICENSE BLOCK ***** -->
|
||||
|
||||
#expand <!ENTITY version "__MOZILLA_VERSION__">
|
||||
#expand <!ENTITY version "__MOZ_APP_VERSION__">
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче