Merge pull request #185 from QuickJack/master

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

diff --git a/mcs/class/System.XML/Makefile b/mcs/class/System.XML/Makefile
index ab94431399ccde921b62643149c6019c0a2e0215..e30541c3d824ba11698c9c47b512d750e0807906 100644 (file)
--- a/mcs/class/System.XML/Makefile
+++ b/mcs/class/System.XML/Makefile
@@ -7,22 +7,14 @@ LIBRARY_USE_INTERMEDIATE_FILE = yes
 
 lib_file := $(wildcard ../lib/$(PROFILE)/System.Xml.dll)
 ifndef lib_file
-# In the basic profile, System.Xml.dll is _not_ a dependency of mcs.exe.  So, don't use boot compilation.
-# In other profiles, it _is_ a dependency of mcs.exe.  So, use boot compilation.
-ifneq (basic, $(PROFILE))
 USE_BOOT_COMPILE = yes
 endif
-endif
-
-ifeq (net_2_0, $(PROFILE))
-BOOTSTRAP_MCS = MONO_PATH="$(topdir)/class/lib/net_2_0$(PLATFORM_PATH_SEPARATOR)$(topdir)/class/lib/net_2_0_bootstrap$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(INTERNAL_GMCS)
-endif
 
 ifdef USE_BOOT_COMPILE
 LIBRARY_COMPILE = $(BOOT_COMPILE)
 endif
 
-LIB_MCS_FLAGS = -r:$(corlib) -r:System.dll -nowarn:0162,0618,0612,0642,1595
+LIB_MCS_FLAGS = -r:$(corlib) -r:System.dll -nowarn:0618,0612,0642
 ifeq (net_1_1_java, $(PROFILE))
 LIB_MCS_FLAGS += \
        -r:System.Xml.dll               \
@@ -31,6 +23,9 @@ LIB_MCS_FLAGS += \
        -r:unresolved.dll               \
        /lib:../../class/lib/$(PROFILE)
 endif
+ifeq (2.1, $(FRAMEWORK_VERSION))
+LIB_MCS_FLAGS += -unsafe -d:AGCLR -d:NET_2_1_HACK
+endif
 TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) -nowarn:0618 -nowarn:219 -nowarn:169
 
 ifeq (2.0, $(FRAMEWORK_VERSION))
@@ -70,52 +65,32 @@ EXTRA_DISTFILES = \
        Test/MonoMicro.Test.csproj      \
        Test/XmlFiles/76102.xml         \
        Test/XmlFiles/79683.dtd         \
-       Test/XmlFiles/xsd/multi-schemaLocation.xml \
-       Test/XmlFiles/xsd/datatypesTest.xsd \
-       Test/XmlFiles/xsd/336625.xsd    \
-       Test/XmlFiles/xsd/358408.xsd    \
-       Test/XmlFiles/xsd/361818.xsd    \
-       Test/XmlFiles/xsd/361818-2.xsd  \
-       Test/XmlFiles/xsd/361818-3.xsd  \
-       Test/XmlFiles/xsd/77687.xsd     \
-       Test/XmlFiles/xsd/77687inc.xsd  \
-       Test/XmlFiles/xsd/78985.xml     \
-       Test/XmlFiles/xsd/78985.xsd     \
-       Test/XmlFiles/xsd/79650.xsd     \
-       Test/XmlFiles/xsd/82010.xml     \
-       Test/XmlFiles/xsd/82010.xsd     \
-       Test/XmlFiles/xsd/82078.xsd     \
-       Test/XmlFiles/xsd/inter-inc-1.xsd \
-       Test/XmlFiles/xsl/82493.xml     \
-       Test/XmlFiles/xsl/82493.xsl     \
-       Test/XmlFiles/xsl/91834.xml     \
-       Test/XmlFiles/xsl/91834.xsl     \
-       Test/XmlFiles/xsl/91834a.xml    \
-       Test/XmlFiles/xsl/325482.xml    \
-       Test/XmlFiles/xsl/325482.xsl    \
-       Test/XmlFiles/xsl/stripspace.xsl \
-       Test/XmlFiles/xsl/stripspace.xml \
-       Test/XmlFiles/xsl/current-in-select.xsl \
-       Test/XmlFiles/xsl/current-in-select.xml \
+       Test/XmlFiles/496192.xml        \
+       Test/XmlFiles/496192.xsd        \
+       $(wildcard Test/XmlFiles/xsd/*.xml) \
+       $(wildcard Test/XmlFiles/xsd/*.xsd) \
+       $(wildcard Test/XmlFiles/xsl/*.xml) \
+       $(wildcard Test/XmlFiles/xsl/*.xsl) \
        Test/XmlFiles/xsl/current-in-select.ref \
        Test/XmlFiles/xsl/ChangeLog \
        $(xmlfiles_files:%=Test/XmlFiles/%) \
        $(nist_dom_files:%=Test/System.Xml/nist_dom/%)
 
 System.Xml.XPath/Parser.cs: System.Xml.XPath/Parser.jay $(topdir)/jay/skeleton.cs
-       $(topdir)/jay/jay -ct < $(topdir)/jay/skeleton.cs $< >$@
+       $(topdir)/jay/jay -ct < $(topdir)/jay/skeleton.cs $(CURDIR)/$< >$@
 
 Mono.Xml.Xsl/PatternParser.jay: System.Xml.XPath/Parser.jay $(topdir)/jay/skeleton.cs
        sed "s/\%start Expr/\%start Pattern/" $< >$@
 
 Mono.Xml.Xsl/PatternParser.cs: Mono.Xml.Xsl/PatternParser.jay $(topdir)/jay/skeleton.cs
        echo "#define XSLT_PATTERN" > $@
-       $(topdir)/jay/jay -ct $< < $(topdir)/jay/skeleton.cs >>$@
+       $(topdir)/jay/jay -ct $(CURDIR)/$< < $(topdir)/jay/skeleton.cs >>$@
 
 Mono.Xml.Xsl/PatternTokenizer.cs: System.Xml.XPath/Tokenizer.cs
        echo "#define XSLT_PATTERN" > $@
        cat $< >>$@
 
+ifneq (moonlight_raw, $(PROFILE))
 BUILT_SOURCES = System.Xml.XPath/Parser.cs \
        Mono.Xml.Xsl/PatternParser.cs \
        Mono.Xml.Xsl/PatternTokenizer.cs
@@ -124,5 +99,6 @@ CLEAN_FILES = Test/XmlFiles/xsl/result.xml \
        System.Xml.XPath/Parser.cs \
        Mono.Xml.Xsl/PatternParser.cs \
        Mono.Xml.Xsl/PatternTokenizer.cs
+endif
 
 include ../../build/library.make