[Dotgnu-pnet-commits] pnet/csant csant_cscc.c,1.22,1.23

[Rhys Weatherley <address@hidden>]

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

Modified Files:
        csant_cscc.c 
Log Message:


Perform the "newer" check for <resgen> and <reslink>.


Index: csant_cscc.c
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/csant/csant_cscc.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** csant_cscc.c        11 Nov 2003 04:46:03 -0000      1.22
--- csant_cscc.c        11 Nov 2003 07:13:39 -0000      1.23
***************
*** 1068,1077 ****
  
        /* Check the timestamps on the input and output files */
!       if(!CSAntFileSetNewer(args->sources, args->output) &&
!          !CSAntFileSetNewer(args->references, args->output) &&
!          !CSAntFileSetNewer(args->resources, args->output) &&
!          !CSAntFileSetNewer(args->modules, args->output))
        {
!               return 1;
        }
  
--- 1068,1080 ----
  
        /* Check the timestamps on the input and output files */
!       if(!CSAntInstallMode && !CSAntUninstallMode)
        {
!               if(!CSAntFileSetNewer(args->sources, args->output) &&
!                  !CSAntFileSetNewer(args->references, args->output) &&
!                  !CSAntFileSetNewer(args->resources, args->output) &&
!                  !CSAntFileSetNewer(args->modules, args->output))
!               {
!                       return 1;
!               }
        }
  
***************
*** 1403,1406 ****
--- 1406,1416 ----
        }
  
+       /* Bail out if none of the input files are newer than the output */
+       if(!CSAntFileSetNewer(inputs, output))
+       {
+               CSAntFileSetDestroy(inputs);
+               return 1;
+       }
+ 
        /* Determine if we should use Latin1 conversion */
        compiler = CSAntGetProperty("csant.compiler", -1);
***************
*** 1501,1504 ****
--- 1511,1524 ----
                fprintf(stderr, "%s: no resource files specified\n", 
task->name);
                return 0;
+       }
+ 
+       /* Bail out if none of the input files are newer than the output */
+       if(!CSAntInstallMode && !CSAntUninstallMode)
+       {
+               if(!CSAntFileSetNewer(resources, output))
+               {
+                       CSAntFileSetDestroy(resources);
+                       return 1;
+               }
        }