зеркало из https://github.com/mozilla/gecko-dev.git
bug 169498 - combine i18n libraries into one. sr=bryner, r=ftang
This commit is contained in:
Родитель
06d88fad49
Коммит
31f48ac541
|
@ -1749,17 +1749,12 @@ sub BuildInternationalProjects()
|
|||
|
||||
StartBuildModule("intl");
|
||||
|
||||
BuildOneProject(":mozilla:intl:chardet:macbuild:chardet.xml", "chardet$D.$S", 1, $main::ALIAS_SYM_FILES, 1);
|
||||
BuildOneProject(":mozilla:intl:macbuild:i18n.xml", "i18n$D.$S", 1, $main::ALIAS_SYM_FILES, 1);
|
||||
BuildOneProject(":mozilla:intl:uconv:macbuild:uconv.xml", "uconv$D.$S", 1, $main::ALIAS_SYM_FILES, 1);
|
||||
if ($main::options{mathml})
|
||||
{
|
||||
BuildOneProject(":mozilla:intl:uconv:macbuild:ucvmath.xml", "ucvmath$D.$S", 1, $main::ALIAS_SYM_FILES, 1);
|
||||
}
|
||||
BuildOneProject(":mozilla:intl:unicharutil:macbuild:unicharutil.xml", "unicharutil$D.$S", 1, $main::ALIAS_SYM_FILES, 1);
|
||||
BuildOneProject(":mozilla:intl:locale:macbuild:locale.xml", "nslocale$D.$S", 1, $main::ALIAS_SYM_FILES, 1);
|
||||
BuildOneProject(":mozilla:intl:lwbrk:macbuild:lwbrk.xml", "lwbrk$D.$S", 1, $main::ALIAS_SYM_FILES, 1);
|
||||
BuildOneProject(":mozilla:intl:strres:macbuild:strres.xml", "strres$D.$S", 1, $main::ALIAS_SYM_FILES, 1);
|
||||
|
||||
EndBuildModule("intl");
|
||||
} # intl
|
||||
|
||||
|
|
|
@ -26,7 +26,7 @@ VPATH = @srcdir@
|
|||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
DIRS = unicharutil uconv locale strres lwbrk chardet
|
||||
DIRS = unicharutil uconv locale strres lwbrk chardet build
|
||||
|
||||
# Sun's Complex Text Layout support
|
||||
ifdef SUNCTL
|
||||
|
|
|
@ -27,10 +27,10 @@ VPATH = @srcdir@
|
|||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
MODULE = chardet
|
||||
LIBRARY_NAME = chardet
|
||||
LIBRARY_NAME = chardet_s
|
||||
EXPORT_LIBRARY = 1
|
||||
IS_COMPONENT = 1
|
||||
MODULE_NAME = nsCharDetModule
|
||||
FORCE_STATIC_LIB = 1
|
||||
|
||||
REQUIRES = xpcom \
|
||||
string \
|
||||
uconv \
|
||||
|
@ -45,7 +45,6 @@ REQUIRES = xpcom \
|
|||
$(NULL)
|
||||
|
||||
CPPSRCS = \
|
||||
nsCharDetModule.cpp \
|
||||
nsObserverBase.cpp \
|
||||
nsXMLEncodingObserver.cpp \
|
||||
nsMetaCharsetObserver.cpp \
|
||||
|
@ -56,8 +55,6 @@ CPPSRCS = \
|
|||
nsDocumentCharsetInfo.cpp \
|
||||
$(NULL)
|
||||
|
||||
EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS) $(MOZ_UNICHARUTIL_LIBS)
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
ifeq ($(OS_ARCH),WINNT)
|
||||
|
|
|
@ -43,10 +43,10 @@ VPATH = @srcdir@
|
|||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
MODULE = locale
|
||||
LIBRARY_NAME = nslocale
|
||||
LIBRARY_NAME = platlocale_s
|
||||
EXPORT_LIBRARY = 1
|
||||
IS_COMPONENT = 1
|
||||
MODULE_NAME = nsLocaleModule
|
||||
FORCE_STATIC_LIB = 1
|
||||
|
||||
REQUIRES = xpcom \
|
||||
string \
|
||||
unicharutil \
|
||||
|
@ -55,22 +55,13 @@ REQUIRES = xpcom \
|
|||
intl \
|
||||
$(NULL)
|
||||
|
||||
SHARED_LIBRARY_LIBS = ../libnslocale_s.a
|
||||
|
||||
CPPSRCS = \
|
||||
nsCollationMac.cpp \
|
||||
nsCollationMacUC.cpp \
|
||||
nsDateTimeFormatMac.cpp \
|
||||
nsLocaleSHLIB.cpp \
|
||||
nsMacLocale.cpp \
|
||||
$(NULL)
|
||||
|
||||
EXTRA_DSO_LDOPTS += \
|
||||
$(MOZ_COMPONENT_LIBS) \
|
||||
$(MOZ_UNICHARUTIL_LIBS) \
|
||||
$(TK_LIBS) \
|
||||
$(NULL)
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
INCLUDES += -I$(srcdir)/..
|
||||
|
|
|
@ -26,8 +26,8 @@ include $(DEPTH)/config/autoconf.mk
|
|||
MODULE = locale
|
||||
LIBRARY_NAME = nslocale
|
||||
EXPORT_LIBRARY = 1
|
||||
IS_COMPONENT = 1
|
||||
MODULE_NAME = nsLocaleModule
|
||||
FORCE_STATIC_LIB = 1
|
||||
|
||||
REQUIRES = xpcom \
|
||||
string \
|
||||
unicharutil \
|
||||
|
@ -36,19 +36,12 @@ REQUIRES = xpcom \
|
|||
intl \
|
||||
$(NULL)
|
||||
|
||||
SHARED_LIBRARY_LIBS = ../$(LIB_PREFIX)nslocale_s.$(LIB_SUFFIX)
|
||||
|
||||
CPPSRCS = \
|
||||
nsOS2Locale.cpp \
|
||||
nsCollationOS2.cpp \
|
||||
nsDateTimeFormatOS2.cpp \
|
||||
nsLocaleModule.cpp \
|
||||
$(NULL)
|
||||
|
||||
EXTRA_DSO_LDOPTS += \
|
||||
$(MOZ_UNICHARUTIL_LIBS) \
|
||||
$(MOZ_COMPONENT_LIBS) \
|
||||
$(NULL)
|
||||
|
||||
ifeq ($(MOZ_OS2_TOOLS),VACPP)
|
||||
OS_LIBS += libuls.lib
|
||||
|
|
|
@ -27,10 +27,10 @@ VPATH = @srcdir@
|
|||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
MODULE = locale
|
||||
LIBRARY_NAME = nslocale
|
||||
LIBRARY_NAME = platlocale_s
|
||||
EXPORT_LIBRARY = 1
|
||||
IS_COMPONENT = 1
|
||||
MODULE_NAME = nsLocaleModule
|
||||
FORCE_STATIC_LIB= 1
|
||||
|
||||
REQUIRES = xpcom \
|
||||
string \
|
||||
unicharutil \
|
||||
|
@ -39,20 +39,12 @@ REQUIRES = xpcom \
|
|||
intl \
|
||||
$(NULL)
|
||||
|
||||
SHARED_LIBRARY_LIBS = ../libnslocale_s.a
|
||||
|
||||
CPPSRCS = \
|
||||
nsCollationUnix.cpp \
|
||||
nsDateTimeFormatUnix.cpp \
|
||||
nsLocaleModule.cpp \
|
||||
nsPosixLocale.cpp \
|
||||
$(NULL)
|
||||
|
||||
EXTRA_DSO_LDOPTS += \
|
||||
$(MOZ_COMPONENT_LIBS) \
|
||||
$(MOZ_UNICHARUTIL_LIBS) \
|
||||
$(NULL)
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
INCLUDES += -I$(srcdir)/..
|
||||
|
|
|
@ -27,10 +27,10 @@ VPATH = @srcdir@
|
|||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
MODULE = locale
|
||||
LIBRARY_NAME = nslocale
|
||||
LIBRARY_NAME = platlocale_s
|
||||
EXPORT_LIBRARY = 1
|
||||
IS_COMPONENT = 1
|
||||
MODULE_NAME = nsLocaleModule
|
||||
FORCE_STATIC_LIB = 1
|
||||
|
||||
REQUIRES = xpcom \
|
||||
string \
|
||||
unicharutil \
|
||||
|
@ -38,20 +38,12 @@ REQUIRES = xpcom \
|
|||
intl \
|
||||
$(NULL)
|
||||
|
||||
SHARED_LIBRARY_LIBS = ../$(LIB_PREFIX)nslocale_s.$(LIB_SUFFIX)
|
||||
|
||||
CPPSRCS = \
|
||||
nsCollationWin.cpp \
|
||||
nsDateTimeFormatWin.cpp \
|
||||
nsLocaleDLL.cpp \
|
||||
nsIWin32LocaleImpl.cpp \
|
||||
$(NULL)
|
||||
|
||||
EXTRA_DSO_LDOPTS += \
|
||||
$(MOZ_UNICHARUTIL_LIBS) \
|
||||
$(MOZ_COMPONENT_LIBS) \
|
||||
$(NULL)
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
INCLUDES += -I$(srcdir)/..
|
||||
|
|
|
@ -27,10 +27,9 @@ VPATH = @srcdir@
|
|||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
MODULE = lwbrk
|
||||
LIBRARY_NAME = lwbrk
|
||||
LIBRARY_NAME = lwbrk_s
|
||||
EXPORT_LIBRARY = 1
|
||||
IS_COMPONENT = 1
|
||||
MODULE_NAME = nsLWBrkModule
|
||||
FORCE_STATIC_LIB = 1
|
||||
|
||||
REQUIRES = xpcom \
|
||||
string \
|
||||
|
@ -42,14 +41,11 @@ CSRCS = rulebrk.c
|
|||
CPPSRCS = \
|
||||
nsJISx4501LineBreaker.cpp \
|
||||
nsLWBreakerFImp.cpp \
|
||||
nsLWBrkModule.cpp \
|
||||
nsSampleWordBreaker.cpp \
|
||||
$(NULL)
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS)
|
||||
|
||||
# Reserved name __STDC__ cannot be defined as a macro name on AIX or OpenVMS.
|
||||
# QNX simply objects to the way it's being redefined.
|
||||
ifeq (,$(filter AIX OpenVMS QNX HP-UX,$(OS_ARCH)))
|
||||
|
|
|
@ -27,10 +27,10 @@ VPATH = @srcdir@
|
|||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
MODULE = intl
|
||||
LIBRARY_NAME = strres
|
||||
LIBRARY_NAME = strres_s
|
||||
EXPORT_LIBRARY = 1
|
||||
IS_COMPONENT = 1
|
||||
MODULE_NAME = nsStringBundleModule
|
||||
FORCE_STATIC_LIB = 1
|
||||
|
||||
REQUIRES = xpcom \
|
||||
string \
|
||||
necko \
|
||||
|
@ -38,9 +38,5 @@ REQUIRES = xpcom \
|
|||
|
||||
CPPSRCS = nsStringBundle.cpp
|
||||
|
||||
EXTRA_DSO_LDOPTS =\
|
||||
$(MOZ_NECKO_UTIL_LIBS) \
|
||||
$(MOZ_COMPONENT_LIBS) \
|
||||
$(NULL)
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
|
|
@ -36,11 +36,11 @@
|
|||
*
|
||||
* ***** END LICENSE BLOCK ***** */
|
||||
|
||||
#include "nsStringBundle.h"
|
||||
#include "nsID.h"
|
||||
#include "nsFileSpec.h"
|
||||
#include "nsString.h"
|
||||
#include "nsReadableUtils.h"
|
||||
#include "nsIPersistentProperties2.h"
|
||||
#include "nsIStringBundle.h"
|
||||
#include "nsXPCOM.h"
|
||||
#include "nsISupportsPrimitives.h"
|
||||
|
@ -52,18 +52,11 @@
|
|||
#include "nsIComponentManager.h"
|
||||
#include "nsIGenericFactory.h"
|
||||
#include "nsIMemory.h"
|
||||
#include "nsIObserver.h"
|
||||
#include "nsIObserverService.h"
|
||||
#include "nsWeakReference.h"
|
||||
#include "nsCOMPtr.h"
|
||||
#include "pratom.h"
|
||||
#include "prclist.h"
|
||||
#include "plarena.h"
|
||||
#include "prlog.h" // for PR_ASSERT
|
||||
#include "prmem.h"
|
||||
#include "nsIModule.h"
|
||||
#include "nsISupportsArray.h"
|
||||
#include "nsHashtable.h"
|
||||
#include "nsAutoLock.h"
|
||||
#include "nsTextFormatter.h"
|
||||
#include "nsIErrorService.h"
|
||||
|
@ -615,40 +608,6 @@ struct bundleCacheEntry_t {
|
|||
nsIStringBundle* mBundle;
|
||||
};
|
||||
|
||||
class nsStringBundleService : public nsIStringBundleService,
|
||||
public nsIObserver,
|
||||
public nsSupportsWeakReference
|
||||
{
|
||||
public:
|
||||
nsStringBundleService();
|
||||
virtual ~nsStringBundleService();
|
||||
|
||||
nsresult Init();
|
||||
|
||||
NS_DECL_ISUPPORTS
|
||||
NS_DECL_NSISTRINGBUNDLESERVICE
|
||||
NS_DECL_NSIOBSERVER
|
||||
|
||||
private:
|
||||
nsresult getStringBundle(const char *aUrl, nsIStringBundle** aResult);
|
||||
nsresult FormatWithBundle(nsIStringBundle* bundle, nsresult aStatus,
|
||||
PRUint32 argCount, PRUnichar** argArray,
|
||||
PRUnichar* *result);
|
||||
|
||||
void flushBundleCache();
|
||||
|
||||
bundleCacheEntry_t *insertIntoCache(nsIStringBundle *aBundle,
|
||||
nsCStringKey *aHashKey);
|
||||
|
||||
static void recycleEntry(bundleCacheEntry_t*);
|
||||
|
||||
nsHashtable mBundleMap;
|
||||
PRCList mBundleCache;
|
||||
PLArenaPool mCacheEntryPool;
|
||||
|
||||
nsCOMPtr<nsIErrorService> mErrorService;
|
||||
|
||||
};
|
||||
|
||||
nsStringBundleService::nsStringBundleService() :
|
||||
mBundleMap(MAX_CACHED_BUNDLES, PR_TRUE)
|
||||
|
@ -981,11 +940,3 @@ done:
|
|||
}
|
||||
|
||||
|
||||
NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsStringBundleService, Init)
|
||||
static const nsModuleComponentInfo components[] =
|
||||
{
|
||||
{ "String Bundle", NS_STRINGBUNDLESERVICE_CID, NS_STRINGBUNDLE_CONTRACTID, nsStringBundleServiceConstructor},
|
||||
};
|
||||
|
||||
NS_IMPL_NSGETMODULE(nsStringBundleModule, components)
|
||||
|
||||
|
|
|
@ -0,0 +1,90 @@
|
|||
/* -*- Mode: C++; tab-width: 2; 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 ***** */
|
||||
|
||||
#ifndef nsStringBundle_h__
|
||||
#define nsStringBundle_h__
|
||||
|
||||
#include "prclist.h"
|
||||
#include "plarena.h"
|
||||
|
||||
#include "nsCOMPtr.h"
|
||||
#include "nsHashtable.h"
|
||||
#include "nsIPersistentProperties2.h"
|
||||
#include "nsIStringBundle.h"
|
||||
#include "nsIObserver.h"
|
||||
#include "nsWeakReference.h"
|
||||
#include "nsIErrorService.h"
|
||||
|
||||
struct bundleCacheEntry_t;
|
||||
|
||||
class nsStringBundleService : public nsIStringBundleService,
|
||||
public nsIObserver,
|
||||
public nsSupportsWeakReference
|
||||
{
|
||||
public:
|
||||
nsStringBundleService();
|
||||
virtual ~nsStringBundleService();
|
||||
|
||||
nsresult Init();
|
||||
|
||||
NS_DECL_ISUPPORTS
|
||||
NS_DECL_NSISTRINGBUNDLESERVICE
|
||||
NS_DECL_NSIOBSERVER
|
||||
|
||||
private:
|
||||
nsresult getStringBundle(const char *aUrl, nsIStringBundle** aResult);
|
||||
nsresult FormatWithBundle(nsIStringBundle* bundle, nsresult aStatus,
|
||||
PRUint32 argCount, PRUnichar** argArray,
|
||||
PRUnichar* *result);
|
||||
|
||||
void flushBundleCache();
|
||||
|
||||
bundleCacheEntry_t *insertIntoCache(nsIStringBundle *aBundle,
|
||||
nsCStringKey *aHashKey);
|
||||
|
||||
static void recycleEntry(bundleCacheEntry_t*);
|
||||
|
||||
nsHashtable mBundleMap;
|
||||
PRCList mBundleCache;
|
||||
PLArenaPool mCacheEntryPool;
|
||||
|
||||
nsCOMPtr<nsIErrorService> mErrorService;
|
||||
|
||||
};
|
||||
|
||||
#endif
|
|
@ -27,11 +27,10 @@ VPATH = @srcdir@
|
|||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
MODULE = unicharutil
|
||||
LIBRARY_NAME = unicharutil
|
||||
LIBRARY_NAME = ucharucomp_s
|
||||
EXPORT_LIBRARY = 1
|
||||
SHORT_LIBNAME = ucharuti
|
||||
IS_COMPONENT = 1
|
||||
MODULE_NAME = UcharUtil
|
||||
FORCE_STATIC_LIB = 1
|
||||
|
||||
REQUIRES = xpcom \
|
||||
string \
|
||||
uconv \
|
||||
|
@ -40,18 +39,12 @@ REQUIRES = xpcom \
|
|||
|
||||
CPPSRCS = \
|
||||
nsCaseConversionImp2.cpp \
|
||||
nsUcharUtilModule.cpp \
|
||||
nsCategoryImp.cpp \
|
||||
nsHankakuToZenkaku.cpp \
|
||||
nsEntityConverter.cpp \
|
||||
nsSaveAsCharset.cpp \
|
||||
$(NULL)
|
||||
|
||||
EXTRA_DSO_LDOPTS =\
|
||||
$(MOZ_NECKO_UTIL_LIBS) \
|
||||
$(MOZ_COMPONENT_LIBS) \
|
||||
$(NULL)
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
ifeq ($(OS_ARCH),WINNT)
|
||||
|
|
|
@ -20,6 +20,11 @@ function upgradeCleanup()
|
|||
deleteThisFile("Components", "pngdecoder2.shlb");
|
||||
deleteThisFile("Components", "bmpdecoder2.shlb");
|
||||
deleteThisFile("Components", "xbmdecoder2.shlb");
|
||||
deleteThisFile("Components", "unicharutil.shlb");
|
||||
deleteThisFile("Components", "chardet.shlb");
|
||||
deleteThisFile("Components", "lwbrk.shlb");
|
||||
deleteThisFile("Components", "nslocale.shlb");
|
||||
deleteThisFile("Components", "strres.shlb");
|
||||
deleteThisFile("Components", "mozBrowser.shlb");
|
||||
deleteThisFile("Components", "Cache.shlb");
|
||||
deleteThisFile("Program", "defaults/pref/config.js");
|
||||
|
|
|
@ -12,6 +12,11 @@ function upgradeCleanup()
|
|||
deleteThisFile("Components", "txtsvc.dll");
|
||||
deleteThisFile("Components", "gfx2.dll");
|
||||
deleteThisFile("Components", "gfx2.xpt");
|
||||
deleteThisFile("Components", "ucharuti.dll");
|
||||
deleteThisFile("Components", "chardet.dll");
|
||||
deleteThisFile("Components", "lwbrk.dll");
|
||||
deleteThisFile("Components", "nslocale.dll");
|
||||
deleteThisFile("Components", "strres.dll");
|
||||
deleteThisFile("Components", "imggif.dll");
|
||||
deleteThisFile("Components", "imgjpeg.dll");
|
||||
deleteThisFile("Components", "imgpng.dll");
|
||||
|
|
|
@ -35,7 +35,6 @@ viewer:defaults:profile:mimeTypes.rdf
|
|||
[xpcom]
|
||||
viewer:Components:libjar.shlb
|
||||
viewer:Components:xpinstall.shlb
|
||||
viewer:Components:unicharutil.shlb
|
||||
viewer:Essential Files:JavaScript.shlb
|
||||
viewer:Essential Files:libreg.shlb
|
||||
viewer:Essential Files:LiveConnect.shlb
|
||||
|
@ -92,7 +91,6 @@ viewer:Components:appshell.xpt
|
|||
viewer:Components:bookmarks.xpt
|
||||
viewer:Components:Caps.shlb
|
||||
viewer:Components:caps.xpt
|
||||
viewer:Components:chardet.shlb
|
||||
viewer:Components:universalchardet.shlb
|
||||
viewer:Components:ChomeRegistry.shlb
|
||||
viewer:Components:chrome.xpt
|
||||
|
@ -145,12 +143,11 @@ viewer:Components:libpref.xpt
|
|||
viewer:Components:prefextras.shlb
|
||||
viewer:Components:prefextras.xpt
|
||||
viewer:Components:libutil.xpt
|
||||
viewer:Components:lwbrk.shlb
|
||||
viewer:Components:i18n.shlb
|
||||
viewer:Components:Mork.shlb
|
||||
viewer:Components:mozBrowser.xpt
|
||||
viewer:Components:mozcomps.xpt
|
||||
viewer:Components:nsIStringBundle.xpt
|
||||
viewer:Components:nslocale.shlb
|
||||
viewer:Components:nsLocale.xpt
|
||||
viewer:Components:nsSidebar.js
|
||||
viewer:Components:oji.shlb
|
||||
|
@ -174,7 +171,6 @@ viewer:Components:related.xpt
|
|||
viewer:Components:search.xpt
|
||||
viewer:Components:shistory.shlb
|
||||
viewer:Components:shistory.xpt
|
||||
viewer:Components:strres.shlb
|
||||
viewer:Components:tmbm.xpt
|
||||
viewer:Components:txmgr.xpt
|
||||
viewer:Components:uconv.shlb
|
||||
|
|
|
@ -49,7 +49,6 @@ bin/xpistub.dll
|
|||
bin/mozz.dll
|
||||
bin/components/jar50.dll
|
||||
bin/components/xpinstal.dll
|
||||
bin/components/ucharuti.dll
|
||||
|
||||
[browser]
|
||||
; files listed in xpcom (missing in this section) will be installed as part of the browser
|
||||
|
@ -94,7 +93,6 @@ bin/components/urlbarhistory.xpt
|
|||
;bin/components/urlwidgt.xpt
|
||||
bin/components/caps.dll
|
||||
bin/components/caps.xpt
|
||||
bin/components/chardet.dll
|
||||
;bin/components/chardetc.dll
|
||||
;bin/components/universalchardet.dll
|
||||
bin/components/ucdet.dll
|
||||
|
@ -156,7 +154,7 @@ bin/components/layout_base.xpt
|
|||
bin/components/layout_xul.xpt
|
||||
bin/components/layout_xul_tree.xpt
|
||||
bin/components/locale.xpt
|
||||
bin/components/lwbrk.dll
|
||||
bin/components/i18n.dll
|
||||
bin/components/mork.dll
|
||||
bin/components/mozbrwsr.xpt
|
||||
;bin/components/mozcomps.xpt
|
||||
|
@ -182,7 +180,6 @@ bin/components/necko_cookie.xpt
|
|||
bin/components/necko_file.xpt
|
||||
bin/components/necko_socket.xpt
|
||||
bin/components/necko_viewsource.xpt
|
||||
bin/components/nslocale.dll
|
||||
bin/components/nsprefm.dll
|
||||
bin/components/nsSidebar.js
|
||||
bin/components/oji.dll
|
||||
|
@ -201,7 +198,6 @@ bin/components/shistory.dll
|
|||
bin/components/shistory.xpt
|
||||
bin/components/sidebar.xpt
|
||||
bin/components/signonviewer.xpt
|
||||
bin/components/strres.dll
|
||||
bin/components/txmgr.dll
|
||||
bin/components/txmgr.xpt
|
||||
;bin/components/uconv.dll
|
||||
|
|
|
@ -42,7 +42,6 @@ bin/libxpistub.so
|
|||
bin/libmozz.so
|
||||
bin/components/libxpinstall.so
|
||||
bin/components/libjar50.so
|
||||
bin/components/libunicharutil.so
|
||||
|
||||
[browser]
|
||||
bin/mozilla
|
||||
|
@ -105,7 +104,6 @@ bin/components/jar.xpt
|
|||
bin/components/jsconsole-clhandler.js
|
||||
bin/components/libnsappshell.so
|
||||
bin/components/libcaps.so
|
||||
bin/components/libchardet.so
|
||||
bin/components/libchrome.so
|
||||
bin/components/libcookie.so
|
||||
bin/components/libcomposer.so
|
||||
|
@ -118,10 +116,9 @@ bin/components/libgfxxprint.so
|
|||
bin/components/libimglib2.so
|
||||
bin/components/libimgmng.so
|
||||
bin/components/libjsurl.so
|
||||
bin/components/liblwbrk.so
|
||||
bin/components/libi18n.so
|
||||
bin/components/libmork.so
|
||||
bin/components/libmozfind.so
|
||||
bin/components/libnslocale.so
|
||||
bin/components/liboji.so
|
||||
bin/components/libpref.so
|
||||
bin/components/libautoconfig.so
|
||||
|
@ -136,7 +133,6 @@ bin/components/libhtmlpars.so
|
|||
bin/components/libgkview.so
|
||||
bin/components/librdf.so
|
||||
bin/components/libshistory.so
|
||||
bin/components/libstrres.so
|
||||
bin/components/libtxmgr.so
|
||||
bin/components/libuconv.so
|
||||
bin/components/libucvmath.so
|
||||
|
|
|
@ -50,7 +50,6 @@ bin\xpistub.dll
|
|||
bin\zlib.dll
|
||||
bin\components\jar50.dll
|
||||
bin\components\xpinstal.dll
|
||||
bin\components\ucharuti.dll
|
||||
;install\ren8dot3.exe,bin\ren8dot3.exe
|
||||
|
||||
[browser]
|
||||
|
@ -91,7 +90,6 @@ bin\components\urlbarhistory.xpt
|
|||
bin\components\urlwidgt.xpt
|
||||
bin\components\caps.dll
|
||||
bin\components\caps.xpt
|
||||
bin\components\chardet.dll
|
||||
bin\components\chardetc.dll
|
||||
bin\components\universalchardet.dll
|
||||
bin\components\chrome.dll
|
||||
|
@ -148,7 +146,7 @@ bin\components\layout_base.xpt
|
|||
bin\components\layout_xul.xpt
|
||||
bin\components\layout_xul_tree.xpt
|
||||
bin\components\locale.xpt
|
||||
bin\components\lwbrk.dll
|
||||
bin\components\i18n.dll
|
||||
bin\components\mork.dll
|
||||
bin\components\mozbrwsr.xpt
|
||||
bin\components\mozcomps.xpt
|
||||
|
@ -174,7 +172,6 @@ bin\components\necko_cookie.xpt
|
|||
bin\components\necko_file.xpt
|
||||
bin\components\necko_socket.xpt
|
||||
bin\components\necko_viewsource.xpt
|
||||
bin\components\nslocale.dll
|
||||
bin\components\nsprefm.dll
|
||||
bin\components\nsSidebar.js
|
||||
bin\components\oji.dll
|
||||
|
@ -192,7 +189,6 @@ bin\components\shistory.dll
|
|||
bin\components\shistory.xpt
|
||||
bin\components\sidebar.xpt
|
||||
bin\components\signonviewer.xpt
|
||||
bin\components\strres.dll
|
||||
bin\components\txmgr.dll
|
||||
bin\components\txmgr.xpt
|
||||
bin\components\uconv.dll
|
||||
|
|
|
@ -22,6 +22,11 @@ function upgradeCleanup()
|
|||
deleteThisFile("Components", "libimgbmp.so");
|
||||
deleteThisFile("Components", "libimgppm.so");
|
||||
deleteThisFile("Components", "libimgxbm.so");
|
||||
deleteThisFile("Components", "libunicharutil.so");
|
||||
deleteThisFile("Components", "libchardet.so");
|
||||
deleteThisFile("Components", "liblwbrk.so");
|
||||
deleteThisFile("Components", "libnslocale.so");
|
||||
deleteThisFile("Components", "libstrres.so");
|
||||
deleteThisFile("Components", "libmozbrwsr.so");
|
||||
deleteThisFile("Components", "libnkcache.so");
|
||||
deleteThisFile("Program", "defaults/pref/config.js");
|
||||
|
|
|
@ -494,6 +494,11 @@ function upgradeCleanup()
|
|||
deleteThisFile("Components", "imgbmp.dll");
|
||||
deleteThisFile("Components", "imgxbm.dll");
|
||||
deleteThisFile("Components", "imgppm.dll");
|
||||
deleteThisFile("Components", "ucharuti.dll");
|
||||
deleteThisFile("Components", "chardet.dll");
|
||||
deleteThisFile("Components", "lwbrk.dll");
|
||||
deleteThisFile("Components", "nslocale.dll");
|
||||
deleteThisFile("Components", "strres.dll");
|
||||
deleteThisFile("Components", "mozbrwsr.dll");
|
||||
deleteThisFile("Components", "nkcache.dll");
|
||||
deleteThisFile("Chrome", "chrome.rdf");
|
||||
|
|
Загрузка…
Ссылка в новой задаче