Changeset 590 in ProjectBuilder

Timestamp:

Oct 14, 2008, 11:28:50 AM (16 years ago)

Author:

Bruno Cornec

Message:

• Impove CmS messages when dealing with /.. paths
• Improve newver and pbcl management in order to only touch created files, not original ones.

Location:

devel/pb

Files:

• bin/pb (modified) (3 diffs)
• lib/ProjectBuilder/CMS.pm (modified) (7 diffs)

devel/pb/bin/pb

@@ -1615 +1615 @@
     # Checking pbcl files
     foreach my $f (<$ENV{'PBROOTDIR'}/*/pbcl>) {
+        # Compute new pbcl file
+        my $f2 = $f;
+        $f2 =~ s|$ENV{'PBROOTDIR'}|$ENV{'PBROOTDIR'}/../$newver/|;
         open(PBCL,$f) || die "Unable to open $f";
         my $foundnew = 0;
@@ -1621 +1624 @@
         }
         close(PBCL);
-        open(OUT,"> $f.new") || die "Unable to write to $f.new: $!";
+        open(OUT,"> $f2") || die "Unable to write to $f2: $!";
         open(PBCL,$f) || die "Unable to open $f";
         while (<PBCL>) {
@@ -1629 +1632 @@
                 print OUT "- TBD\n";
                 print OUT "\n";
-                pb_log(0,"WARNING: version $newver not found in $f so added...") if ($foundnew == 0);
+                pb_log(0,"WARNING: version $newver not found in $f so added to $f2...\n") if ($foundnew == 0);
             }
         }
         close(OUT);
         close(PBCL);
-        rename("$f.new","$f");
     }
 

devel/pb/lib/ProjectBuilder/CMS.pm

@@ -135 +135 @@
             $tmp = "$destdir/".basename($source);
         }
-        pb_system("svn export $source $tmp","Exporting $source from SVN to $tmp");
-    } else {
-        pb_system("svn export $uri $destdir","Exporting $uri from SVN to $destdir");
+        pb_system("svn export $source $tmp","Exporting $source from SVN to $tmp ");
+    } else {
+        pb_system("svn export $uri $destdir","Exporting $uri from SVN to $destdir ");
     }
 } elsif ($scheme eq "dir") {
-    pb_system("cp -a $path $destdir","Copying $uri from DIR to $destdir");
+    pb_system("cp -a $path $destdir","Copying $uri from DIR to $destdir ");
 } elsif (($scheme eq "http") || ($scheme eq "ftp")) {
     my $f = basename($path);
@@ -175 +175 @@
     if ($mm =~ /\/x-bzip-compressed-tar$/) {
         # tar+bzip2
-        pb_system("cd $destdir ; tar xfj $path","Extracting $path in $destdir");
+        pb_system("cd $destdir ; tar xfj $path","Extracting $path in $destdir ");
     } elsif ($mm =~ /\/x-lzma-compressed-tar$/) {
         # tar+lzma
-        pb_system("cd $destdir ; tar xfY $path","Extracting $path in $destdir");
+        pb_system("cd $destdir ; tar xfY $path","Extracting $path in $destdir ");
     } elsif ($mm =~ /\/x-compressed-tar$/) {
         # tar+gzip
-        pb_system("cd $destdir ; tar xfz $path","Extracting $path in $destdir");
+        pb_system("cd $destdir ; tar xfz $path","Extracting $path in $destdir ");
     } elsif ($mm =~ /\/x-tar$/) {
         # tar
-        pb_system("cd $destdir ; tar xf $path","Extracting $path in $destdir");
+        pb_system("cd $destdir ; tar xf $path","Extracting $path in $destdir ");
     } elsif ($mm =~ /\/zip$/) {
         # zip
-        pb_system("cd $destdir ; unzip $path","Extracting $path in $destdir");
+        pb_system("cd $destdir ; unzip $path","Extracting $path in $destdir ");
     } else {
         # simple file: copy it (patch e.g.)
@@ -213 +213 @@
         $cvsopt = "-r $cvstag";
     }
-    pb_system("cd $dir ; cvs -d $account\@$host:$path export $cvsopt -d $base $tmp1","Exporting $tmp1 from $source under CVS to $destdir");
+    pb_system("cd $dir ; cvs -d $account\@$host:$path export $cvsopt -d $base $tmp1","Exporting $tmp1 from $source under CVS to $destdir ");
 } else {
     die "cms $scheme unknown";
@@ -333 +333 @@
     }
     pb_mkdir_p("$destination");
-    pb_system("cd $destination ; cvs -d $account\@$host:$path co $cvsopt .","Checking out $url to $destination");
+    pb_system("cd $destination ; cvs -d $account\@$host:$path co $cvsopt .","Checking out $url to $destination ");
 } elsif ($scheme =~ /^file/) {
     pb_cms_export($url,undef,$destination);
@@ -354 +354 @@
 
 if ($scheme =~ /^svn/) {
-    pb_system("svn up $dir","Updating $dir");
+    pb_system("svn up $dir","Updating $dir ");
 } elsif ($scheme eq "flat") {
 } elsif ($scheme =~ /^cvs/) {
-    pb_system("cvs up $dir","Updating $dir");
+    pb_system("cvs up $dir","Updating $dir ");
 } else {
     die "cms $scheme unknown";
@@ -382 +382 @@
 
 if ($scheme =~ /^svn/) {
-    pb_system("svn ci -m \"$msg\" $dir","Checking in $dir");
+    pb_system("svn ci -m \"$msg\" $dir","Checking in $dir ");
 } elsif ($scheme eq "flat") {
 } elsif ($scheme =~ /^cvs/) {
-    pb_system("cvs ci -m \"$msg\" $dir","Checking in $dir");
+    pb_system("cvs ci -m \"$msg\" $dir","Checking in $dir ");
 } else {
     die "cms $scheme unknown";
@@ -405 +405 @@
 
 if ($scheme =~ /^svn/) {
-    pb_system("svn add $f","Adding $f to SVN");
+    pb_system("svn add $f","Adding $f to SVN ");
 } elsif ($scheme eq "flat") {
 } elsif ($scheme =~ /^cvs/) {
-    pb_system("cvs add $f","Adding $f to CVS");
+    pb_system("cvs add $f","Adding $f to CVS ");
 } else {
     die "cms $scheme unknown";