Commit Graph
70 Commits
Author SHA1 Message Date
Michael Hutchinson 2804d6af37 Fix mobile and mobile_static profiles
And bring them to parity with monodroid and monotouch
2014-09-16 19:14:20 -04:00
Rolf Bjarne Kvinge a9b8a73f68 [System.Xml] Use profile-specific file names for generated files.
Otherwise parallel builds will break randomly.
2014-05-30 16:57:54 +02:00
Miguel de Icaza ae90d07888 [build] Ensure that staged build directories are set on LOCAL_MCS_FLAGS
The LOCAL_MCS_FLAGS are passed to the compiler before the standard
directory for the profile.  This is important both for correctness,
and also assists the solution generator, since we can now precisely
determine which intermediate project must be referenced.
2014-05-23 17:15:52 -04:00
Miguel de Icaza b8799913fa [vsbuild] Update Makefiles to not generate the VS metadata for the 'basic' profile 2014-05-20 22:31:49 -04:00
Miguel de Icaza 28df1505c6 [build] Record extra library builds for our Visual Studio input files
Added local targets (csproj-local) to all the assemblies that have
staged builds to dump their build information for the underlying
dependencies.

This information is needed to create the new Visual Studio csproj
files.

This commit also updates the collected build metadata from running:

     make update-csproj
     make package-inputs

As described in msvc/scripts/README
2014-05-19 22:55:00 -04:00
Miguel de Icaza effaf02382 Adjust the path for Mono.Security 2014-05-14 23:25:28 -04:00
Miguel de Icaza 9adb22769b [build] Prevent cyclic targets from being built in parallel
Since we are invoking make recursively to satisfy the dependencies
for any of the cyclic components, we need to inform make to not try
to parallelize any work on any of the cyclic dependencies, otherwise
multiple builds will execute building the same binary, and the result
will be truncated outputs.

For example, System's Makefile would launch all the parallel builds for
the dependencies:

        $(secxml_libdir)/System.dll             \
        $(the_libdir_base)System.Xml.dll        \
        $(the_libdir_base)Mono.Security.dll     \
        $(bare_libdir)/System.dll

They could be launched in parallel, and in turn the makefiles on those
directories might try simultaneously to invoke recursively a component
that has not been built yet.

So we use .NOTPARALLEL to flag all the cyclic dependencies on a given
directory to instruct make to not run those in parallel.
2014-05-09 11:27:53 -04:00
Miguel de Icaza e0e3f3cd4f [build] Staged setup for building assemblies with cyclic dependencies
This patch introduces an infrastructure to stage the builds for the core
assemblies that have cyclic dependencies.   This deals directly with
the following cycle:

    System.dll requires:
	System.Configuration.dll
	Mono.Security.dll
	System.Xml.dll

	They all require System.dll to be built

    System.Xml requires:
	System.dll
	System.Configuration.dll

    System.Security.dll requires:
	System.dll
	Mono.Security.dll
	System.Xml.dll

Principle
=========

The patch works by directing the build infrastructure to place
intermediate build steps on their own directory.  For example the
first System.dll build that only takes a dependency in mscorlib.dll is
placed not under the final directory but on a subdirectory called
"bare".

The second time that System.dll is built (after Mono.Security and
System.Xml have been built) is placed on the "secxml" directory.

The third time is the final build, and that one ends in the profile
directory.

The same principle is applied to System.Xml.

Better Dependency Tracking
==========================

To handle the multiple stages, the new Makefiles for the various
parties involved in this loop are now able to build their
dependencies.  This means that typing "make" on System.Security or
System.Xml or System will build all of the intermediate steps as
required, without needing the toplevel Makefile to perform multiple
build shots to incrementally build the result.

Bug fixes
=========

We must have regressed at some point the build of System.Xml as we
were only doing one build of it, one without System.Configuration
support.  This patch introduces back the changes to build System.Xml
in two steps.

This patch fixes the setup where we end up rebuilding System.dll and
overwriting it two times as the build progresses as a side effect
(this is what required LIBRARY_USE_INTERMEDIATE_FILE).

Details
=======

library.make:

	Introduces a new "the_libdir_base" which is the raw directory
	where the final output will go.   This points to the same location
	that libdir_base previously pointed to.

	The existing libdir_base is modified to contain an optional
	"intermediate" directory, where intermediate builds can be
	placed.

Other cycles
============

