[Dotgnu-pnet-commits] CVS: pnet/csant csant.c,1.8,1.9 csant_build.c,1.6,1.7 csant_cscc.c,1.17,1.18 csant_defs.h,1.7,1.8 csant_task.c,1.8,1.9

[Rhys Weatherley <address@hidden>]

Update of /cvsroot/dotgnu-pnet/pnet/csant
In directory subversions:/tmp/cvs-serv29813/csant

Modified Files:
        csant.c csant_build.c csant_cscc.c csant_defs.h csant_task.c 
Log Message:


Add the "-m" option to "csant", which forces the use of "-fstdlib-name=corlib"
when building Mono libraries.


Index: csant.c
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/csant/csant.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** csant.c     3 Feb 2003 09:35:56 -0000       1.8
--- csant.c     27 Feb 2003 07:27:27 -0000      1.9
***************
*** 91,94 ****
--- 91,98 ----
                "--csc-redirect         or -c",
                "Treat <csc> tags as <compile> tags (for NAnt compatibility)."},
+       {"-m", 'm', 0, 0, 0},
+       {"--mono-corlib", 'c', 0,
+               "--mono-corlib          or -m",
+               "Use Mono's corlib instead of mscorlib during C# compiles."},
        {"--quiet", 's', 0, 0, 0},
        {"-C", 'C', 1, 0, 0},
***************
*** 198,201 ****
--- 202,211 ----
                        {
                                CSAntRedirectCsc = 1;
+                       }
+                       break;
+ 
+                       case 'm':
+                       {
+                               CSAntForceCorLib = 1;
                        }
                        break;

Index: csant_build.c
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/csant/csant_build.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** csant_build.c       31 Jan 2003 08:02:57 -0000      1.6
--- csant_build.c       27 Feb 2003 07:27:27 -0000      1.7
***************
*** 30,33 ****
--- 30,34 ----
  int   CSAntRedirectCsc = 0;
  int   CSAntDummyDoc    = 0;
+ int   CSAntForceCorLib = 0;
  char *CSAntCompiler    = 0;
  

Index: csant_cscc.c
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/csant/csant_cscc.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -r1.17 -r1.18
*** csant_cscc.c        31 Jan 2003 10:57:15 -0000      1.17
--- csant_cscc.c        27 Feb 2003 07:27:27 -0000      1.18
***************
*** 630,633 ****
--- 630,639 ----
        }
  
+       /* Add "-fstdlib-name=corlib" if forced to do so */
+       if(CSAntForceCorLib)
+       {
+               AddArg(&argv, &argc, "-fstdlib-name=corlib");
+       }
+ 
        /* Add any extra arguments that were supplied */
        for(posn = 0; posn < args->numArgs; ++posn)

Index: csant_defs.h
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/csant/csant_defs.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** csant_defs.h        31 Jan 2003 08:02:57 -0000      1.7
--- csant_defs.h        27 Feb 2003 07:27:27 -0000      1.8
***************
*** 41,44 ****
--- 41,45 ----
  extern int   CSAntRedirectCsc;
  extern int   CSAntDummyDoc;
+ extern int   CSAntForceCorLib;
  extern char *CSAntCompiler;
  extern char *CSAntBaseSrcDir;

Index: csant_task.c
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/csant/csant_task.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** csant_task.c        27 Feb 2003 00:21:52 -0000      1.8
--- csant_task.c        27 Feb 2003 07:27:27 -0000      1.9
***************
*** 236,240 ****
        const char *target;
        const char *compiler;
!       char *argv[20];
        int argc, posn;
        int result;
--- 236,240 ----
        const char *target;
        const char *compiler;
!       char *argv[40];
        int argc, posn;
        int result;
***************
*** 286,289 ****
--- 286,293 ----
        {
                argv[argc++] = "-c";
+       }
+       if(CSAntForceCorLib)
+       {
+               argv[argc++] = "-m";
        }
        argv[argc++] = "-C";