[Dotgnu-pnet-commits] CVS: pnet/csant csant.c,1.6,1.7 csant_build.c,1.5,1.6 csant_cscc.c,1.15,1.16 csant_defs.h,1.6,1.7 csant_task.c,1.6,1.7

[Rhys Weatherley <address@hidden>]

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

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


Add the "-c" option to csant, which forces <csc> tags to be interpreted
as <compile> tags.


Index: csant.c
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/csant/csant.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** csant.c     22 Jul 2002 09:00:33 -0000      1.6
--- csant.c     31 Jan 2003 08:02:57 -0000      1.7
***************
*** 87,90 ****
--- 87,94 ----
                "--silent               or -s",
                "Do not print the names of commands as they are executed."},
+       {"-c", 'c', 0, 0, 0},
+       {"--csc-redirect", 'c', 0,
+               "--csc-redirect         or -c",
+               "Treat <csc> tags as <compile> tags (for NAnt compatibility)."},
        {"--quiet", 's', 0, 0, 0},
        {"-C", 'C', 1, 0, 0},
***************
*** 188,191 ****
--- 192,201 ----
                        {
                                CSAntSilent = 1;
+                       }
+                       break;
+ 
+                       case 'c':
+                       {
+                               CSAntRedirectCsc = 1;
                        }
                        break;

Index: csant_build.c
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/csant/csant_build.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** csant_build.c       22 Jul 2002 09:00:33 -0000      1.5
--- csant_build.c       31 Jan 2003 08:02:57 -0000      1.6
***************
*** 28,31 ****
--- 28,32 ----
  int   CSAntKeepGoing   = 0;
  int   CSAntSilent      = 0;
+ int   CSAntRedirectCsc = 0;
  int   CSAntDummyDoc    = 0;
  char *CSAntCompiler    = 0;

Index: csant_cscc.c
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/csant/csant_cscc.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** csant_cscc.c        16 Dec 2002 05:22:22 -0000      1.15
--- csant_cscc.c        31 Jan 2003 08:02:57 -0000      1.16
***************
*** 466,491 ****
  
        /* Collect up additional arguments */
!       node = task->taskChildren;
!       while(node != 0)
        {
!               if(!strcmp(node->name, "arg"))
                {
!                       /* Does this argument only apply to a specific 
compiler? */
!                       value = CSAntTaskParam(node, "compiler");
!                       if(!value || !ILStrICmp(value, compilerName))
                        {
!                               value = CSAntTaskParam(node, "value");
!                               if(value)
                                {
!                                       copyValue = ILDupString(value);
!                                       if(!copyValue)
                                        {
!                                               CSAntOutOfMemory();
                                        }
-                                       AddArg(&(args->args), &(args->numArgs), 
copyValue);
                                }
                        }
                }
-               node = node->next;
        }
  
--- 466,494 ----
  
        /* Collect up additional arguments */
!       if(!CSAntRedirectCsc)
        {
!               node = task->taskChildren;
!               while(node != 0)
                {
!                       if(!strcmp(node->name, "arg"))
                        {
!                               /* Does this argument only apply to a specific 
compiler? */
!                               value = CSAntTaskParam(node, "compiler");
!                               if(!value || !ILStrICmp(value, compilerName))
                                {
!                                       value = CSAntTaskParam(node, "value");
!                                       if(value)
                                        {
!                                               copyValue = ILDupString(value);
!                                               if(!copyValue)
!                                               {
!                                                       CSAntOutOfMemory();
!                                               }
!                                               AddArg(&(args->args), 
&(args->numArgs), copyValue);
                                        }
                                }
                        }
+                       node = node->next;
                }
        }
  
***************
*** 975,988 ****
  int CSAntTask_Csc(CSAntTask *task)
  {
!       CSAntCompileArgs args;
! 
!       /* Parse the arguments */
!       if(!ParseCompileArgs(task, &args, 1, "csc"))
        {
!               return 0;
        }
  
!       /* Execute the command */
!       return BuildAndExecute(&args, BuildCscCommandLine);
  }
  
--- 978,999 ----
  int CSAntTask_Csc(CSAntTask *task)
  {
!       if(CSAntRedirectCsc)
        {
!               /* Redirect NAnt-style <csc> tags to the <compile> 
functionality */
!               return CSAntTask_Compile(task);
        }
+       else
+       {
+               CSAntCompileArgs args;
  
!               /* Parse the arguments */
!               if(!ParseCompileArgs(task, &args, 1, "csc"))
!               {
!                       return 0;
!               }
! 
!               /* Execute the command */
!               return BuildAndExecute(&args, BuildCscCommandLine);
!       }
  }
  

Index: csant_defs.h
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/csant/csant_defs.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** csant_defs.h        13 Dec 2002 11:24:46 -0000      1.6
--- csant_defs.h        31 Jan 2003 08:02:57 -0000      1.7
***************
*** 39,42 ****
--- 39,43 ----
  extern int   CSAntKeepGoing;
  extern int   CSAntSilent;
+ extern int   CSAntRedirectCsc;
  extern int   CSAntDummyDoc;
  extern char *CSAntCompiler;

Index: csant_task.c
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/csant/csant_task.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** csant_task.c        31 Jan 2003 05:40:21 -0000      1.6
--- csant_task.c        31 Jan 2003 08:02:57 -0000      1.7
***************
*** 279,282 ****
--- 279,286 ----
                argv[argc++] = "-s";
        }
+       if(CSAntRedirectCsc)
+       {
+               argv[argc++] = "-c";
+       }
        argv[argc++] = "-C";
        argv[argc++] = (char *)compiler;