Changeset 500 in ProjectBuilder for devel/pb/lib/ProjectBuilder/Filter.pm
- Timestamp:
- Aug 3, 2008, 1:20:30 PM (16 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
devel/pb/lib/ProjectBuilder/Filter.pm
r499 r500 139 139 my $destfile=shift; 140 140 my $pb=shift; 141 my %pb = %$pb;142 141 143 142 pb_log(2,"DEBUG: From $f to $destfile\n"); … … 149 148 foreach my $s (keys %filter) { 150 149 # Process single variables 151 pb_log(2,"DEBUG filter{$s}: $filter{$s}\n");152 150 my $tmp = $filter{$s}; 153 151 next if (not defined $tmp); 152 pb_log(3,"DEBUG filter{$s}: $filter{$s}\n"); 154 153 # Expand variables if any single one found 155 pb_log(2,"DEBUG tmp: $tmp\n");156 154 if ($tmp =~ /\$/) { 155 # Order is important as we need to handle hashes refs before simple vars 156 eval { $tmp =~ s/(\$\w+-\>\{\'\w+\'\})/$1/eeg }; 157 157 eval { $tmp =~ s/(\$\w+)/$1/eeg }; 158 158 eval { $tmp =~ s/(\$\/)/$1/eeg }; 159 159 # special case for ChangeLog only for pb 160 160 } elsif (($s =~ /^PBLOG$/) && ($line =~ /^PBLOG$/)) { 161 my $p = $pb{'defpkgdir'}->{$pbpkg}; 162 $p = $pb{'extpkgdir'}->{$pbpkg} if (not defined $p); 163 pb_changelog($pb{'dtype'}, $pb{'pkg'}, $pb{'ver'}, $pb{'tag'}, $pb{'suf'}, $p, \*DEST, $tmp, $pb{'chglog'}); 161 pb_log(3,"DEBUG filtering PBLOG\n"); 162 my $p = $pb->{'defpkgdir'}->{$pb->{'pkg'}}; 163 $p = $pb->{'extpkgdir'}->{$pb->{'pkg'}} if (not defined $p); 164 pb_changelog($pb->{'dtype'}, $pb->{'pkg'}, $pb->{'ver'}, $pb->{'tag'}, $pb->{'suf'}, $p, \*DEST, $tmp, $pb->{'chglog'}); 164 165 $tmp = ""; 165 166 } elsif (($s =~ /^PBPATCHSRC$/) && ($line =~ /^PBPATCHSRC$/)) { 167 pb_log(3,"DEBUG filtering PBPATCHSRC\n"); 166 168 my $i = 0; 167 foreach my $p (sort @$pb{'patches'}) { 168 print DEST "Patch$i: $p\n"; 169 foreach my $p (split(/,/,$pb->{'patches'}->{$pb->{'tuple'}})) { 170 print DEST "Patch$i: ".basename($p).".gz\n"; 171 $i++; 169 172 } 170 173 $tmp = ""; 171 174 } elsif (($s =~ /^PBPATCHCMD$/) && ($line =~ /^PBPATCHCMD$/)) { 175 pb_log(3,"DEBUG filtering PBPATCHCMD\n"); 172 176 my $i = 0; 173 foreach my $p (sort @$pb{'patches'}) { 174 print DEST "%patch$i\n"; 177 foreach my $p (split(/,/,$pb->{'patches'}->{$pb->{'tuple'}})) { 178 print DEST "%patch$i -p1\n"; 179 $i++; 175 180 } 176 181 print DEST "\n"; … … 204 209 my $destfile=shift; 205 210 my $pb=shift; 206 my %pb = %$pb;207 211 208 212 my $cp = "$ENV{'PBTMP'}/".basename($destfile); 209 copy($destfile,$cp) || die "Unable to c reate$cp";213 copy($destfile,$cp) || die "Unable to copy $destfile to $cp"; 210 214 211 215 pb_filter_file($cp,$ptr,$destfile,$pb);
Note:
See TracChangeset
for help on using the changeset viewer.