Changeset 916 in ProjectBuilder for devel

Timestamp:

Nov 29, 2009, 3:12:56 AM (14 years ago)

Author:

Bruno Cornec

Message:

• Improves Debian support by a/ allowing PBDESC to be used in control file with space prepended. b/ prepend 0 to non digit versions such as devel. c/ creating debian pbfilter files for PBDEBSTD and PBDEBCOMP macros used in control.
• Uses pbtag for ebuild and pkg packages
• Improves pb Solaris pkgs
• Improves pb Debian pkgs (only some warnings remaining for lintian)
• Adds a PBSUMMARY macro and use it. Now also generated for newproj.

Location:

devel/pb

Files:

• bin/pb (modified) (3 diffs)
• lib/ProjectBuilder/Changelog.pm (modified) (3 diffs)
• lib/ProjectBuilder/Env.pm (modified) (7 diffs)
• lib/ProjectBuilder/Filter.pm (modified) (1 diff)

devel/pb/bin/pb

@@ -1011 +1011 @@
                     # Now move it where pb expects it
                     pb_mkdir_p("$ENV{'PBBUILDDIR'}/portage/pb/sys-apps/$pbpkg");
-                    move("$tmpd/$pbpkg-$pbver.ebuild","$ENV{'PBBUILDDIR'}/portage/pb/sys-apps/$pbpkg");
+                    move("$tmpd/$pbpkg-$pbver.ebuild","$ENV{'PBBUILDDIR'}/portage/pb/sys-apps/$pbpkg/$pbpkg-$pbver-$pbtag.ebuild");
                 }
             }
 
-            $made="$made portage/pb/sys-apps/$pbpkg/$pbpkg-$pbver.ebuild";
+            $made="$made portage/pb/sys-apps/$pbpkg/$pbpkg-$pbver-$pbtag.ebuild";
         } elsif ($dtype eq "tgz") {
             # Slackware family
@@ -1032 +1032 @@
         } elsif ($dtype eq "pkg") {
             # Solaris
-            $made="$made $pbpkg-$pbver.pkg.gz";
+            $made="$made $pbpkg-$pbver-$pbtag.pkg.gz";
             my $pkgdestdir="$ENV{'PBBUILDDIR'}/install";
 
@@ -1062 +1062 @@
                 copy("pbconf/$ddir-$dver-$arch/pkginfo", $pkgdestdir);
                 pb_system("cd $pkgdestdir/delivery ; pkgmk -o -f ../prototype -r $pkgdestdir/delivery -d $ENV{'PBBUILDDIR'}/$dtype","Packaging $pbpkg","verbose");
-                pb_system("cd $ENV{'PBBUILDDIR'}/$dtype ;  echo \"\" | pkgtrans -o -n -s $ENV{'PBBUILDDIR'}/$dtype $ENV{'PBBUILDDIR'}/$pbpkg-$pbver.pkg all","Transforming $pbpkg","verbose");
-                pb_system("cd $ENV{'PBBUILDDIR'} ;  gzip -9f $pbpkg-$pbver.pkg","Compressing $pbpkg-$pbver.pkg","verbose");
+                pb_system("cd $ENV{'PBBUILDDIR'}/$dtype ;  echo \"\" | pkgtrans -o -n -s $ENV{'PBBUILDDIR'}/$dtype $ENV{'PBBUILDDIR'}/$pbpkg-$pbver-$pbtag.pkg all","Transforming $pbpkg","verbose");
+                pb_system("cd $ENV{'PBBUILDDIR'} ;  gzip -9f $pbpkg-$pbver-$pbtag.pkg","Compressing $pbpkg-$pbver-$pbtag.pkg","verbose");
             } else {
                 pb_log(0,"No pbconf/$ddir-$dver-$arch/pbbuild file found for $pbpkg-$pbver in \n");

devel/pb/lib/ProjectBuilder/Changelog.pm

@@ -48 +48 @@
 Function that generates the changelog used in build files, or for announcements (web, mailing-list, ...)
 
-It takes up to 9 parameters:
-The first parameter is the type of the distribution.
-The second parameter is the package name generated.
-The third parameter is the version of the package.
-The fourth parameter is the tag of the package.
-The fifth parameter is the suffix of the package.
-The sixth parameter is now unused.
-The seventh parameter is the file descriptor on which to write the changelog content.
-The eighth parameter is a flag in the configuration file indicating whether we want changelog expansion or not.
-The nineth parameter is the potential changelog file pbcl.
+It takes 3 parameters:
+The first parameter is the %pb hash containing packge info
+The second parameter is the file descriptor on which to write the changelog content.
+The third parameter is a flag in the configuration file indicating whether we want changelog expansion or not.
 
 =cut
@@ -119 +113 @@
     if ($dtype eq "deb") {
         if ($pbver !~ /^[0-9]/) {
-            # dpkg-deb doesn't accept non digit versions. Prepending date
-            my $ldate = strftime("%Y%m%d", @date);
-            $pbver =~ s/^/$ldate/;
-        }
-        print $OUTPUT "$pbrealpkg ($pbver) unstable; urgency=low\n";
-        print $OUTPUT "\n";
+            # dpkg-deb doesn't accept non digit versions. 
+            # Prepending 0 in order to make updates easy hopefully
+            $pbver =~ s/^/0/;
+        }
+        print $OUTPUT "$pbrealpkg ($pbver-$pbtag) unstable; urgency=low\n";
+        print $OUTPUT "  * Updated to $pbver\n";
         print $OUTPUT " -- $pbpackager->{$ENV{'PBPROJ'}}  $n2date\n\n\n";
         }
