Merge pull request #2379 from xmcclure/babysitter-contd

[mono.git] / mcs / class / System.XML / Makefile

diff --git a/mcs/class/System.XML/Makefile b/mcs/class/System.XML/Makefile
index f44d93a6f0eaa473c248e7b68f906fbaaef17c43..9fd6276bcea918729406540e67ba166ede99c2ca 100644 (file)
--- a/mcs/class/System.XML/Makefile
+++ b/mcs/class/System.XML/Makefile
@@ -13,15 +13,19 @@ ifdef USE_BOOT_COMPILE
 LIBRARY_COMPILE = $(BOOT_COMPILE)
 endif
 
-PROFILE_ANY_MOBILE := $(filter monotouch monotouch_runtime monodroid xammac mobile mobile_static, $(PROFILE))
+RESOURCE_STRINGS = \
+       ../../../external/referencesource/System.Xml/System.Xml.txt \
+       ../../../external/referencesource/System.Data.SqlXml/System.Xml.Utils.txt
+
+LIB_REFS = System
+LIB_MCS_FLAGS = -r:$(corlib)  -nowarn:219,414,649,1717 -unsafe -d:ASYNC
 
-LIB_MCS_FLAGS = -r:$(corlib) -r:System.dll -nowarn:0618,0612,0642
 ifeq (2.1, $(FRAMEWORK_VERSION))
-LIB_MCS_FLAGS += -unsafe -d:AGCLR -d:NET_2_1_HACK
+LIB_MCS_FLAGS += -d:AGCLR -d:NET_2_1_HACK -d:DISABLE_XSLT_COMPILER -d:DISABLE_XSLT_SCRIPT,MONO_HYBRID_SYSTEM_XML -d:DISABLE_CAS_USE
 endif
 TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) -nowarn:0618 -nowarn:219 -nowarn:169 -r:System.Data.dll -r:System.Core.dll
 
-ifndef PROFILE_ANY_MOBILE
+ifndef MOBILE_PROFILE
 FINAL_MCS_FLAGS = -r:System.Configuration.dll -d:CONFIGURATION_DEP
 endif
 
@@ -43,11 +47,8 @@ xmlfiles_files = \
        xsd/ChangeLog xsd/1.xsd xsd/2.xsd xsd/3.xsd xsd/4.xsd xsd/5.xsd xsd/6.xsd xsd/xml.xsd xsd/81360.xsd xsd/81360inc1.xsd xsd/81360inc2.xsd
 
 EXTRA_DISTFILES = \
-       System.Xml.Schema/BUGS-MS.txt   \
-       System.Xml.Schema/BUGS.txt      \
        $(wildcard System.Xml.Serialization/standalone_tests/*.cs) \
        $(wildcard System.Xml.Serialization/standalone_tests/*.output) \
-       System.Xml.XPath/Parser.jay     \
        Test/ChangeLog                  \
        Test/Microsoft.Test.csproj      \
        Test/Mono.Test.csproj           \
@@ -65,31 +66,6 @@ EXTRA_DISTFILES = \
        $(xmlfiles_files:%=Test/XmlFiles/%) \
        $(nist_dom_files:%=Test/System.Xml/nist_dom/%)
 
-System.Xml.XPath/$(PROFILE)_Parser.cs: System.Xml.XPath/Parser.jay $(topdir)/jay/skeleton.cs
-       (cd System.Xml.XPath; $(topdir)/../jay/jay -ct < $(topdir)/../jay/skeleton.cs Parser.jay >> $(PROFILE)_Parser.cs)
-
-Mono.Xml.Xsl/$(PROFILE)_PatternParser.jay: System.Xml.XPath/Parser.jay $(topdir)/jay/skeleton.cs
-       sed "s/\%start Expr/\%start Pattern/" $< >$@
-
-Mono.Xml.Xsl/$(PROFILE)_PatternParser.cs: Mono.Xml.Xsl/$(PROFILE)_PatternParser.jay $(topdir)/jay/skeleton.cs
-       echo "#define XSLT_PATTERN" > $@
-       (cd Mono.Xml.Xsl; $(topdir)/../jay/jay -ct $(PROFILE)_PatternParser.jay < $(topdir)/../jay/skeleton.cs >> $(PROFILE)_PatternParser.cs)
-
-Mono.Xml.Xsl/$(PROFILE)_PatternTokenizer.cs: System.Xml.XPath/Tokenizer.cs
-       echo "#define XSLT_PATTERN" > $@
-       cat $< >>$@
-
-ifneq (moonlight_raw, $(PROFILE))
-BUILT_SOURCES = System.Xml.XPath/$(PROFILE)_Parser.cs \
-       Mono.Xml.Xsl/$(PROFILE)_PatternParser.cs \
-       Mono.Xml.Xsl/$(PROFILE)_PatternTokenizer.cs
-
-CLEAN_FILES = Test/XmlFiles/xsl/result.xml \
-       System.Xml.XPath/$(PROFILE)_Parser.cs \
-       Mono.Xml.Xsl/$(PROFILE)_PatternParser.cs \
-       Mono.Xml.Xsl/$(PROFILE)_PatternTokenizer.cs
-endif
-
 include ../../build/library.make
 
 ifeq (bare/,$(intermediate))
@@ -103,7 +79,7 @@ system_xml_library_deps :=                           \
        $(bare_libdir)/System.dll                       \
        $(bare_libdir)/System.Xml.dll
 
-ifndef PROFILE_ANY_MOBILE
+ifndef MOBILE_PROFILE
 system_xml_library_deps += $(the_libdir_base)System.Configuration.dll
 endif