The System.Design assembly was listed as having cycles, but while this
cycle exists in theory, in practice we have not implemented any of the
code that brings the cycle in System.Windows.Forms.Design's
ImageListImageEditor and chances are, we wont any time soon.
2014-05-09 11:27:53 -04:00
Rolf Bjarne Kvinge 924c113d86 [System.Xml] Use profile-specific file names for generated files.
Otherwise parallel builds will break randomly.
2014-04-24 13:21:47 +02:00
Rodrigo Kumpera a202966a31 Call jay from the same directory of the source file to avoid broken #line directives. 2013-02-05 12:05:21 -05:00
Marek Safar 9a8e03aca0 Add missing assembly references to test targets 2012-04-05 19:00:07 +01:00
Marek Safar eaf5222c10 Dist more test files 2012-03-29 10:10:51 +01:00
Atsushi Eno fe6e513cf7 Revert previous XPath fix. Fix is rather needed in XPathNodeIterator.GetEnumerator().
The thing is, XPathNodeIterator itself is stateful and does not behave
like IEnumerable, thus GetEnumerator() should not iterate nodes within
*itself*. Rather, it should have returned a clone of it.

After all we didn't have to damage performance to fix bug #3705, which is nice.
2012-03-08 18:11:30 +09:00
Miguel de Icaza 07b6638343 Apply patch from Tom Hindle to fix ##2893 and add a test case.
The serializer interpreted was broken, but the compiled version was fine,
running MONO_XMLSERIALIZER_THS=0 allowed this to run
2012-01-14 15:35:45 -05:00
Chris Toshok 058515940f prepend $(CURDIR) to jay input files so that the debugging info references the right .jay 2011-08-30 17:06:03 -07:00
Marek Safar 49b0253a7f Switch to single mcs compiler for all managed code build 2010-12-16 09:59:39 +00:00
Jb Evain b3f3ef56c8 rename net_2_1 to moonlight
svn path=/trunk/mcs/; revision=153638
2010-03-16 08:32:37 +00:00
Marek Safar 93438ca9f3 Stop messing with profile names.
svn path=/trunk/mcs/; revision=143203
2009-10-01 19:57:24 +00:00
Marek Safar 274688d438 Link simple and 2.0 bootrap profiles
svn path=/trunk/mcs/; revision=143199
2009-10-01 18:58:24 +00:00
Marek Safar 66031f0a52 Use bootcompiler for basic
svn path=/trunk/mcs/; revision=143180
2009-10-01 17:39:40 +00:00
Jb Evain 561bf6b6b2 bring a net_2_0 feature set to monotouch
svn path=/trunk/mcs/; revision=140606
2009-08-25 10:18:20 +00:00
Sebastien Pouliot ed14746bea Makefile: Add missing Test/XmlFiles/496192.x* files to dist
svn path=/trunk/mcs/; revision=132788
2009-04-27 21:17:06 +00:00
Marek Safar 2be4aa8ed9 Warnings cleanup
svn path=/trunk/mcs/; revision=111842
2008-08-28 17:11:51 +00:00
Atsushi Eno dad3095d01 2008-05-22 Atsushi Enomoto <[email protected]>
* XslCompiledTransform.cs : in XmlWriterSettings, use
	  ConformanceLevel.Fragment to allow fragment output.
	  In Transform(string,string), use TextWriter output instead of
	  XmlWriter to control xml declaration output.
	  Fixed bug #391424.

	* XslTransformTests.cs : added test for bug #391424.

	* 391424.xml, 391424.xsl : new test files.

	* Makefile : more simplification (and I forgot the syntax again :/)


svn path=/trunk/mcs/; revision=103783
2008-05-22 13:45:29 +00:00
Atsushi Eno d24de5e71b 2008-05-22 Atsushi Enomoto <[email protected]>
* resolveUriSchema.xsd : forgot to add.

	* Makefile : EXTRA_DISTFILES is becoming messy, so simplify it.


svn path=/trunk/mcs/; revision=103780
2008-05-22 13:39:14 +00:00
Jb Evain 301984b648 merge 99630:99762
svn path=/branches/jb/ml2/mcs/; revision=99763
2008-04-03 16:15:50 +00:00
Atsushi Eno 82d014295d 2008-04-02 Atsushi Enomoto <[email protected]>
* XsdParticleValidationState.cs : a choice with only empty particle
	  children is emptiable. Fixed bug #376395.

	* XsdValidatingReaderTests.cs : added test for bug #376395.

	* 376395.xml, 376395.xsd : new test files.

	* Makefile : extra distfiles (376395.xml, 376395.xsd).


svn path=/trunk/mcs/; revision=99679
2008-04-02 20:01:31 +00:00
Jb Evain 48ce09af1f 2008-03-26 Jb Evain <[email protected]>
* net_2_1_bootstrap_System.Xml.dll.sources,
	* net_2_1_raw_System.Xml.dll.sources,
	* Makefile:
		Files for the SL2 version of System.Xml.


