Move mozilla/string into mozilla/xpcom/.
Bug #214700 r=dougt sr=leaf a=mkaply
This commit is contained in:
cls%seawood.org
Родитель
b6513af87e
Коммит
18630c8b86
|
|
@ -132,9 +132,8 @@ tier_2_dirs += lib/mac/MoreFiles
|
|||
endif
|
||||
|
||||
tier_2_dirs += \
|
||||
modules/libreg \
|
||||
string \
|
||||
xpcom \
|
||||
modules/libreg \
|
||||
xpcom/obsolete \
|
||||
$(NULL)
|
||||
|
||||
|
|
|
|||
|
|
@ -545,12 +545,12 @@ widget/src/support/Makefile
|
|||
"
|
||||
|
||||
MAKEFILES_xpcom="
|
||||
string/Makefile
|
||||
string/obsolete/Makefile
|
||||
string/public/Makefile
|
||||
string/src/Makefile
|
||||
string/embed/Makefile
|
||||
string/embed/standalone/Makefile
|
||||
xpcom/string/Makefile
|
||||
xpcom/string/obsolete/Makefile
|
||||
xpcom/string/public/Makefile
|
||||
xpcom/string/src/Makefile
|
||||
xpcom/string/embed/Makefile
|
||||
xpcom/string/embed/standalone/Makefile
|
||||
xpcom/Makefile
|
||||
xpcom/base/Makefile
|
||||
xpcom/build/Makefile
|
||||
|
|
@ -580,8 +580,6 @@ xpcom/reflect/xptinfo/Makefile
|
|||
xpcom/reflect/xptinfo/public/Makefile
|
||||
xpcom/reflect/xptinfo/src/Makefile
|
||||
xpcom/reflect/xptinfo/tests/Makefile
|
||||
xpcom/obsolete/Makefile
|
||||
xpcom/obsolete/component/Makefile
|
||||
xpcom/proxy/Makefile
|
||||
xpcom/proxy/public/Makefile
|
||||
xpcom/proxy/src/Makefile
|
||||
|
|
@ -600,6 +598,10 @@ intl/uconv/public/Makefile
|
|||
netwerk/base/public/Makefile
|
||||
netwerk/build/Makefile
|
||||
"
|
||||
MAKEFILES_xpcom_obsolete="
|
||||
xpcom/obsolete/Makefile
|
||||
xpcom/obsolete/component/Makefile
|
||||
"
|
||||
|
||||
MAKEFILES_xpcom_tests="
|
||||
xpcom/tests/Makefile
|
||||
|
|
@ -1371,6 +1373,7 @@ $MAKEFILES_webshell
|
|||
$MAKEFILES_widget
|
||||
$MAKEFILES_xft
|
||||
$MAKEFILES_xpcom
|
||||
$MAKEFILES_xpcom_obsolete
|
||||
$MAKEFILES_xpcom_tests
|
||||
$MAKEFILES_xpconnect
|
||||
$MAKEFILES_xpinstall
|
||||
|
|
|
|||
|
|
@ -31,6 +31,7 @@ GRE_MODULE = 1
|
|||
|
||||
DIRS = \
|
||||
typelib \
|
||||
string \
|
||||
glue \
|
||||
base \
|
||||
ds \
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@
|
|||
# Johnny Stenback <jst@netscape.com> (original author)
|
||||
#
|
||||
|
||||
DEPTH = ..
|
||||
DEPTH = ../..
|
||||
topsrcdir = @top_srcdir@
|
||||
srcdir = @srcdir@
|
||||
VPATH = @srcdir@
|
||||
|
|
|
|||
|
|
@ -1,100 +0,0 @@
|
|||
# ***** BEGIN LICENSE BLOCK *****
|
||||
# Version: MPL 1.1/GPL 2.0/LGPL 2.1
|
||||
#
|
||||
# The contents of this file are subject to the Mozilla 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/MPL/
|
||||
#
|
||||
# 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.
|
||||
#
|
||||
# The Initial Developer of the Original Code is
|
||||
# Netscape Communications Corporation.
|
||||
# Portions created by the Initial Developer are Copyright (C) 2002
|
||||
# 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 MPL, 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 MPL, the GPL or the LGPL.
|
||||
#
|
||||
# ***** END LICENSE BLOCK *****
|
||||
|
||||
|
||||
DEPTH = ../..
|
||||
topsrcdir = @top_srcdir@
|
||||
srcdir = @srcdir@
|
||||
VPATH = @srcdir@
|
||||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
DIRS = standalone
|
||||
|
||||
MODULE = embedstring
|
||||
LIBRARY_NAME = embedstring_s
|
||||
|
||||
LOCAL_INCLUDES = \
|
||||
-I$(srcdir)/../src \
|
||||
-I$(srcdir)/../public \
|
||||
-I$(srcdir)/../obsolete \
|
||||
$(NULL)
|
||||
|
||||
REQUIRES = xpcom \
|
||||
$(NULL)
|
||||
|
||||
STRING_LCSRCS = \
|
||||
nsAString.cpp \
|
||||
nsDependentSubstring.cpp \
|
||||
nsASingleFragmentString.cpp \
|
||||
$(NULL)
|
||||
|
||||
STRING_CSRCS := $(addprefix $(topsrcdir)/string/src/, $(STRING_LCSRCS))
|
||||
|
||||
CPPSRCS = \
|
||||
$(STRING_LCSRCS) \
|
||||
nsEmbedString.cpp \
|
||||
$(NULL)
|
||||
|
||||
SDK_HEADERS = \
|
||||
nsEmbedString.h \
|
||||
$(NULL)
|
||||
|
||||
SDK_BINARY = \
|
||||
$(LIB_PREFIX)embedstring_s.$(LIB_SUFFIX) \
|
||||
$(NULL)
|
||||
|
||||
# we don't want the shared lib, but we want to force the creation of a
|
||||
# static lib.
|
||||
FORCE_STATIC_LIB = 1
|
||||
|
||||
# Force use of PIC
|
||||
FORCE_USE_PIC = 1
|
||||
|
||||
GARBAGE += $(STRING_LCSRCS) $(wildcard *.$(OBJ_SUFFIX))
|
||||
|
||||
ifeq ($(OS_ARCH),WINNT)
|
||||
GARBAGE += $(addprefix $(srcdir)/,$(STRING_LCSRCS))
|
||||
endif
|
||||
|
||||
SRCS_IN_OBJDIR = 1
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
export:: $(STRING_CSRCS)
|
||||
$(INSTALL) $^ .
|
||||
|
||||
DEFINES += -DXPCOM_GLUE
|
||||
|
|
@ -1,104 +0,0 @@
|
|||
# ***** BEGIN LICENSE BLOCK *****
|
||||
# Version: MPL 1.1/GPL 2.0/LGPL 2.1
|
||||
#
|
||||
# The contents of this file are subject to the Mozilla 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/MPL/
|
||||
#
|
||||
# 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.
|
||||
#
|
||||
# The Initial Developer of the Original Code is
|
||||
# Netscape Communications Corporation.
|
||||
# Portions created by the Initial Developer are Copyright (C) 2002
|
||||
# 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 MPL, 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 MPL, the GPL or the LGPL.
|
||||
#
|
||||
# ***** END LICENSE BLOCK *****
|
||||
|
||||
|
||||
DEPTH = ../../..
|
||||
topsrcdir = @top_srcdir@
|
||||
srcdir = @srcdir@
|
||||
VPATH = @srcdir@
|
||||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
MODULE = embedstring
|
||||
LIBRARY_NAME = embedstring
|
||||
|
||||
LOCAL_INCLUDES = \
|
||||
-I$(srcdir)/../../src \
|
||||
-I$(srcdir)/../../public \
|
||||
-I$(srcdir)/../../obsolete \
|
||||
$(NULL)
|
||||
|
||||
REQUIRES = xpcom \
|
||||
$(NULL)
|
||||
|
||||
STRING_LCSRCS = \
|
||||
nsAString.cpp \
|
||||
nsDependentSubstring.cpp \
|
||||
nsASingleFragmentString.cpp \
|
||||
$(NULL)
|
||||
|
||||
STRING_CSRCS := $(addprefix $(topsrcdir)/string/src/, $(STRING_LCSRCS))
|
||||
|
||||
|
||||
EMBED_STRING_LCSRCS = \
|
||||
nsEmbedString.cpp \
|
||||
$(NULL)
|
||||
|
||||
EMBED_STRING_CSRCS := $(addprefix $(topsrcdir)/string/embed/, $(EMBED_STRING_LCSRCS))
|
||||
|
||||
CPPSRCS = \
|
||||
$(STRING_LCSRCS) \
|
||||
$(EMBED_STRING_LCSRCS) \
|
||||
nsEmbedStringAllocator.cpp \
|
||||
$(NULL)
|
||||
|
||||
SDK_BINARY = \
|
||||
$(LIB_PREFIX)embedstring.$(LIB_SUFFIX) \
|
||||
$(NULL)
|
||||
|
||||
# we don't want the shared lib, but we want to force the creation of a
|
||||
# static lib.
|
||||
FORCE_STATIC_LIB = 1
|
||||
|
||||
# Force use of PIC
|
||||
FORCE_USE_PIC = 1
|
||||
|
||||
GARBAGE += $(STRING_LCSRCS) $(wildcard *.$(OBJ_SUFFIX))
|
||||
GARBAGE += $(EMBED_STRING_LCSRCS) $(wildcard *.$(OBJ_SUFFIX))
|
||||
|
||||
ifeq ($(OS_ARCH),WINNT)
|
||||
GARBAGE += $(addprefix $(srcdir)/,$(STRING_LCSRCS))
|
||||
GARBAGE += $(addprefix $(srcdir)/,$(EMBED_STRING_LCSRCS))
|
||||
endif
|
||||
|
||||
SRCS_IN_OBJDIR = 1
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
export:: $(STRING_CSRCS) $(EMBED_STRING_CSRCS)
|
||||
$(INSTALL) $^ .
|
||||
|
||||
DEFINES += -DXPCOM_GLUE -DEMBEDSTRING_STANDALONE
|
||||
|
|
@ -1,61 +0,0 @@
|
|||
#
|
||||
# The contents of this file are subject to the Mozilla 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/MPL/
|
||||
#
|
||||
# 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.
|
||||
#
|
||||
# The Initial Developer of the Original Code is Netscape
|
||||
# Communications. Portions created by Netscape Communications are
|
||||
# Copyright (C) 2001 by Netscape Communications. All
|
||||
# Rights Reserved.
|
||||
#
|
||||
# Contributor(s):
|
||||
# Johnny Stenback <jst@netscape.com> (original author)
|
||||
#
|
||||
|
||||
DEPTH = ../..
|
||||
topsrcdir = @top_srcdir@
|
||||
srcdir = @srcdir@
|
||||
VPATH = @srcdir@
|
||||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
MODULE = string
|
||||
LIBRARY_NAME = string_obsolete_s
|
||||
|
||||
REQUIRES = \
|
||||
xpcom \
|
||||
$(NULL)
|
||||
|
||||
CPPSRCS = \
|
||||
nsStr.cpp \
|
||||
nsString.cpp \
|
||||
nsString2.cpp \
|
||||
$(NULL)
|
||||
|
||||
EXPORTS = \
|
||||
nsStr.h \
|
||||
nsStrShared.h \
|
||||
nsString.h \
|
||||
nsString2.h \
|
||||
$(NULL)
|
||||
|
||||
EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
|
||||
|
||||
# we don't want the shared lib, but we want to force the creation of a
|
||||
# static lib.
|
||||
FORCE_STATIC_LIB = 1
|
||||
|
||||
# Force use of PIC
|
||||
FORCE_USE_PIC = 1
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
DEFINES += -D_IMPL_NS_COM
|
||||
|
|
@ -21,7 +21,7 @@
|
|||
# Scott Collins <scc@mozilla.org>
|
||||
#
|
||||
|
||||
DEPTH = ../..
|
||||
DEPTH = ../../..
|
||||
topsrcdir = @top_srcdir@
|
||||
srcdir = @srcdir@
|
||||
VPATH = @srcdir@
|
||||
|
|
@ -63,6 +63,4 @@ EXPORTS = \
|
|||
nsXPIDLString.h \
|
||||
$(NULL)
|
||||
|
||||
EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
# Scott Collins <scc@mozilla.org>
|
||||
#
|
||||
|
||||
DEPTH = ../..
|
||||
DEPTH = ../../..
|
||||
topsrcdir = @top_srcdir@
|
||||
srcdir = @srcdir@
|
||||
VPATH = @srcdir@
|
||||
|
|
@ -49,8 +49,6 @@ CPPSRCS = \
|
|||
nsXPIDLString.cpp \
|
||||
$(NULL)
|
||||
|
||||
EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
|
||||
|
||||
# we don't want the shared lib, but we want to force the creation of a
|
||||
# static lib.
|
||||
FORCE_STATIC_LIB = 1
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче