wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 683416 - A: Remove build support for standalone Necko and standalone Transformiix XSLT; r=khuey

Browse Source
This commit is contained in:
Ed Morley 2011-09-01 17:42:09 +01:00
parent 7e5eb7d196
commit 1029411f7a
7 changed files with 13 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
config/autoconf.mk.in
View File

@ -251,7 +251,6 @@ MOZ_XTF = @MOZ_XTF@
MOZ_SVG_DLISTS = @MOZ_SVG_DLISTS@ MOZ_SVG_DLISTS = @MOZ_SVG_DLISTS@
MOZ_CAIRO_CFLAGS = @MOZ_CAIRO_CFLAGS@ MOZ_CAIRO_CFLAGS = @MOZ_CAIRO_CFLAGS@
MOZ_SMIL = @MOZ_SMIL@ MOZ_SMIL = @MOZ_SMIL@
MOZ_XSLT_STANDALONE = @MOZ_XSLT_STANDALONE@
MOZ_PREF_EXTENSIONS = @MOZ_PREF_EXTENSIONS@ MOZ_PREF_EXTENSIONS = @MOZ_PREF_EXTENSIONS@

9
configure.in
View File

@ -4485,7 +4485,6 @@ MOZ_TOOLKIT_SEARCH=1
MOZ_UI_LOCALE=en-US MOZ_UI_LOCALE=en-US
MOZ_UNIVERSALCHARDET=1 MOZ_UNIVERSALCHARDET=1
MOZ_URL_CLASSIFIER= MOZ_URL_CLASSIFIER=
MOZ_XSLT_STANDALONE=
MOZ_XTF=1 MOZ_XTF=1
MOZ_XUL=1 MOZ_XUL=1
MOZ_ZIPWRITER=1 MOZ_ZIPWRITER=1
@ -4541,8 +4540,6 @@ MOZ_ARG_ENABLE_STRING(application,
Options include: Options include:
browser (Firefox) browser (Firefox)
xulrunner xulrunner
content/xslt (Standalone Transformiix XSLT)
netwerk (Standalone Necko)
tools/update-packaging (AUS-related packaging tools)], tools/update-packaging (AUS-related packaging tools)],
[ MOZ_BUILD_APP=$enableval ] ) [ MOZ_BUILD_APP=$enableval ] )
@ -4616,11 +4613,6 @@ browser)
xulrunner) xulrunner)
AC_DEFINE(MOZ_XULRUNNER) AC_DEFINE(MOZ_XULRUNNER)
;; ;;
content/xslt)
AC_DEFINE(TX_EXE)
;;
esac esac
AC_SUBST(MOZ_BUILD_APP) AC_SUBST(MOZ_BUILD_APP)
@ -8543,7 +8535,6 @@ AC_SUBST(MOZ_PERMISSIONS)
AC_SUBST(MOZ_XTF) AC_SUBST(MOZ_XTF)
AC_SUBST(MOZ_PREF_EXTENSIONS) AC_SUBST(MOZ_PREF_EXTENSIONS)
AC_SUBST(MOZ_SMIL) AC_SUBST(MOZ_SMIL)
AC_SUBST(MOZ_XSLT_STANDALONE)
AC_SUBST(MOZ_JS_LIBS) AC_SUBST(MOZ_JS_LIBS)
AC_SUBST(MOZ_PSM) AC_SUBST(MOZ_PSM)
AC_SUBST(MOZ_DEBUG) AC_SUBST(MOZ_DEBUG)

4
content/xslt/src/Makefile.in
View File

@ -44,8 +44,4 @@ include $(DEPTH)/config/autoconf.mk
PARALLEL_DIRS = base xml xpath xslt PARALLEL_DIRS = base xml xpath xslt
ifdef MOZ_XSLT_STANDALONE
PARALLEL_DIRS += main
endif
include $(topsrcdir)/config/rules.mk include $(topsrcdir)/config/rules.mk

8
content/xslt/src/base/Makefile.in
View File

@ -46,20 +46,12 @@ MODULE = transformiix
LIBRARY_NAME = txbase_s LIBRARY_NAME = txbase_s
LIBXUL_LIBRARY = 1 LIBXUL_LIBRARY = 1
CPPSRCS = txDouble.cpp \ CPPSRCS = txDouble.cpp \
txList.cpp \ txList.cpp \
txExpandedNameMap.cpp \ txExpandedNameMap.cpp \
txNamespaceMap.cpp \ txNamespaceMap.cpp \
txURIUtils.cpp txURIUtils.cpp
ifdef MOZ_XSLT_STANDALONE
CPPSRCS += txSimpleErrorObserver.cpp \
txStringUtils.cpp \
txAtoms.cpp
endif
# we don't want the shared lib, but we want to force the creation of a # we don't want the shared lib, but we want to force the creation of a
# static lib. # static lib.
FORCE_STATIC_LIB = 1 FORCE_STATIC_LIB = 1