svn path=/branches/jb/ml2/mcs/; revision=99037
2008-03-26 15:33:36 +00:00
Atsushi Eno 5691ba237b 2008-02-19 Atsushi Enomoto <[email protected]>
* XmlSchema.cs : Do recursively process xs:include inside included
	  schemas. Fixed bug #361818.

	* XmlSchemaTests.cs: added test for bug #361818.

	* 361818.xsd, 361818-2.xsd, 361818-3.xsd : new test files.

	* Makefile : extra distfiles (361818*.xsd).


svn path=/trunk/mcs/; revision=96159
2008-02-19 15:59:12 +00:00
Atsushi Eno ea43bd0eb7 2008-02-04 Atsushi Enomoto <[email protected]>
* XmlSchemaValidator.cs : added couple of null argument check.
	  Do not depend on XmlSchemaInfo to retrieve attribute value (it
	  could be null).
	  Do not practically validate attribute when it is not in validating
	  state (i.e. inside xs:any). Fixed bug #358408.

	* XmlSchemaValidatorTests.cs : new. Test for bug #358408.

	* 358408.xsd : new test file.

	* System.Xml_test.dll.sources : added XmlSchemaValidatorTests.cs.
	* Makefile : extra distfiles (358408.xsd).


svn path=/trunk/mcs/; revision=94729
2008-02-04 08:49:05 +00:00
Atsushi Eno 8c2db129dd 2007-10-31 Atsushi Enomoto <[email protected]>
* XsdValidatingReader.cs : r68046 didn't really fix the issue.
	  Enabled the actual fix. and fixed bug #336625.

	* XsdValidatingReaderTests.cs : added test for #336625.

	* 336625.xsd : new test file.

	* Makefile : extra distfiles (336625.xsd).


svn path=/trunk/mcs/; revision=88537
2007-10-31 07:39:02 +00:00
Atsushi Eno f34e30d372 2007-09-21 Atsushi Enomoto <[email protected]>
* GenericOutputter.cs : fixed possible conflict for auto-filled
	  attribute prefixes. Fixed bug #325482.

	* XslTransformTests.cs : added test for bug #325482.

	* 325482.xml, 325482.xsl : new test files.

	* Makefile : extra distfiles (325482.xml / 325482.xsl).


svn path=/trunk/mcs/; revision=86132
2007-09-21 09:58:53 +00:00
Atsushi Eno 32f6484459 2007-08-21 Atsushi Enomoto <[email protected]>
* MapCodeGenerator.cs : avoid possible duplicates in generated field 
	  names. Fixed bug #82078.

	* XmlCodeExporterTests.cs : test for bug #82078.

	* 82078.xsd : new test file.

	* Makefile : extra distfiles (82078.xsd).


svn path=/trunk/mcs/; revision=84531
2007-08-21 09:24:42 +00:00
Atsushi Eno ecd315b204 2007-08-21 Atsushi Enomoto <[email protected]>
* XslFunctions.cs : fix wrong unboxing in extension functions.
	  Fixed bug #82493.

	* XslTransformTests.cs : added test for bug #82493.

	* 82394.xml, 82493.xsl : new test files.

	* Makefile : extra distfiles (82493.xml/.xsl).


svn path=/trunk/mcs/; revision=84526
2007-08-21 06:56:09 +00:00
Atsushi Eno b6cbab331e 2007-08-02 Atsushi Enomoto <[email protected]>
* XmlSchemaComplexType.cs,
	  XmlSchemaComplexContentRestriction.cs :
	  in Validate(), every descendant item in complexType must be first
	  validated before getting GetOptimizedParticle(), or it could result
	  in wrong content particle. Fixed bug #82010.

	* XsdValidatingReaderTests.cs : test for bug #82010.

	* 82010.xsd, 82010.xml : new test files.

	* Makefile : extra distfiles (82010.xml/.xsd).


svn path=/trunk/mcs/; revision=83272
2007-08-02 09:21:06 +00:00
Atsushi Eno 0208465123 2007-04-24 Atsushi Enomoto <[email protected]>
* XmlSchema.cs XmlSchemaGroup.cs XmlSchemaAny.cs XmlSchemaElement.cs
	  XmlSchemaNotation.cs XmlSchemaComplexType.cs
	  XmlSchemaAttributeGroup.cs XmlSchemaSimpleType.cs
	  XmlSchemaIdentityConstraint.cs XmlSchemaAnyAttribute.cs
	  XmlSchemaRedefine.cs XmlSchemaAttribute.cs :
	  avoid incorrect compilation of included schemas, fixed bug #81360.
	  more fix for wrong targetNamespace propagation within current
	  processing model. Replaced ParentIsSchema field with a property.

	* XsdValidatingReaderTests.cs : added test for bug #81360.

	* 81360.xsd, 81360inc1.xsd, 81360inc2.xsd : new test files.

	* Makefile : added distfiles.


