Changeset 315 in ProjectBuilder for devel/pb/lib/ProjectBuilder/Base.pm

Timestamp:

Feb 10, 2008, 6:40:37 AM (16 years ago)

Author:

Bruno Cornec

Message:

Backup of local dev. cms2pkg compiles but doesn't work and even remove the SVN :-(
pb_log added

File:

• devel/pb/lib/ProjectBuilder/Base.pm (modified) (41 diffs)

devel/pb/lib/ProjectBuilder/Base.pm

@@ -10 +10 @@
 use File::Basename;
 use File::Path;
+use File::Copy;
 use File::Temp qw /tempdir/;
 use Data::Dumper;
+use POSIX qw(strftime);
 
 use ProjectBuilder::Changelog qw (pb_changelog);
 
 $ENV{'PBETC'} = "$ENV{'HOME'}/.pbrc";
+
+my $debug = 0;
+my $LOG = \*STDOUT;
 
 sub pb_env_init {
@@ -24 +29 @@
 my $tag;
 
-# For the moment not dynamic
-my $debug = 0;                  # Debug level
-my $LOG = *STDOUT;              # Where to log
-
 #
 # Check project name
@@ -44 +45 @@
 #
 my ($pbconf) = pb_conf_read("$ENV{'PBETC'}","pbconf");
-print "DEBUG pbconf: ".Dumper($pbconf)."\n" if ($debug >= 1);
+pb_log(2,"DEBUG pbconf: ".Dumper($pbconf)."\n");
 
 my %pbconf = %$pbconf;
@@ -50 +51 @@
     # Take the first as the default project
     $proj = (keys %pbconf)[0];
-    if (($debug >= 0) and (defined $proj)) {
-        print $LOG "WARNING: using $proj as default project as none has been specified\n" 
-        print $LOG "Please create a pbconf reference for project $proj in $ENV{'PBETC'}\nif you want to use another project\n";
+    if (defined $proj) {
+        pb_log(2,"WARNING: using $proj as default project as none has been specified\n");
+        pb_log(2,"Please create a pbconf reference for project $proj in $ENV{'PBETC'}\nif you want to use another project\n");
     }
 }
@@ -69 +70 @@
 # Tree will look like this:
 #
-#             maint pbdir                                              dev dir (optional)
-#                  |                                                      |
-#            ------------------------                              --------------------
-#            |                      |                              |                  |
-#         pbproj1                pbproj2                        pbproj1           pbproj2
-#            |                                                     |
-#  ---------------------------------------------              ----------
-#  *      *        |       |        |          |              *        *
-# 1.0    dev    pbconf    ...     build     delivery         1.0      dev
-#                  |                |          |
-#               ------                        pbrc
+#             maint pbdir                            PBDIR               dev dir (optional)   PBDEVDIR
+#                  |                                                        |
+#            ------------------------                                --------------------
+#            |                      |                                |                  |
+#         pbproj1                pbproj2             PBPROJ       pbproj1           pbproj2   PBDEVPROJ
+#            |                                                       |
+#  ---------------------------------------------                ----------
+#  *      *        |       |        |          |                *        *
+# 1.0    dev    pbconf    ...     build     delivery PBCONF    1.0      dev                   PBDEVROOT
+#                  |                           |     PBDESTDIR
+#               ------                        pbrc   PBBUILDDIR
 #               |    |       
-#              1.0  dev     
+#              1.0  dev                              PBROOT
 #                    |
 #               ----------------------------------
@@ -101 +102 @@
 if (not defined $ENV{'PBDIR'}) {
     if (not defined ($pbdir{$ENV{'PBPROJ'}})) {
-        print $LOG "WARNING: no pbdir defined, using /var/cache\n";
-        print $LOG "Please create a pbdir reference for project $ENV{'PBPROJ'} in $ENV{'PBETC'}\nif you want to use another directory\n";
+        pb_log(2,"WARNING: no pbdir defined, using /var/cache\n");
+        pb_log(2,"Please create a pbdir reference for project $ENV{'PBPROJ'} in $ENV{'PBETC'}\nif you want to use another directory\n");
     }
     # That's always the environment variable that will be used
@@ -157 +158 @@
 
 my ($scheme, $account, $host, $port, $path) = pb_get_uri($pbconf{$ENV{'PBPROJ'}});
-my $cms = { $ENV{'PBPROJ'} => $scheme };
 
 if ((not -d "$ENV{'PBCONF'}") || (defined $pbinit)) {
-    pb_cms_checkout($cms,$pbconf{$ENV{'PBPROJ'}},$ENV{'PBCONF'});
+    pb_cms_checkout($scheme,$pbconf{$ENV{'PBPROJ'}},$ENV{'PBCONF'});
 } else {
-    my $cmsurl = pb_cms_getinfo($cms,$ENV{'PBCONF'});
+    my $cmsurl = pb_cms_getinfo($scheme,$ENV{'PBCONF'},"URL:");
     if ($cmsurl !~ /^$scheme/) {
         pb_rm_rf("$ENV{'PBCONF'}");
-        pb_cms_checkout($cms,$pbconf{$ENV{'PBPROJ'}},$ENV{'PBCONF'});
+        pb_cms_checkout($scheme,$pbconf{$ENV{'PBPROJ'}},$ENV{'PBCONF'});
     } elsif ($cmsurl ne $pbconf{$ENV{'PBPROJ'}}) {
         # The local content doesn't correpond to the repository
-        print $LOG "ERROR: Inconsistency detected:\n";
-        print $LOG "* $ENV{'PBCONF'} refers to $cmsurl but\n";
-        print $LOG "* $ENV{'PBETC'} refers to $pbconf{$ENV{'PBPROJ'}}\n";
+        pb_log(2,"ERROR: Inconsistency detected:\n");
+        pb_log(2,"* $ENV{'PBCONF'} refers to $cmsurl but\n");
+        pb_log(2,"* $ENV{'PBETC'} refers to $pbconf{$ENV{'PBPROJ'}}\n");
         die "Project $ENV{'PBPROJ'} is not Project-Builder compliant.";
     } else {
@@ -181 +181 @@
     if (! -f ("$ENV{'PBDESTDIR'}/pbrc")) {
         opendir(DIR,$ENV{'PBCONF'}) || die "Unable to open directory $ENV{'PBCONF'}: $!";
-        my maxmtime = 0;
+        my $maxmtime = 0;
         foreach my $d (readdir(DIR)) {
             next if ($d =~ /^\./);
@@ -194 +194 @@
         }
         closedir(DIR);
-        print $LOG "WARNING: no pbroot defined, using $ENV{'PBROOT'}\n";
-        print $LOG "Please -r release if you want to use another release\n";
+        pb_log(2,"WARNING: no pbroot defined, using $ENV{'PBROOT'}\n");
+        pb_log(2,"Please -r release if you want to use another release\n");
     } else {
         my ($pbroot) = pb_conf_read_if("$ENV{'PBDESTDIR'}/pbrc","pbroot");
         # That's always the environment variable that will be used
-        $ENV{'PBROOT'} = $pbroot{$ENV{'PBPROJ'}};
+        $ENV{'PBROOT'} = $pbroot->{$ENV{'PBPROJ'}};
     }
 } else {
     # transform in full path if relative
-    $ENV{'PBROOT'} = "$ENV{'PBCONF'}/$ENV{'PBROOT'}" if ($ENV{'PBROOT'} !~ |/|);
+    $ENV{'PBROOT'} = "$ENV{'PBCONF'}/$ENV{'PBROOT'}" if ($ENV{'PBROOT'} !~ /\//);
 }
 
@@ -220 +220 @@
     # Project version and tag (optional)
     my ($extpkgdir, $version, $filteredfiles, $supfiles, $pkgv, $pkgt) = pb_conf_get_if("extpkgdir","version","filteredfiles","supfiles","projver","projtag");
-    print "DEBUG: defpkgdir: ".Dumper($defpkgdir)."\n" if ($debug >= 1);
-    print "DEBUG: extpkgdir: ".Dumper($extpkgdir)."\n" if ($debug >= 1);
-    print "DEBUG: version: ".Dumper($version)."\n" if ($debug >= 1);
-    print "DEBUG: filteredfiles: ".Dumper($filteredfiles)."\n" if ($debug >= 1);
-    print "DEBUG: supfiles: ".Dumper($supfiles)."\n" if ($debug >= 1);
+    pb_log(2,"DEBUG: defpkgdir: ".Dumper($defpkgdir)."\n");
+    pb_log(2,"DEBUG: extpkgdir: ".Dumper($extpkgdir)."\n");
+    pb_log(2,"DEBUG: version: ".Dumper($version)."\n");
+    pb_log(2,"DEBUG: filteredfiles: ".Dumper($filteredfiles)."\n");
+    pb_log(2,"DEBUG: supfiles: ".Dumper($supfiles)."\n");
     # Global
     %defpkgdir = %$defpkgdir;
@@ -718 +718 @@
         pb_mkdir_p("$ENV{'PBROOT'}/pkg1/pbfilter") || die "Unable to create $ENV{'PBROOT'}/pkg1/pbfilter";
 
-        print "\nDo not to forget to commit the pbconf directory in your CMS if needed\n";
-        print "After having renamed the pkg1 directory to your package's name      \n\n";
+        pb_log(2,"\nDo not to forget to commit the pbconf directory in your CMS if needed\n");
+        pb_log(2,"After having renamed the pkg1 directory to your package's name      \n\n");
     } else {
         die "Unable to open $ENV{'PBROOT'}/$ENV{'PBPROJ'}.pb";
@@ -725 +725 @@
 }
 umask 0022;
-return($debug,$LOG, \%filteredfiles, \%supfiles, \%defpkgdir, \%extpkgdir);
+return(\%filteredfiles, \%supfiles, \%defpkgdir, \%extpkgdir);
 }
 
@@ -748 +748 @@
 my $cmt=shift || $cmd;
 
-print "$cmt... ";
+pb_log(2,"$cmt... ");
 #system("$cmd 2>&1 > $ENV{'PBTMP'}/system.log");
 system($cmd);
 if ($? == -1) {
-    print "failed to execute ($cmd) : $!\n";
+    pb_log(2,"failed to execute ($cmd) : $!\n");
     pb_display_file("$ENV{'PBTMP'}/system.log");
 } elsif ($? & 127) {
-    printf "child ($cmd) died with signal %d, %s coredump\n", ($? & 127),  ($? & 128) ? 'with' : 'without';
+    pb_log(2, "child ($cmd) died with signal ".($? & 127).", ".($? & 128) ? 'with' : 'without'." coredump\n");
     pb_display_file("$ENV{'PBTMP'}/system.log");
 } elsif ($? == 0) {
-    print "OK\n";
+    pb_log(2,"OK\n");
 } else {
-    printf "child ($cmd) exited with value %d\n", $? >> 8;
+    pb_log(2, "child ($cmd) exited with value ".($? >> 8)."\n");
     pb_display_file("$ENV{'PBTMP'}/system.log");
 }
@@ -785 +785 @@
 my @return = pb_conf_get_if(@param);
 
-die "No params found for $ENV{'PBPROJ'}" if (not defined @return);
+die "No params found for $ENV{'PBPROJ'}" if (not @return);
 
 foreach my $i (0..$#param) {
@@ -807 +807 @@
 my $p2;
 
-#print "DEBUG: param1: ".Dumper(@ptr1)."\n"; # if ($debug >= 1);
-#print "DEBUG: param2: ".Dumper(@ptr2)."\n"; # if ($debug >= 1);
+pb_log(2,"DEBUG: param1: ".Dumper(@ptr1)."\n");
+pb_log(2,"DEBUG: param2: ".Dumper(@ptr2)."\n");
 
 foreach my $i (0..$#param) {
@@ -842 +842 @@
     }
     $ptr1[$i] = $p1;
-    #print "DEBUG: param ptr1: ".Dumper(@ptr1)."\n"; # if ($debug >= 1);
+    pb_log(2,"DEBUG: param ptr1: ".Dumper(@ptr1)."\n");
 }
 return(@ptr1);
@@ -870 +870 @@
 my %h;
 
-my $debug = 0;
-
 open(CONF,$conffile) || die "Unable to open $conffile";
 while(<CONF>) {
     if (/^\s*([A-z0-9-_]+)\s+([[A-z0-9-_]+)\s*=\s*(.+)$/) {
-        print "DEBUG: 1:$1 2:$2 3:$3\n" if ($debug >= 1);
+        pb_log(2,"DEBUG: 1:$1 2:$2 3:$3\n");
         $h{$1}{$2}=$3;
     }
@@ -884 +882 @@
     push @ptr,$h{$param};
 }
-print "DEBUG: h:".Dumper(%h)." param:".Dumper(@param)." ptr:".Dumper(@ptr)."\n" if ($debug >= 1);
+pb_log(2,"DEBUG: h:".Dumper(%h)." param:".Dumper(@param)." ptr:".Dumper(@ptr)."\n");
 return(@ptr);
 }
@@ -898 +896 @@
          $uri =~ m|(?:([^:/?#]+):)?(?://([^/?#]*))?([^?#]*)(?:\?([^#]*))?(?:#(.*))?|;
 my ($account,$host,$port) = $authority =~ m|(?:([^\@]+)\@)?([^:]+)(:(?:[0-9]+))?|;
-print "DEBUG: scheme:$scheme ac:$account host:$host port:$port path:$path\n" if ($debug >= 1);
+pb_log(2,"DEBUG: scheme:$scheme ac:$account host:$host port:$port path:$path\n");
 return($scheme, $account, $host, $port, $path);
 }
@@ -907 +905 @@
 
 my $proj = shift || undef;
-my $ret;
-
-my ($cms) = pb_conf_get("cms");
-
-if ($cms->{$proj} eq "svn") {
-    $ENV{'PBREVISION'}=`(cd "$ENV{'PBROOT'}" ; svnversion .)`;
-    chomp($ENV{'PBREVISION'});
+
+# Use the project URI
+my ($uri) = pb_conf_get("pburl");
+
+# Extract values from that URI
+my ($scheme, $account, $host, $port, $path) = pb_get_uri($uri->{$ENV{'PBPROJ'}});
+
+if ($scheme =~ /^svn/) {
+    $ENV{'PBREVISION'}= pb_cms_getinfo($scheme,$uri->{$ENV{'PBPROJ'}},"Revision:");
+    #$ENV{'PBREVISION'}=`(cd "$ENV{'PBDEVDIR'}" ; svnversion .)`;
     $ENV{'PBCMSLOGFILE'}="svn.log";
-} elsif ($cms->{$proj} eq "flat") {
+} elsif (($scheme eq "file") || ($scheme eq "ftp") || ($scheme eq "http")) {
     $ENV{'PBREVISION'}="flat";
     $ENV{'PBCMSLOGFILE'}="flat.log";
-} elsif ($cms->{$proj} eq "cvs") {
+} elsif ($scheme eq "cvs") {
     # Way too slow
     #$ENV{'PBREVISION'}=`(cd "$ENV{'PBROOT'}" ; cvs rannotate  -f . 2>&1 | awk '{print \$1}' | grep -E '^[0-9]' | cut -d. -f2 |sort -nu | tail -1)`;
@@ -930 +931 @@
     $ENV{'CVS_RSH'} = $cvsrsh->{$proj} if (defined $cvsrsh->{$proj});
 } else {
-    die "cms $cms->{$proj} unknown";
-}
-return($cms);
+    die "cms $scheme unknown";
+}
+
+#
+#if (not defined $scheme) {
+    # We're an upstream guy
+    # Try to make it easy for us
+    #pb_log(2,"WARNING: Assuming a local project under $ENV{'PBDIR'}/$ENV{'PBPROJ'}:\n");
+    #pb_log(2,"If not, pleaase setup a pbproj entry in $ENV{'PBROOT'}/$ENV{'PBPROJ'}.pb\n");
+    #return("");
+#}
+
+return($scheme,$uri->{$ENV{'PBPROJ'}});
+}
+
+sub pb_get_date {
+    
+return(localtime->sec(), localtime->min(), localtime->hour(), localtime->mday(), localtime->mon(), localtime->year(), localtime->wday(), localtime->yday(), localtime->isdst());
 }
 
 sub pb_cms_export {
-my $cms = shift;
-my $pbdate = shift || undef;
+
+my $scheme = shift;
 my $source = shift;
 my $destdir = shift;
@@ -943 +959 @@
 my $tmp1;
 
-if ($cms->{$ENV{'PBPROJ'}} eq "svn") {
+my @date = pb_get_date();
+
+if ($scheme eq "svn") {
     if (-d $source) {
         $tmp = $destdir;
@@ -950 +968 @@
     }
     pb_system("svn export $source $tmp","Exporting $source from SVN to $tmp");
-} elsif ($cms->{$ENV{'PBPROJ'}} eq "flat") {
+} elsif ($scheme eq "flat") {
     if (-d $source) {
         $tmp = $destdir;
@@ -957 +975 @@
     }
     pb_system("cp -a $source $tmp","Exporting $source from DIR to $tmp");
-} elsif ($cms->{$ENV{'PBPROJ'}} eq "cvs") {
+} elsif ($scheme eq "cvs") {
     my $dir=dirname($destdir);
     my $base=basename($destdir);
@@ -970 +988 @@
     # CVS needs a relative path !
     my ($cvsroot) = pb_conf_get("cvsroot");
+    my $pbdate = strftime("%Y-%m-%d %H:%M:%S", @date);
     pb_system("cd $dir ; cvs -d $cvsroot->{$ENV{'PBPROJ'}} export -D \"$pbdate\" -d $base $tmp1","Exporting $source from CVS to $destdir");
 } else {
-    die "cms $cms->{$ENV{'PBPROJ'}} unknown";
+    die "cms $scheme unknown";
 }
 }
@@ -981 +1000 @@
 my $authors=shift;
 my $dest=shift;
-my $cms=shift;
+my $scheme=shift;
 
 return if ($authors eq "/dev/null");
@@ -992 +1011 @@
     chomp($gcos);
     print DAUTH "$gcos";
-    if (defined $cms) {
-        print DAUTH " ($nick under $cms)\n";
+    if (defined $scheme) {
+        print DAUTH " ($nick under $scheme)\n";
     } else {
         print DAUTH "\n";
@@ -1003 +1022 @@
 
 sub pb_cms_log {
-my $cms = shift;
+my $scheme = shift;
 my $pkgdir = shift;
 my $dest = shift;
@@ -1009 +1028 @@
 my $authors = shift;
 
-pb_create_authors($authors,$dest,$cms->{$ENV{'PBPROJ'}});
-
-if ($cms->{$ENV{'PBPROJ'}} eq "svn") {
+pb_create_authors($authors,$dest,$scheme);
+
+if ($scheme eq "svn") {
     if (! -f "$dest/ChangeLog") {
         if (-x "/usr/bin/svn2cl") {
-            pb_system("/usr/bin/svn2cl --group-by-day --authors=$authors -i -o $dest/ChangeLog $pkgdir","Generating ChangeLog from SVN");
+            pb_system("/usr/bin/svn2cl --group-by-day --authors=$authors -i -o $dest/ChangeLog $pkgdir","Generating ChangeLog from SVN with svn2cl");
         } else {
             # To be written from pbcl
@@ -1020 +1039 @@
         }
     }
-} elsif ($cms->{$ENV{'PBPROJ'}} eq "flat") {
+} elsif ($scheme eq "flat") {
     if (! -f "$dest/ChangeLog") {
         pb_system("echo ChangeLog for $pkgdir > $dest/ChangeLog","Empty ChangeLog file created");
     }
-} elsif ($cms->{$ENV{'PBPROJ'}} eq "cvs") {
+} elsif ($scheme eq "cvs") {
     my $tmp=basename($pkgdir);
     # CVS needs a relative path !
     if (! -f "$dest/ChangeLog") {
         if (-x "/usr/bin/cvs2cl") {
-            pb_system("/usr/bin/cvs2cl --group-by-day -U $authors -f $dest/ChangeLog $pkgdir","Generating ChangeLog from CVS");
+            pb_system("/usr/bin/cvs2cl --group-by-day -U $authors -f $dest/ChangeLog $pkgdir","Generating ChangeLog from CVS with cvs2cl");
         } else {
             # To be written from pbcl
@@ -1036 +1055 @@
     }
 } else {
-    die "cms $cms->{$ENV{'PBPROJ'}} unknown";
+    die "cms $scheme unknown";
 }
 }
 
 sub pb_cms_getinfo {
-my $cms = shift;
+my $scheme = shift;
 my $dir = shift;
-my $url = "";
+my $info = shift || "URL:";
+
+my $res = "";
 my $void = "";
 
-if ($cms->{$ENV{'PBPROJ'}} =~ /^svn/) {
+if ($scheme =~ /^svn/) {
     open(PIPE,"LANGUAGE=C svn info $dir |") || return("");
     while (<PIPE>) {
-        ($void,$url) = split(/^URL:/) if (/^URL:/);
+        ($void,$res) = split(/^$info/) if (/^$info/);
     }
     close(PIPE);
-    chomp($url);
-} elsif ($cms->{$ENV{'PBPROJ'}} eq "flat") {
-} elsif ($cms->{$ENV{'PBPROJ'}} eq "cvs") {
+    chomp($res);
+} elsif ($scheme eq "flat") {
+} elsif ($scheme eq "cvs") {
 } else {
-    die "cms $cms->{$ENV{'PBPROJ'}} unknown";
-}
-return($url);
+    die "cms $scheme unknown";
+}
+return($res);
 }
 
 sub pb_cms_copy {
-my $cms = shift;
+my $scheme = shift;
 my $oldurl = shift;
 my $newurl = shift;
 
-if ($cms->{$ENV{'PBPROJ'}} eq "svn") {
+if ($scheme eq "svn") {
     pb_system("svn copy -m \"Creation of $newurl from $oldurl\" $oldurl $newurl","Copying $oldurl to $newurl ");
-} elsif ($cms->{$ENV{'PBPROJ'}} eq "flat") {
-} elsif ($cms->{$ENV{'PBPROJ'}} eq "cvs") {
+} elsif ($scheme eq "flat") {
+} elsif ($scheme eq "cvs") {
 } else {
-    die "cms $cms->{$ENV{'PBPROJ'}} unknown";
+    die "cms $scheme unknown";
 }
 }
 
 sub pb_cms_checkout {
-my $cms = shift;
+my $scheme = shift;
 my $url = shift;
 my $destination = shift;
 
-if ($cms->{$ENV{'PBPROJ'}} eq "svn") {
+if ($scheme =~ /^svn/) {
     pb_system("svn co $url $destination","Checking $url to $destination ");
-} elsif ($cms->{$ENV{'PBPROJ'}} eq "flat") {
-} elsif ($cms->{$ENV{'PBPROJ'}} eq "cvs") {
+} elsif ($scheme eq "flat") {
+} elsif ($scheme eq "cvs") {
 } else {
-    die "cms $cms->{$ENV{'PBPROJ'}} unknown";
+    die "cms $scheme unknown";
 }
 }
 
 sub pb_cms_checkin {
-my $cms = shift;
+my $scheme = shift;
 my $dir = shift;
 
 my $ver = basename($dir);
-if ($cms->{$ENV{'PBPROJ'}} eq "svn") {
+if ($scheme eq "svn") {
     pb_system("svn ci -m \"Updated to $ver\" $dir","Checking in $dir");
     pb_system("svn up $dir","Updating $dir");
-} elsif ($cms->{$ENV{'PBPROJ'}} eq "flat") {
-} elsif ($cms->{$ENV{'PBPROJ'}} eq "cvs") {
+} elsif ($scheme eq "flat") {
+} elsif ($scheme eq "cvs") {
 } else {
-    die "cms $cms->{$ENV{'PBPROJ'}} unknown";
+    die "cms $scheme unknown";
 }
 }
 
 sub pb_cms_isdiff {
-my $cms = shift;
-
-if ($cms->{$ENV{'PBPROJ'}} eq "svn") {
+my $scheme = shift;
+
+if ($scheme eq "svn") {
     open(PIPE,"svn diff $ENV{'PBROOT'} |") || die "Unable to get svn diff from $ENV{'PBROOT'}";
     my $l = 0;
@@ -1114 +1135 @@
     }
     return($l);
-} elsif ($cms->{$ENV{'PBPROJ'}} eq "flat") {
-} elsif ($cms->{$ENV{'PBPROJ'}} eq "cvs") {
+} elsif ($scheme eq "flat") {
+} elsif ($scheme eq "cvs") {
 } else {
-    die "cms $cms->{$ENV{'PBPROJ'}} unknown";
+    die "cms $scheme unknown";
 }
 }
@@ -1126 +1147 @@
 
 sub pb_get_filters {
-
-# For the moment not dynamic
-my $debug = 0;                  # Debug level
-my $LOG = *STDOUT;              # Where to log
 
 my @ffiles;
@@ -1172 +1189 @@
 }
 if (@ffiles) {
-    print $LOG "DEBUG ffiles: ".Dumper(\@ffiles)."\n" if ($debug >= 1);
+    pb_log(2,"DEBUG ffiles: ".Dumper(\@ffiles)."\n");
 
     foreach my $f (@ffiles) {
@@ -1184 +1201 @@
 
         $ptr = $h{"filter"};
-        print $LOG "DEBUG f:".Dumper($ptr)."\n" if ($debug >= 1);
+        pb_log(2,"DEBUG f:".Dumper($ptr)."\n");
     }
 } else {
@@ -1213 +1230 @@
 my $chglog = shift || undef;
 
-# For the moment not dynamic
-my $debug = 0;                  # Debug level
-my $LOG = *STDOUT;              # Where to log
-
-print $LOG "DEBUG: From $f to $destfile\n" if ($debug >= 1);
+pb_log(2,"DEBUG: From $f to $destfile\n");
 pb_mkdir_p(dirname($destfile)) if (! -d dirname($destfile));
 open(DEST,"> $destfile") || die "Unable to create $destfile";
@@ -1225 +1238 @@
     foreach my $s (keys %filter) {
         # Process single variables
-        print $LOG "DEBUG filter{$s}: $filter{$s}\n" if ($debug >= 1);
+        pb_log(2,"DEBUG filter{$s}: $filter{$s}\n");
         my $tmp = $filter{$s};
         next if (not defined $tmp);
         # Expand variables if any single one found
-        print $LOG "DEBUG tmp: $tmp\n" if ($debug >= 1);
+        pb_log(2,"DEBUG tmp: $tmp\n");
         if ($tmp =~ /\$/) {
             eval { $tmp =~ s/(\$\w+)/$1/eeg };
@@ -1245 +1258 @@
 close(FILE);
 close(DEST);
+}
+
+# Function which applies filter on files (external call)
+sub pb_filter_file_inplace {
+
+my $ptr=shift;
+my %filter=%$ptr;
+my $destfile=shift;
+my $pbproj=shift;
+my $pbpkg=shift;
+my $pbver=shift;
+my $pbtag=shift;
+my $pbrev=shift;
+my $pbdate=shift;
+my $pbpackager=shift;
+
+my $cp = "$ENV{'PBTMP'}/".basename($destfile);
+copy($destfile,$cp) || die "Unable to create $cp";
+
+pb_filter_file($cp,$ptr,$destfile,$pbproj,$pbpkg,$pbver,$pbtag,$pbrev,$pbdate,$pbpackager);
+unlink $cp;
 }
 
@@ -1262 +1296 @@
 my $pbpackager=shift;
 
-# For the moment not dynamic
-my $debug = 0;                  # Debug level
-my $LOG = *STDOUT;              # Where to log
-
-print $LOG "DEBUG: From $f to $destfile\n" if ($debug >= 1);
+pb_log(2,"DEBUG: From $f to $destfile\n");
 pb_mkdir_p(dirname($destfile)) if (! -d dirname($destfile));
 open(DEST,"> $destfile") || die "Unable to create $destfile";
@@ -1274 +1304 @@
     foreach my $s (keys %filter) {
         # Process single variables
-        print $LOG "DEBUG filter{$s}: $filter{$s}\n" if ($debug > 1);
+        pb_log(2,"DEBUG filter{$s}: $filter{$s}\n");
         my $tmp = $filter{$s};
         next if (not defined $tmp);
@@ -1289 +1319 @@
 }
 
+sub pb_log_init {
+
+$debug = shift || 0;
+$LOG = shift || \*STDOUT;
+
+} 
+
+sub pb_log {
+
+my $dlevel = shift;
+my $msg = shift;
+
+print $LOG "$msg\n" if ($dlevel >= $debug);
+}
 
 1;