ViewVC Help
View File | Revision Log | Show Annotations | Root Listing
root/cvsroot/COMP/SCRAM/src/Configuration/ConfigArea.pm
(Generate patch)

Comparing COMP/SCRAM/src/Configuration/ConfigArea.pm (file contents):
Revision 1.24 by sashby, Wed Feb 2 11:10:17 2005 UTC vs.
Revision 1.29 by sashby, Thu Mar 10 12:39:28 2005 UTC

# Line 311 | Line 311 | sub sitename
311     return $self->{sitename};
312     }
313  
314 + sub admindir()
315 +   {
316 +   my $self=shift;
317 +  
318 +   @_ ? $self->{admindir} = shift
319 +      : $self->{admindir};
320 +   }
321  
322   sub bootstrapfromlocation {
323          my $self=shift;
# Line 491 | Line 498 | sub copysetup {
498          return $rv;
499   }
500  
501 + sub copyurlcache {
502 +        my $self=shift;
503 +        my $dest=shift;
504 +        my $rv=1;
505 +        # copy across the admin dir
506 +        my $temp=$self->location()."/".$self->{admindir}."/cache";
507 +        my $temp2=$dest."/".$self->{admindir}."/cache";
508 +        if ( $temp ne $temp2 ) {
509 +         if ( -d $temp ) {
510 +          AddDir::copydir($temp,$temp2);
511 +          $rv=0;
512 +         }
513 +        }
514 +        return $rv;
515 + }
516 +
517   sub copywithskip {
518          my $self=shift;
519          my $dest=shift;
# Line 559 | Line 582 | sub save {
582          $self->_SaveEnvFile();
583   }
584  
585 + sub reqdoc()
586 +   {
587 +   my $self=shift;
588 +   my ($path)=@_;
589 +   return $path."/".$self->{reqdoc};
590 +   }
591 +
592 + sub creationtime()
593 +   {
594 +   my $self=shift;
595 +   my ($location)= @_;
596 +   $location||=$self->location();
597 +   my $requirementsdoc = $self->reqdoc($location);
598 +   my ($mode, $time) = (stat($requirementsdoc))[2, 9];
599 +   my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = localtime($time);
600 +
601 +   ($sec < 10) ? ($sec = "0".$sec) : $sec;
602 +   ($min < 10) ? ($min = "0".$min) : $min;
603 +
604 +   $year += 1900;
605 +   my $months =
606 +      {
607 +      0 => "Jan", 1 => "Feb",
608 +      2 => "Mar", 3 => "Apr",
609 +      4 => "May", 5 => "Jun",
610 +      6 => "Jul", 7 => "Aug",
611 +      8 => "Sept", 9 => "Oct",
612 +      10 => "Nov", 11 => "Dec" };
613 +  
614 +   my $days = { 1 => "Mon", 2 => "Tue", 3 => "Wed", 4 => "Thu", 5 => "Fri", 6 => "Sat", 7 => "Sun"};
615 +  
616 +   # Return the timestamp (as string) of the requirementsdoc:
617 +   return $days->{$wday}."-".$mday."-".$months->{$mon}."-".$year." ".$hour.":".$min.":".$sec;
618 +   }
619 +
620   # ---- support routines
621  
622 < sub _SaveEnvFile {
623 <        my $self=shift;
624 <        use FileHandle;
625 <        my $fh=FileHandle->new();
626 <        open ( $fh, ">".$self->location()."/".$self->{admindir}."/".
627 <                "Environment" ) or
628 <                $self->error("Cannot Open Environment file to Save ("
629 <                                .$self->location().")\n $!");
622 > sub _SaveEnvFile
623 >   {
624 >   my $self=shift;
625 >   my $filemode = 0644;
626 >  
627 >   use FileHandle;
628 >   my $fh=FileHandle->new();
629 >   open ( $fh, ">".$self->location()."/".$self->{admindir}."/".
630 >          "Environment" ) or
631 >          $self->error("Cannot Open Environment file to Save ("
632 >                       .$self->location().")\n $!");
633          
634 <        print $fh "SCRAM_PROJECTNAME=".$self->name()."\n";
635 <        print $fh "SCRAM_PROJECTVERSION=".$self->version()."\n";
636 <        print $fh "SCRAM_CONFIGDIR=".$self->configurationdir()."\n";
637 <        print $fh "SCRAM_SOURCEDIR=".$self->sourcedir()."\n";
638 <        print $fh "SCRAM_ProjReqsDoc=".$self->{reqdoc}."\n";
639 <        print $fh "SCRAM_TOOLBOXVERSION=".$self->{toolboxversion}."\n";
579 <        if ( defined $self->linkarea() ) {
580 <          my $area=$self->linkarea()->location();
581 <          if ( $area ne "" ) {
582 <          print $fh "RELEASETOP=".$area."\n";
583 <          }
584 <        }
585 <        undef $fh;
586 < }
634 >   print $fh "SCRAM_PROJECTNAME=".$self->name()."\n";
635 >   print $fh "SCRAM_PROJECTVERSION=".$self->version()."\n";
636 >   print $fh "SCRAM_CONFIGDIR=".$self->configurationdir()."\n";
637 >   print $fh "SCRAM_SOURCEDIR=".$self->sourcedir()."\n";
638 >   print $fh "SCRAM_ProjReqsDoc=".$self->{reqdoc}."\n";
639 >   print $fh "SCRAM_TOOLBOXVERSION=".$self->{toolboxversion}."\n";
640  
641 +   if ( defined $self->linkarea() )
642 +      {
643 +      my $area=$self->linkarea()->location();
644 +      if ( $area ne "" )
645 +         {
646 +         print $fh "RELEASETOP=".$area."\n";
647 +         }
648 +      }
649 +  
650 +   undef $fh;
651 +  
652 +   # Set the default permissions (-rw-r--r--):
653 +   chmod $filemode, $self->location()."/".$self->{admindir}."/Environment";
654 +   }
655  
656   sub _LoadEnvFile
657     {
# Line 629 | Line 696 | sub _LoadEnvFile
696        }
697     if ( defined $self->{ENV}{"SCRAM_TOOLBOXVERSION"} )
698        {
699 <      $self->toolboxversion($self->{ENV}{"SCRAM_TOOLBOXVERSION"});
699 >      if ($self->{ENV}{"SCRAM_TOOLBOXVERSION"} eq '')
700 >         {
701 >         $self->toolboxversion("STANDALONE");
702 >         }
703 >      else
704 >         {
705 >         $self->toolboxversion($self->{ENV}{"SCRAM_TOOLBOXVERSION"});
706 >         }
707        }
708    
709     if ( ( defined $self->{ENV}{"RELEASETOP"} ) &&

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines