Changeset 890 in ProjectBuilder for devel/pb/lib/ProjectBuilder/CMS.pm

Timestamp:

Oct 27, 2009, 11:54:28 AM (15 years ago)

Author:

Bruno Cornec

Message:

• Adds solaris support to pb_env_init (template file creation)
• Simplify pb_changelog when dest ChangeLog file exists

File:

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

devel/pb/lib/ProjectBuilder/CMS.pm

@@ -779 +779 @@
 }
 
-if ($scheme =~ /^svn/) {
-    if (! -f "$dest/ChangeLog") {
+if (! -f "$dest/ChangeLog") {
+    if ($scheme =~ /^svn/) {
         # In case we have no network, just create an empty one before to allow correct build
         open(CL,"> $dest/ChangeLog") || die "Unable to create $dest/ChangeLog";
@@ -790 +790 @@
             pb_system("$vcscmd log -v $pkgdir > $dest/$ENV{'PBCMSLOGFILE'}","Extracting log info from SVN");
         }
-    }
-} elsif ($scheme =~ /^svk/) {
-    if (! -f "$dest/ChangeLog") {
+    } elsif ($scheme =~ /^svk/) {
         pb_system("$vcscmd log -v $pkgdir > $dest/$ENV{'PBCMSLOGFILE'}","Extracting log info from SVK");
-        }
-} elsif ($scheme =~ /^hg/) {
-    if (! -f "$dest/ChangeLog") {
+    } elsif ($scheme =~ /^hg/) {
         # In case we have no network, just create an empty one before to allow correct build
         open(CL,"> $dest/ChangeLog") || die "Unable to create $dest/ChangeLog";
         close(CL);
         pb_system("$vcscmd log -v $pkgdir > $dest/$ENV{'PBCMSLOGFILE'}","Extracting log info from SVN");
-        }
-} elsif ($scheme =~ /^git/) {
-    if (! -f "$dest/ChangeLog") {
+    } elsif ($scheme =~ /^git/) {
         # In case we have no network, just create an empty one before to allow correct build
         open(CL,"> $dest/ChangeLog") || die "Unable to create $dest/ChangeLog";
         close(CL);
         pb_system("$vcscmd log -v $pkgdir > $dest/$ENV{'PBCMSLOGFILE'}","Extracting log info from GIT");
-        }
-} elsif (($scheme eq "file") || ($scheme eq "dir") || ($scheme eq "http") || ($scheme eq "ftp")) {
-    if (! -f "$dest/ChangeLog") {
+    } elsif (($scheme eq "file") || ($scheme eq "dir") || ($scheme eq "http") || ($scheme eq "ftp")) {
         pb_system("echo ChangeLog for $pkgdir > $dest/ChangeLog","Empty ChangeLog file created");
-    }
-} elsif ($scheme =~ /^cvs/) {
-    my $tmp=basename($pkgdir);
-    # CVS needs a relative path !
-    if (! -f "$dest/ChangeLog") {
+    } elsif ($scheme =~ /^cvs/) {
+        my $tmp=basename($pkgdir);
+        # CVS needs a relative path !
         # In case we have no network, just create an empty one before to allow correct build
         open(CL,"> $dest/ChangeLog") || die "Unable to create $dest/ChangeLog";
@@ -826 +816 @@
             pb_system("$vcscmd log $tmp > $dest/$ENV{'PBCMSLOGFILE'}","Extracting log info from CVS");
         }
-    }
-} else {
-    die "cms $scheme unknown";
+    } else {
+        die "cms $scheme unknown";
+    }
 }
 }