common/tools/populateziptemplate.pl
changeset 956 72efe73cb3cf
parent 954 223bb18a2f3c
equal deleted inserted replaced
955:28714977dccb 956:72efe73cb3cf
    70 # For each package in CSV...
    70 # For each package in CSV...
    71 foreach my $package (@packages)
    71 foreach my $package (@packages)
    72 {
    72 {
    73 	warn "Warning: Package $package->{dst} does not appear on the local system\n" unless -d $package->{dst};
    73 	warn "Warning: Package $package->{dst} does not appear on the local system\n" unless -d $package->{dst};
    74 	$package->{dst} =~ s{^/}{}g;
    74 	$package->{dst} =~ s{^/}{}g;
    75 	if ($package->{source} =~ m{/(sfl|oss)/(MCL|FCL)/(sf|sftools|interim)/(([^/]+)/)?([^/]+)?})
    75 	if ($package->{source} =~ m{/(sfl|oss)/(MCL|FCL)/(sf|utilities|sftools|interim)/(([^/]+)/)?([^/]+)?})
    76 	{
    76 	{
    77 		my ($license, $codeline, $thingy, $layer, $packageName) = ($1, $2, $3, $5, $6);
    77 		my ($license, $codeline, $thingy, $layer, $packageName) = ($1, $2, $3, $5, $6);
    78 		# $thingy is the part of the path after the codeline. For
    78 		# $thingy is the part of the path after the codeline. For
    79 		# platform packages, it's "sf". For the utilities package, it's
    79 		# platform packages, it's "sf". For the utilities package, it's
    80 		# "sftools".
    80 		# "sftools", or "utilities, depending on the URL used to
       
    81 		# obtain it.
    81 		#
    82 		#
    82 		# I can't think of anything to describe this item, hence $thingy
    83 		# I can't think of anything to describe this item, hence $thingy
    83 		if ($thingy eq "sftools")
    84 		if ($thingy eq "utilities")
       
    85 		{
       
    86 			$layer = "tools";
       
    87 			$packageName = "utilities";
       
    88 		}
       
    89 		elsif ($thingy eq "sftools")
    84 		{
    90 		{
    85 			$layer = "tools";
    91 			$layer = "tools";
    86 		}
    92 		}
    87 		elsif ($thingy eq "interim")
    93 		elsif ($thingy eq "interim")
    88 		{
    94 		{