@@ -154 +148 @@
     chomp($date);
     $date =~ s/\(([0-9-]+)\)/$1/;
-    #pb_log(2,"**$date**\n";
+    pb_log(3,"**Date:$date**\n");
     $ndate = UnixDate($date,"%a", "%b", "%d", "%Y");
     $n2date = UnixDate($date,"%a, %d %b %Y %H:%M:%S %z");
-    #pb_log(2,"**$ndate**\n";
+    pb_log(3,"**nDate:$ndate**\n");
+
+    pb_log(3,"**Ver:$ver**\n");
+    if ($ver !~ /-/) {
+        if ($first eq 1) {
+            $ver2 = "$ver-$pbtag";
+            $first = 0;
+        } else {
+            $ver2 = "$ver-1";
+        }
+    } else {
+        $ver2 = $ver;
+    }
+    pb_log(3,"**Ver2:$ver2**\n");
 
     if (($dtype eq "rpm") || ($dtype eq "fc")) {
-        if ($ver !~ /-/) {
-            if ($first eq 1) {
-                $ver2 = "$ver-$pbtag";
-                $first=0;
-            } else {
-                $ver2 = "$ver-1";
-            }
-        } else {
-            $ver2 = "$ver";
-        }
         print $OUTPUT "* $ndate $pbpackager->{$ENV{'PBPROJ'}} $ver2\n";
         print $OUTPUT "- Updated to $ver\n";
         }
     if ($dtype eq "deb") {
-        if ($ver !~ /^[0-9]/) {
-            # dpkg-deb doesn't accept non digit versions. Prepending date
-            my $ldate = strftime("%Y%m%d", @date);
-            $ver =~ s/^/$ldate/;
-        }
-        print $OUTPUT "$pbrealpkg ($ver) unstable; urgency=low\n";
+        if ($ver2 !~ /^[0-9]/) {
+            # dpkg-deb doesn't accept non digit versions. 
+            # Prepending 0 in order to make updates easy hopefully
+            $ver2 =~ s/^/0/;
+        }
+        print $OUTPUT "$pbrealpkg ($ver2) unstable; urgency=low\n";
         print $OUTPUT "\n";
         }

devel/pb/lib/ProjectBuilder/Env.pm

@@ -533 +533 @@
 filter PBDATE = \$pb->{'date'}
 
-# PBLOG is replaced by the changelog if value is yes
-#filter PBLOG = yes
-
 # PBPATCHSRC is replaced by the patches names if value is yes
 #filter PBPATCHSRC = yes
@@ -563 +560 @@
 #filter PBDESC = "Bla-Bla"
 