12
content/xslt/src/xml/Makefile.in
View File

@ -46,23 +46,11 @@ MODULE = transformiix
LIBRARY_NAME = txxml_s LIBRARY_NAME = txxml_s
LIBXUL_LIBRARY = 1 LIBXUL_LIBRARY = 1
CPPSRCS = \ CPPSRCS = \
txXMLUtils.cpp \ txXMLUtils.cpp \
txXMLParser.cpp \ txXMLParser.cpp \
$(NULL) $(NULL)
ifdef MOZ_XSLT_STANDALONE
CPPSRCS += \
txAttr.cpp \
txDocument.cpp \
txElement.cpp \
txNodeDefinition.cpp \
txProcessingInstruction.cpp \
$(NULL)
endif
# we don't want the shared lib, but we want to force the creation of a # we don't want the shared lib, but we want to force the creation of a
# static lib. # static lib.
FORCE_STATIC_LIB = 1 FORCE_STATIC_LIB = 1

10
content/xslt/src/xpath/Makefile.in
View File

@ -46,8 +46,6 @@ MODULE = transformiix
LIBRARY_NAME = txxpath_s LIBRARY_NAME = txxpath_s
LIBXUL_LIBRARY = 1 LIBXUL_LIBRARY = 1
CPPSRCS = \ CPPSRCS = \
txBooleanExpr.cpp \ txBooleanExpr.cpp \
txBooleanResult.cpp \ txBooleanResult.cpp \
@ -79,18 +77,14 @@ CPPSRCS = \
txUnionNodeTest.cpp \ txUnionNodeTest.cpp \
txUnaryExpr.cpp \ txUnaryExpr.cpp \
txVariableRefExpr.cpp \ txVariableRefExpr.cpp \
txXPathOptimizer.cpp txXPathOptimizer.cpp \
ifndef MOZ_XSLT_STANDALONE nsXPathEvaluator.cpp \
CPPSRCS += nsXPathEvaluator.cpp \
nsXPathExpression.cpp \ nsXPathExpression.cpp \
nsXPathNSResolver.cpp \ nsXPathNSResolver.cpp \
nsXPathResult.cpp \ nsXPathResult.cpp \
txMozillaXPathTreeWalker.cpp \ txMozillaXPathTreeWalker.cpp \
txNodeSetAdaptor.cpp \ txNodeSetAdaptor.cpp \
txXPCOMExtensionFunction.cpp txXPCOMExtensionFunction.cpp
else
CPPSRCS += txStandaloneXPathTreeWalker.cpp
endif
# we don't want the shared lib, but we want to force the creation of a # we don't want the shared lib, but we want to force the creation of a
# static lib. # static lib.

19
content/xslt/src/xslt/Makefile.in
View File

@ -46,8 +46,6 @@ MODULE = transformiix
LIBRARY_NAME = txxslt_s LIBRARY_NAME = txxslt_s
LIBXUL_LIBRARY = 1 LIBXUL_LIBRARY = 1
CPPSRCS = \ CPPSRCS = \
txNodeSorter.cpp \ txNodeSorter.cpp \
txXPathResultComparator.cpp \ txXPathResultComparator.cpp \
@ -74,20 +72,11 @@ CPPSRCS = \
txFormatNumberFunctionCall.cpp \ txFormatNumberFunctionCall.cpp \
txGenerateIdFunctionCall.cpp \ txGenerateIdFunctionCall.cpp \
txKeyFunctionCall.cpp \ txKeyFunctionCall.cpp \
txXSLTEnvironmentFunctionCall.cpp txXSLTEnvironmentFunctionCall.cpp \
txMozillaStylesheetCompiler.cpp \
ifdef MOZ_XSLT_STANDALONE
CPPSRCS += txHTMLOutput.cpp \
txStandaloneXSLTProcessor.cpp \
txStandaloneStylesheetCompiler.cpp \
txTextOutput.cpp \
txXMLOutput.cpp
else
CPPSRCS += txMozillaStylesheetCompiler.cpp \
txMozillaTextOutput.cpp \ txMozillaTextOutput.cpp \
txMozillaXMLOutput.cpp \ txMozillaXMLOutput.cpp \
txMozillaXSLTProcessor.cpp txMozillaXSLTProcessor.cpp
endif
# For nsDependentJSString # For nsDependentJSString
LOCAL_INCLUDES += \ LOCAL_INCLUDES += \
@ -113,8 +102,4 @@ INCLUDES += \
-I$(srcdir)/../../../base/src \ -I$(srcdir)/../../../base/src \
$(NULL) $(NULL)
ifdef MOZ_XSLT_STANDALONE
DEFINES += -DXML_DTD -DXML_UNICODE
else
DEFINES += -D_IMPL_NS_LAYOUT DEFINES += -D_IMPL_NS_LAYOUT
endif