From 1029411f7a35a07d98eec3d2ce8d992bec34ac8f Mon Sep 17 00:00:00 2001 From: Ed Morley Date: Thu, 1 Sep 2011 17:42:09 +0100 Subject: [PATCH] Bug 683416 - A: Remove build support for standalone Necko and standalone Transformiix XSLT; r=khuey --- config/autoconf.mk.in | 1 - configure.in | 9 --------- content/xslt/src/Makefile.in | 4 ---- content/xslt/src/base/Makefile.in | 8 -------- content/xslt/src/xml/Makefile.in | 12 ------------ content/xslt/src/xpath/Makefile.in | 22 ++++++++-------------- content/xslt/src/xslt/Makefile.in | 25 +++++-------------------- 7 files changed, 13 insertions(+), 68 deletions(-) diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in index 6f63b2a367c..ea68d9fcc3f 100644 --- a/config/autoconf.mk.in +++ b/config/autoconf.mk.in @@ -251,7 +251,6 @@ MOZ_XTF = @MOZ_XTF@ MOZ_SVG_DLISTS = @MOZ_SVG_DLISTS@ MOZ_CAIRO_CFLAGS = @MOZ_CAIRO_CFLAGS@ MOZ_SMIL = @MOZ_SMIL@ -MOZ_XSLT_STANDALONE = @MOZ_XSLT_STANDALONE@ MOZ_PREF_EXTENSIONS = @MOZ_PREF_EXTENSIONS@ diff --git a/configure.in b/configure.in index f780a4b50b6..cc0305262a0 100644 --- a/configure.in +++ b/configure.in @@ -4485,7 +4485,6 @@ MOZ_TOOLKIT_SEARCH=1 MOZ_UI_LOCALE=en-US MOZ_UNIVERSALCHARDET=1 MOZ_URL_CLASSIFIER= -MOZ_XSLT_STANDALONE= MOZ_XTF=1 MOZ_XUL=1 MOZ_ZIPWRITER=1 @@ -4541,8 +4540,6 @@ MOZ_ARG_ENABLE_STRING(application, Options include: browser (Firefox) xulrunner - content/xslt (Standalone Transformiix XSLT) - netwerk (Standalone Necko) tools/update-packaging (AUS-related packaging tools)], [ MOZ_BUILD_APP=$enableval ] ) @@ -4616,11 +4613,6 @@ browser) xulrunner) AC_DEFINE(MOZ_XULRUNNER) ;; - -content/xslt) - AC_DEFINE(TX_EXE) - ;; - esac AC_SUBST(MOZ_BUILD_APP) @@ -8543,7 +8535,6 @@ AC_SUBST(MOZ_PERMISSIONS) AC_SUBST(MOZ_XTF) AC_SUBST(MOZ_PREF_EXTENSIONS) AC_SUBST(MOZ_SMIL) -AC_SUBST(MOZ_XSLT_STANDALONE) AC_SUBST(MOZ_JS_LIBS) AC_SUBST(MOZ_PSM) AC_SUBST(MOZ_DEBUG) diff --git a/content/xslt/src/Makefile.in b/content/xslt/src/Makefile.in index ad907399af1..17c54f253ba 100644 --- a/content/xslt/src/Makefile.in +++ b/content/xslt/src/Makefile.in @@ -44,8 +44,4 @@ include $(DEPTH)/config/autoconf.mk PARALLEL_DIRS = base xml xpath xslt -ifdef MOZ_XSLT_STANDALONE -PARALLEL_DIRS += main -endif - include $(topsrcdir)/config/rules.mk diff --git a/content/xslt/src/base/Makefile.in b/content/xslt/src/base/Makefile.in index 43b337ed9a2..b00096a880c 100644 --- a/content/xslt/src/base/Makefile.in +++ b/content/xslt/src/base/Makefile.in @@ -46,20 +46,12 @@ MODULE = transformiix LIBRARY_NAME = txbase_s LIBXUL_LIBRARY = 1 - - CPPSRCS = txDouble.cpp \ txList.cpp \ txExpandedNameMap.cpp \ txNamespaceMap.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 # static lib. FORCE_STATIC_LIB = 1 diff --git a/content/xslt/src/xml/Makefile.in b/content/xslt/src/xml/Makefile.in index b6e975e5ff6..c5acb56594d 100644 --- a/content/xslt/src/xml/Makefile.in +++ b/content/xslt/src/xml/Makefile.in @@ -46,23 +46,11 @@ MODULE = transformiix LIBRARY_NAME = txxml_s LIBXUL_LIBRARY = 1 - - CPPSRCS = \ txXMLUtils.cpp \ txXMLParser.cpp \ $(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 # static lib. FORCE_STATIC_LIB = 1 diff --git a/content/xslt/src/xpath/Makefile.in b/content/xslt/src/xpath/Makefile.in index 80bb184492d..f17aed64888 100644 --- a/content/xslt/src/xpath/Makefile.in +++ b/content/xslt/src/xpath/Makefile.in @@ -46,8 +46,6 @@ MODULE = transformiix LIBRARY_NAME = txxpath_s LIBXUL_LIBRARY = 1 - - CPPSRCS = \ txBooleanExpr.cpp \ txBooleanResult.cpp \ @@ -79,18 +77,14 @@ CPPSRCS = \ txUnionNodeTest.cpp \ txUnaryExpr.cpp \ txVariableRefExpr.cpp \ - txXPathOptimizer.cpp -ifndef MOZ_XSLT_STANDALONE -CPPSRCS += nsXPathEvaluator.cpp \ - nsXPathExpression.cpp \ - nsXPathNSResolver.cpp \ - nsXPathResult.cpp \ - txMozillaXPathTreeWalker.cpp \ - txNodeSetAdaptor.cpp \ - txXPCOMExtensionFunction.cpp -else -CPPSRCS += txStandaloneXPathTreeWalker.cpp -endif + txXPathOptimizer.cpp \ + nsXPathEvaluator.cpp \ + nsXPathExpression.cpp \ + nsXPathNSResolver.cpp \ + nsXPathResult.cpp \ + txMozillaXPathTreeWalker.cpp \ + txNodeSetAdaptor.cpp \ + txXPCOMExtensionFunction.cpp # we don't want the shared lib, but we want to force the creation of a # static lib. diff --git a/content/xslt/src/xslt/Makefile.in b/content/xslt/src/xslt/Makefile.in index 42041a5003e..d525c33fee3 100644 --- a/content/xslt/src/xslt/Makefile.in +++ b/content/xslt/src/xslt/Makefile.in @@ -46,8 +46,6 @@ MODULE = transformiix LIBRARY_NAME = txxslt_s LIBXUL_LIBRARY = 1 - - CPPSRCS = \ txNodeSorter.cpp \ txXPathResultComparator.cpp \ @@ -74,20 +72,11 @@ CPPSRCS = \ txFormatNumberFunctionCall.cpp \ txGenerateIdFunctionCall.cpp \ txKeyFunctionCall.cpp \ - txXSLTEnvironmentFunctionCall.cpp - -ifdef MOZ_XSLT_STANDALONE -CPPSRCS += txHTMLOutput.cpp \ - txStandaloneXSLTProcessor.cpp \ - txStandaloneStylesheetCompiler.cpp \ - txTextOutput.cpp \ - txXMLOutput.cpp -else -CPPSRCS += txMozillaStylesheetCompiler.cpp \ - txMozillaTextOutput.cpp \ - txMozillaXMLOutput.cpp \ - txMozillaXSLTProcessor.cpp -endif + txXSLTEnvironmentFunctionCall.cpp \ + txMozillaStylesheetCompiler.cpp \ + txMozillaTextOutput.cpp \ + txMozillaXMLOutput.cpp \ + txMozillaXSLTProcessor.cpp # For nsDependentJSString LOCAL_INCLUDES += \ @@ -113,8 +102,4 @@ INCLUDES += \ -I$(srcdir)/../../../base/src \ $(NULL) -ifdef MOZ_XSLT_STANDALONE -DEFINES += -DXML_DTD -DXML_UNICODE -else DEFINES += -D_IMPL_NS_LAYOUT -endif