svn path=/trunk/mcs/; revision=76184
2007-04-24 12:40:40 +00:00
Atsushi Eno 732496f334 2006-11-01 Atsushi Enomoto <[email protected]>
* Makefile : Now it supports (and expects) cyclic build. You need
	  another System.XML iteration in mcs/class/Makefile.
	* System.Xml.dll.sources : moved extension classes, added config and
	  XmlSchemaEnumerator.cs and removed IXmlSerializerImplementation.cs.


svn path=/branches/atsushi/mcs/; revision=67234
2006-11-01 20:02:15 +00:00
Wade Berrier 4a1ab19431 * Makefile: remove README, Mono.System.XML.csproj,
Mono.System.XML.sln from EXTRA_DIST to fix make dist


svn path=/trunk/mcs/; revision=67153
2006-10-30 22:10:52 +00:00
Atsushi Eno acfc823f15 2006-10-27 Atsushi Enomoto <[email protected]>
* XsdValidatingReader.cs : Fixed bug #79650. Enumeration facet was
	  not validated for attributes. Also, simple type restriction should
	  require namespace manager to resolve QNames.

	* XmlSchemaSimpleTypeRestriction.cs : for facet validation, it should
	  use namespacemanager. Though the change is not perfect, thus I
	  disable this change for now.

	* XmlValidatingReaderTests.cs : added bug #79650 case.

	* 79650.xsd : added test for bug #79650.

	* Makefile : added 79650.xsd to dist file.


svn path=/trunk/mcs/; revision=67031
2006-10-27 15:12:25 +00:00
Atsushi Eno bf12cc0a6d 2006-10-27 Atsushi Enomoto <[email protected]>
* DTDReader.cs : some parameter entity expansions were not done.
	  Fixed bug #79683.

	* 79683.dtd : added for bug #79683.

	* XmlTextReaderTests.cs : added bug #79683 case.

	* Makefile : added 79683.dtd to dist file.


svn path=/trunk/mcs/; revision=67025
2006-10-27 13:14:25 +00:00
Zoltan Varga 943aeb0cf9 2006-10-22 Zoltan Varga <[email protected]>
* Makefile (EXTRA_DISTFILES): Add some missing test files.

svn path=/trunk/mcs/; revision=66871
2006-10-22 09:36:58 +00:00
Raja R Harinath 147ff02e8f Also distribute 77687inc.xsd
svn path=/trunk/mcs/; revision=61790
2006-06-16 08:13:05 +00:00
Raja R Harinath 5492fe75f4 Add more files to the tarball.
svn path=/trunk/mcs/; revision=61748
2006-06-15 09:16:16 +00:00
Raja R Harinath d10e0c36d9 some more stealth whitespace
svn path=/trunk/mcs/; revision=61746
2006-06-15 07:27:43 +00:00
Miguel de Icaza 1486188820 Add missing files to get the XML tests running
svn path=/trunk/mcs/; revision=61742
2006-06-15 05:13:06 +00:00
Konstantin Triger 4c1926cc71 java profile reference change
svn path=/trunk/mcs/; revision=53754
2005-12-01 10:19:17 +00:00
Andrew Skiba a9d0cb9c98 * Makefile: add java build profile
* System.Xml.vmwcsproj: replace XmlNodeReader.cs with XmlNodeReader2.cs
	and XslDecimalFormat.cs with XslDecimalFormat.jvm.cs
	* net_1_1_java_System.Xml.dll.exclude.sources,
	net_1_1_java_System.dll.sources: add source lists for java profile

svn path=/trunk/mcs/; revision=53014
2005-11-14 13:32:36 +00:00
Atsushi Eno 8b5cdb6619 2005-09-21 Atsushi Enomoto <[email protected]>
* Makefile : shut down CS0642 noise.
	* System.Xml.dll.sources : added XmlOutputMethod.

	* XmlOutputMethod.cs : new file.
	* XmlWriter.cs, XmlValidatingReader.cs, XmlReaderSettings.cs,
	  XmlUrlResolver.cs, XmlWriterSettings.cs :
	  more NET_2_0 updates.


svn path=/trunk/mcs/; revision=50353
2005-09-21 03:35:52 +00:00
Sebastien Pouliot 88d4de5a43 2005-08-31 Sebastien Pouliot <[email protected]>
* Makefile: /unsafe isn't required to build System.Xml.
	* System.Xml_test.dll.sources: Added new CAS unit tests.


svn path=/trunk/mcs/; revision=49180
2005-08-31 13:13:58 +00:00
Miguel de Icaza b0f15ee596 Bring a wave of decency to these Makefiles
svn path=/trunk/mcs/; revision=47762
2005-07-27 17:44:56 +00:00