[Dotgnu-pnet-commits] CVS: pnetlib/System .cvsignore,1.1,1.2 Makefile.am,1.3,1.4 System.build,1.12,1.13

[Rhys Weatherley <address@hidden>]

Update of /cvsroot/dotgnu-pnet/pnetlib/System
In directory subversions:/tmp/cvs-serv569/System

Modified Files:
        .cvsignore Makefile.am System.build 
Log Message:


Implement a two-phase build process for System.dll because of its circular
dependency on System.Xml.


Index: .cvsignore
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/System/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** .cvsignore  22 Mar 2002 05:29:26 -0000      1.1
--- .cvsignore  1 Feb 2003 07:20:29 -0000       1.2
***************
*** 3,5 ****
  .deps
  System.dll
! System_ecma.dll
--- 3,5 ----
  .deps
  System.dll
! first

Index: Makefile.am
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/System/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** Makefile.am 20 Nov 2002 00:13:16 -0000      1.3
--- Makefile.am 1 Feb 2003 07:20:29 -0000       1.4
***************
*** 1,11 ****
  
! .PHONY: System.dll
  
! all-local: System.dll
  
! System.dll:
        "$(CSANT)" $(CSANT_FLAGS) -f System.build all
  
! CLEANFILES = System.dll System_ecma.dll
  
  pnetassembliesdir = $(libdir)/cscc/lib
--- 1,29 ----
  
! ## System.dll is built in two phases, because there is a circular
! ## dependency in the System.Configuration namespace involving System.Xml.
! ##
! ## During the first phase, "first/System.dll" is built, with no dependency
! ## upon "System.Xml.dll".  After the top-level Makefile.am has finished
! ## building "System.Xml", it re-enters this directory and builds
! ## "System.dll" for real.
! ##
! ## The macro "SECOND_PASS" is used in the code to indicate definitions
! ## that can only be compiled into "System.dll" on the second pass.
  
! .PHONY: System.dll phase-one phase-two
  
! all-local: phase-one
! 
! System.dll: phase-one
! 
! phase-one:
!       test -d first || mkdir first
!       test -f first/pnetlib.here || cp pnetlib.here first/pnetlib.here
        "$(CSANT)" $(CSANT_FLAGS) -f System.build all
  
! phase-two:
!       "$(CSANT)" $(CSANT_FLAGS) -f System.build phase-two
! 
! CLEANFILES = System.dll first/System.dll first/pnetlib.here
  
  pnetassembliesdir = $(libdir)/cscc/lib

Index: System.build
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/System/System.build,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** System.build        4 Jan 2003 16:44:45 -0000       1.12
--- System.build        1 Feb 2003 07:20:29 -0000       1.13
***************
*** 3,7 ****
        <target name="all">
  
!               <!-- Build the primary System.dll library -->
                <compile output="System.dll"
                                 target="library"
--- 3,46 ----
        <target name="all">
  
!               <!-- ****************************************************** -->
!               <!-- *** See Makefile.am for some important build notes *** -->
!               <!-- ****************************************************** -->
! 
!               <!-- Build the System.dll library for the first time -->
!               <compile output="first/System.dll"
!                                target="library"
!                                unsafe="true"
!                                nostdlib="true"
!                                optimize="true"
!                                debug="true">
! 
!                       <sources>
!                               <includes name="**/*.cs"/>
!                               <excludes if="${ECMA_COMPAT}" 
!                                                       
name="Text/RegularExpressions/*.cs"/>
!                               <excludes if="${ECMA_COMPAT}" 
name="Diagnostics/*.cs"/>
!                       </sources>
! 
!                       <references>
!                               <file name="../runtime/mscorlib.dll"/>
!                       </references>
! 
!                       <resources>
!                               <file 
name="../resources/en_US/System/System.resources"/>
!                       </resources>
! 
!                       <arg compiler="cscc" value="-Wno-empty-input"/>
!                       <arg compiler="csc" value="/nowarn:626"/>
!                       <arg compiler="csc" value="/nowarn:649"/>
!                       <arg compiler="csc" value="/nowarn:168"/>
!                       <arg compiler="csc" value="/nowarn:67"/>
!                       <arg compiler="csc" value="/nowarn:169"/>
!               </compile>
! 
!       </target>
! 
!       <target name="phase-two">
! 
!               <!-- Build the actual System.dll library -->
                <compile output="System.dll"
                                 target="library"
***************
*** 11,14 ****
--- 50,56 ----
                                 debug="true">
  
+                       <!-- temporarily removed until recursion works -->
+                       <!-- <define name="SECOND_PASS" value="true"/> -->
+ 
                        <sources>
                                <includes name="**/*.cs"/>
***************
*** 19,22 ****
--- 61,67 ----
  
                        <references>
+                               <!-- temporarily removed until recursion works 
-->
+                               <!-- <file 
name="../System.Xml/System.Xml.dll"/> -->
+                               <!-- <file name="first/System.dll"/> -->
                                <file name="../runtime/mscorlib.dll"/>
                        </references>