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

Comparing COMP/SCRAM/src/BuildSystem/ToolManager.pm (file contents):
Revision 1.20 by muzaffar, Fri Jan 14 17:36:42 2011 UTC vs.
Revision 1.23 by muzaffar, Tue Feb 7 13:31:35 2012 UTC

# Line 3 | Line 3
3   #____________________________________________________________________
4   #  
5   # Author: Shaun Ashby <Shaun.Ashby@cern.ch>
6 – # Update: 2003-11-12 15:04:16+0100
7 – # Revision: $Id$
8 – #
6   # Copyright: 2003 (C) Shaun Ashby
7   #
8   #--------------------------------------------------------------------
# Line 40 | Line 37 | sub init ()
37     $self->{topdir}=$projectarea->location();
38     $self->{configdir}=$self->{topdir}."/".$projectarea->configurationdir();
39     $self->{archstore}=$projectarea->archdir();
40 <   $self->{toolcache}=$self->{configdir}."/toolbox/".$projectarea->arch()."/tools";
40 >   $self->{toolcache}=$self->{configdir}."/toolbox/$ENV{SCRAM_ARCH}/tools";
41     $self->name($projectarea->toolcachename());
42     $self->dirty();
43     }
# Line 138 | Line 135 | sub setupself()
135     else
136        {
137        scramlogdump();
138 <      print "\n";
139 <      print "SCRAM: No file config/Self.xml...nothing to do.";
140 <      print "\n";
138 >      print STDERR "\n";
139 >      print STDERR "SCRAM: No file config/Self.xml...nothing to do.";
140 >      print STDERR "\n";
141        return;
142        }
143     }
# Line 261 | Line 258 | sub _toolsdata_scram()
258     $cache=$self->{SETUP}{$tool}{$cache};
259     if (!-d $cache)
260        {
261 <      print "ERROR: Release area \"$cache\" for \"$tool\" is not available.\n";
261 >      print STDERR "ERROR: Release area \"$cache\" for \"$tool\" is not available.\n";
262        return $order;
263        }
264     my $area=Configuration::ConfigArea->new();
# Line 269 | Line 266 | sub _toolsdata_scram()
266     my $cachefile=$area->toolcachename();
267     if (!-f $cachefile)
268        {
269 <      print "ERROR: Tools cache file for release area \"$cache\" is not available.\n";
269 >      print STDERR "ERROR: Tools cache file for release area \"$cache\" is not available.\n";
270        return $order;
271        }
272     $cache=&Cache::CacheUtilities::read($cachefile);

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines