ViewVC Help

View File | Revision Log | Show Annotations | Root Listing

root/cvsroot/COMP/SCRAM/src/BuildSystem/ToolData.pm

Comparing COMP/SCRAM/src/BuildSystem/ToolData.pm (file contents):
Revision 1.7 by sashby, Wed Jul 20 13:33:48 2005 UTC vs.
Revision 1.8 by sashby, Mon Sep 11 14:53:39 2006 UTC

#	Line 324 | Line 324 | sub addreleasetoself()
324
325		foreach my $libdir (@locallibdirs)
326		{
327	<	# Convert LOCAL to RELEASE top:
328	<	$libdir =~ s/$ENV{LOCALTOP}/$ENV{RELEASETOP}/g;
327	>	# Convert LOCAL to RELEASE top, quoting the LOCALTOP
328	>	# value in case funny characters have been used (e.g. ++):
329	>	$libdir =~ s/\Q$ENV{LOCALTOP}\E/$ENV{RELEASETOP}/g;
330		push(@$relldir, $libdir);
331		}
332
#	Line 334 | Line 335 | sub addreleasetoself()
335
336		foreach my $incdir (@localincdirs)
337		{
338	<	# Convert LOCAL to RELEASE top:
339	<	$incdir =~ s/$ENV{LOCALTOP}/$ENV{RELEASETOP}/g;
338	>	# Convert LOCAL to RELEASE top, quoting the LOCALTOP
339	>	# value in case funny characters have been used (e.g. ++):
340	>	$incdir =~ s/\Q$ENV{LOCALTOP}\E/$ENV{RELEASETOP}/g;
341		push(@$relinc, $incdir);
342		}
343
#	Line 360 | Line 362 | sub addreleasetoself()
362		# Process the values for this path:
363		foreach my $rtpath (@PATHS)
364		{
365	<	$rtpath =~ s/$ENV{LOCALTOP}/$ENV{RELEASETOP}/g;
365	>	$rtpath =~ s/\Q$ENV{LOCALTOP}\E/$ENV{RELEASETOP}/g;
366		push(@$RELPATHS,$rtpath);
367		}
368

Diff Legend

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