Merge branch 'master' into import-system-xml-4

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

diff --git a/mcs/class/System.XML/Makefile b/mcs/class/System.XML/Makefile
index 2d0d84be4fab6183c8ab982c411b218489a9e764..12ab2967cdfa176cfb1de252b7b33361fbd7f78a 100644 (file)
--- a/mcs/class/System.XML/Makefile
+++ b/mcs/class/System.XML/Makefile
@@ -13,12 +13,17 @@ ifdef USE_BOOT_COMPILE
 LIBRARY_COMPILE = $(BOOT_COMPILE)
 endif
 
+# FIXME: use below, once mcs got fixed.
+#RESOURCE_STRINGS = ../../../external/referencesource/System.Xml/System.Xml.txt
+#      ../../../external/referencesource/System.Data.SqlXml/System.Xml.Utils.txt
+
 PROFILE_ANY_MOBILE := $(filter monotouch monotouch_runtime monodroid xammac mobile mobile_static, $(PROFILE))
 
 LIB_REFS = System
-LIB_MCS_FLAGS = -r:$(corlib) -nowarn:0618,0612,0642
+LIB_MCS_FLAGS = -r:$(corlib)  -nowarn:0618,0612,0642 -unsafe -d:ASYNC -d:DISABLE_CAS_USE -d:MONO_HYBRID_SYSTEM_XML
+
 ifeq (2.1, $(FRAMEWORK_VERSION))
-LIB_MCS_FLAGS += -unsafe -d:AGCLR -d:NET_2_1_HACK
+LIB_MCS_FLAGS += -unsafe -d:AGCLR -d:NET_2_1_HACK -d:DISABLE_XSLT_COMPILER -d:DISABLE_XSLT_SCRIPT
 endif
 TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) -nowarn:0618 -nowarn:219 -nowarn:169 -r:System.Data.dll -r:System.Core.dll
 
@@ -66,31 +71,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))