Bug 683416 - A: Remove build support for standalone Necko and standalone Transformiix XSLT; r=khuey
authorEd Morley <bmo@edmorley.co.uk>
Thu, 01 Sep 2011 17:42:09 +0100
changeset 76390 df264cbf7b9cbbdba635420da8d9e64529b77ca2
parent 76389 d6eab9dde6bd19cefdf59b1f3d477149b9a89ebc
child 76391 0c97e9647100cd33a73725b06e66c175f06b3a69
push id1637
push userbmo@edmorley.co.uk
push dateThu, 01 Sep 2011 16:51:22 +0000
treeherdermozilla-inbound@962b157801a6 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerskhuey
bugs683416
milestone9.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 683416 - A: Remove build support for standalone Necko and standalone Transformiix XSLT; r=khuey
config/autoconf.mk.in
configure.in
content/xslt/src/Makefile.in
content/xslt/src/base/Makefile.in
content/xslt/src/xml/Makefile.in
content/xslt/src/xpath/Makefile.in
content/xslt/src/xslt/Makefile.in
--- a/config/autoconf.mk.in
+++ b/config/autoconf.mk.in
@@ -246,17 +246,16 @@ MOZ_TREE_CAIRO = @MOZ_TREE_CAIRO@
 MOZ_TREE_PIXMAN = @MOZ_TREE_PIXMAN@
 
 MOZ_UPDATE_XTERM = @MOZ_UPDATE_XTERM@
 MOZ_PERMISSIONS = @MOZ_PERMISSIONS@
 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@
 
 MOZ_CAIRO_LIBS = @MOZ_CAIRO_LIBS@
 
 MOZ_ENABLE_GNOMEUI = @MOZ_ENABLE_GNOMEUI@
 MOZ_GNOMEUI_CFLAGS = @MOZ_GNOMEUI_CFLAGS@
 MOZ_GNOMEUI_LIBS = @MOZ_GNOMEUI_LIBS@
--- a/configure.in
+++ b/configure.in
@@ -4480,17 +4480,16 @@ MOZ_REFLOW_PERF=
 MOZ_SAFE_BROWSING=
 MOZ_HELP_VIEWER=
 MOZ_SPELLCHECK=1
 MOZ_SVG_DLISTS=
 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
 NS_PRINTING=1
 MOZ_PDF_PRINTING=
 MOZ_DISABLE_DOMCRYPTO=
 NSS_DISABLE_DBM=
 NECKO_WIFI=1
@@ -4536,18 +4535,16 @@ case "${target}" in
         ;;
 esac
 
 MOZ_ARG_ENABLE_STRING(application,
 [  --enable-application=APP
                           Options include:
                             browser (Firefox)
                             xulrunner
-                            content/xslt (Standalone Transformiix XSLT)
-                            netwerk (Standalone Necko)
                             tools/update-packaging (AUS-related packaging tools)],
 [ MOZ_BUILD_APP=$enableval ] )
 
 MOZ_ARG_WITH_STRING(xulrunner-stub-name,
 [  --with-xulrunner-stub-name=appname   Create the xulrunner stub with the given name],
   XULRUNNER_STUB_NAME=$withval)
 
 if test -z "$XULRUNNER_STUB_NAME"; then
@@ -4611,21 +4608,16 @@ esac
 case "$MOZ_BUILD_APP" in
 browser)
   AC_DEFINE(MOZ_PHOENIX)
   ;;
 
 xulrunner)
   AC_DEFINE(MOZ_XULRUNNER)
   ;;
-
-content/xslt)
-  AC_DEFINE(TX_EXE)
-  ;;
-
 esac
 
 AC_SUBST(MOZ_BUILD_APP)
 AC_SUBST(MOZ_PHOENIX)
 AC_SUBST(MOZ_XULRUNNER)
 
 AC_DEFINE_UNQUOTED(MOZ_BUILD_APP,$MOZ_BUILD_APP)
 