+# PBSUMMARY contains a short single line description of the package
+#filter PBSUMMARY = "Bla"
+
 # PBURL contains the URL of the Web site of the project
 #filter PBURL = http://www.$ENV{'PBPROJ'}.org
+
+# PBLOG is replaced by the changelog if value is yes
+# and should be last as when used we need the %pb hash filled
+#filter PBLOG = yes
+
 EOF
             close(CONF);
@@ -656 +661 @@
 # PBREC is replaced by the list of recommandations
 #filter PBREC =
+
+EOF
+            close(CONF);
+            open(CONF,"> $ENV{'PBROOTDIR'}/pbfilter/debian-4.0.pbf") || die "Unable to create $ENV{'PBROOTDIR'}/pbfilter/debian-4.0.pbf";
+            print CONF << "EOF";
+#
+# \$Id\$
+#
+# Filter for debian build
+#
+# PBDEBSTD is replaced by the Debian standard version
+filter PBDEBSTD = 3.6.1
+
+# PBDEBCOMP is replaced by the Debian Compatibility value
+filter PBDEBCOMP = 5
+
+EOF
+            close(CONF);
+            open(CONF,"> $ENV{'PBROOTDIR'}/pbfilter/debian-5.0.pbf") || die "Unable to create $ENV{'PBROOTDIR'}/pbfilter/debian-5.0.pbf";
+            print CONF << "EOF";
+#
+# \$Id\$
+#
+# Filter for debian build
+#
+# PBDEBSTD is replaced by the Debian standard version
+filter PBDEBSTD = 3.8.0
+
+# PBDEBCOMP is replaced by the Debian Compatibility value
+filter PBDEBCOMP = 7
 
 EOF
@@ -688 +723 @@
                 print CONF << "EOF";
 Source: PBPKG
+# http://www.debian.org/doc/debian-policy/ch-archive.html#s-subsections
 Section: PBGRP
 Priority: optional
 Maintainer: PBPACKAGER
 Build-Depends: debhelper (>= 4.2.20), PBDEP
-Standards-Version: 3.6.1
+Standards-Version: PBDEBSTD
+Vcs-Svn: svn://svn.PBPROJ.org/svn/PBVER/PBPKG
+Vcs-Browser: http://trac.PBPROJ.org/browser/PBVER/PBPKG
+Homepage: PBURL
 
 Package: PBPKG
 Architecture: amd64 i386 ia64
+# http://www.debian.org/doc/debian-policy/ch-archive.html#s-subsections
 Section: PBGRP
 Priority: optional
@@ -701 +741 @@
 Recommends: PBREC
 Suggests: PBSUG
-Description: 
+Description: PBSUMMARY
  PBDESC
  .
- Homepage: PBURL
 
 EOF
@@ -746 +785 @@
                 open(CONF,"> $ENV{'PBROOTDIR'}/$pp/deb/compat") || die "Unable to create $ENV{'PBROOTDIR'}/$pp/deb/compat";
                 print CONF << "EOF";
-4
+DBDEBCOMP
 EOF
                 close(CONF);
@@ -908 +947 @@
 #%define srcname    PBPKG
 
-Summary:        bla-bla
+Summary:        PBSUMMARY
 Summary(fr):    french bla-bla
 

devel/pb/lib/ProjectBuilder/Filter.pm

@@ -156 +156 @@
             eval { $tmp =~ s/(\$\w+-\>\{\'\w+\'\})/$1/eeg };
             eval { $tmp =~ s/(\$\w+)/$1/eeg };
+            if (($s =~ /^PBDESC$/) && ($line =~ /^ PBDESC/)) {
+                # if on debian, we need to preserve the space before each desc line
+                pb_log(3,"*** DEBIAN CASE ADDING SPACE ***\n");
+                $tmp =~ s/\$\//\$\/ /g;
+                pb_log(3,"*** tmp:$tmp ***\n");
+            }
             eval { $tmp =~ s/(\$\/)/$1/eeg };
-        # special case for ChangeLog only for pb
         } elsif (($s =~ /^PBLOG$/) && ($line =~ /^PBLOG$/)) {
+            # special case for ChangeLog only for pb
             pb_log(3,"DEBUG filtering PBLOG\n");
             pb_changelog($pb, \*DEST, $tmp);