@@ -8538,17 +8530,16 @@ AC_SUBST(NS_USE_NATIVE)
 AC_SUBST(MOZ_WIDGET_TOOLKIT)
 AC_SUBST(MOZ_UPDATE_XTERM)
 AC_SUBST(MOZ_PLATFORM_MAEMO)
 AC_SUBST(MOZ_AUTH_EXTENSION)
 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)
 AC_SUBST(MOZ_DEBUG_SYMBOLS)
 AC_SUBST(MOZ_DEBUG_ENABLE_DEFS)
 AC_SUBST(MOZ_DEBUG_DISABLE_DEFS)
 AC_SUBST(MOZ_DEBUG_FLAGS)
 AC_SUBST(MOZ_DEBUG_LDFLAGS)
--- a/content/xslt/src/Makefile.in
+++ b/content/xslt/src/Makefile.in
@@ -39,13 +39,9 @@ DEPTH           = ../../..
 topsrcdir       = @top_srcdir@
 srcdir          = @srcdir@
 VPATH           = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 PARALLEL_DIRS   = base xml xpath xslt 
 
-ifdef MOZ_XSLT_STANDALONE
-PARALLEL_DIRS += main
-endif
-
 include $(topsrcdir)/config/rules.mk
--- a/content/xslt/src/base/Makefile.in
+++ b/content/xslt/src/base/Makefile.in
@@ -41,30 +41,22 @@ srcdir          = @srcdir@
 VPATH           = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 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
 
 include $(topsrcdir)/config/rules.mk
 
 INCLUDES += \
 	-I$(srcdir)/../../public \
--- a/content/xslt/src/xml/Makefile.in
+++ b/content/xslt/src/xml/Makefile.in
@@ -41,33 +41,21 @@ srcdir          = @srcdir@
 VPATH           = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 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
 
 include $(topsrcdir)/config/rules.mk
 
 INCLUDES += \
 	-I$(srcdir)/../base \
--- a/content/xslt/src/xpath/Makefile.in
+++ b/content/xslt/src/xpath/Makefile.in
@@ -41,18 +41,16 @@ srcdir          = @srcdir@
 VPATH           = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE = transformiix
 LIBRARY_NAME = txxpath_s
 LIBXUL_LIBRARY = 1
 
-
-
 CPPSRCS = \
         txBooleanExpr.cpp \
         txBooleanResult.cpp \
         txCoreFunctionCall.cpp \
         txExpr.cpp \
         txExprLexer.cpp \
         txExprParser.cpp \
         txFilterExpr.cpp \
@@ -74,28 +72,24 @@ CPPSRCS = \
         txNodeTypeTest.cpp \
         txForwardContext.cpp \
         txNodeSetContext.cpp \
         txResultRecycler.cpp \
         txUnionExpr.cpp \
         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.
 FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk
 
 INCLUDES += \
--- a/content/xslt/src/xslt/Makefile.in
+++ b/content/xslt/src/xslt/Makefile.in
@@ -41,18 +41,16 @@ srcdir          = @srcdir@
 VPATH           = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE = transformiix
 LIBRARY_NAME = txxslt_s
 LIBXUL_LIBRARY = 1
 
-
-
 CPPSRCS = \
         txNodeSorter.cpp \
         txXPathResultComparator.cpp \
         txBufferingHandler.cpp \
         txExecutionState.cpp \
         txEXSLTFunctions.cpp \
         txInstructions.cpp \
         txOutputFormat.cpp \
@@ -69,30 +67,21 @@ CPPSRCS = \
         txXSLTProcessor.cpp \
         txPatternParser.cpp \
         txUnknownHandler.cpp \
         txCurrentFunctionCall.cpp \
         txDocumentFunctionCall.cpp \
         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 += \
   -I$(topsrcdir)/dom/base \
   $(NULL)
 
 # we don't want the shared lib, but we want to force the creation of a
 # static lib.
@@ -108,13 +97,9 @@ include $(topsrcdir)/config/rules.mk
 INCLUDES += \
 	-I$(srcdir) \
 	-I$(srcdir)/../base \
 	-I$(srcdir)/../xml \
 	-I$(srcdir)/../xpath \
 	-I$(srcdir)/../../../base/src \
 	$(NULL)
 
-ifdef MOZ_XSLT_STANDALONE
-DEFINES	 += -DXML_DTD -DXML_UNICODE
-else
 DEFINES += -D_IMPL_NS_LAYOUT
-endif