Changeset 916

Timestamp:

11/29/09 03:12:56 (3 years ago)

Author:

bruno

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.

Files:

• devel/pb/bin/pb (modified) (3 diffs)
• devel/pb/lib/ProjectBuilder/Changelog.pm (modified) (3 diffs)
• devel/pb/lib/ProjectBuilder/Env.pm (modified) (7 diffs)
• devel/pb/lib/ProjectBuilder/Filter.pm (modified) (1 diff)
• pbconf/devel/ProjectBuilder/deb/compat (modified) (1 diff)
• pbconf/devel/ProjectBuilder/deb/control (modified) (2 diffs)
• pbconf/devel/ProjectBuilder/deb/rules (modified) (1 diff)
• pbconf/devel/ProjectBuilder/pbcl (modified) (2 diffs)
• pbconf/devel/ProjectBuilder/pbfilter/all.pbf (modified) (1 diff)
• pbconf/devel/ProjectBuilder/pbfilter/deb.pbf (modified) (1 diff)
• pbconf/devel/ProjectBuilder/pkg/pkginfo (modified) (2 diffs)
• pbconf/devel/ProjectBuilder/rpm/perl-ProjectBuilder.spec (modified) (2 diffs)
• pbconf/devel/pbfilter/all.pbf (modified) (2 diffs)
• pbconf/devel/project-builder/deb/compat (modified) (1 diff)
• pbconf/devel/project-builder/deb/control (modified) (2 diffs)
• pbconf/devel/project-builder/deb/rules (modified) (1 diff)
• pbconf/devel/project-builder/pbcl (modified) (2 diffs)
• pbconf/devel/project-builder/pbfilter/all.pbf (modified) (1 diff)
• pbconf/devel/project-builder/pbfilter/deb.pbf (modified) (1 diff)
• pbconf/devel/project-builder/pkg/pkginfo (modified) (1 diff)
• pbconf/devel/project-builder/rpm/project-builder.spec (modified) (2 diffs)

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);

pbconf/devel/ProjectBuilder/deb/compat

@@ -1 @@
-4
+PBDEBCOMP

pbconf/devel/ProjectBuilder/deb/control

@@ -3 +3 @@
 Priority: optional
 Maintainer: PBPACKAGER
-Build-Depends: debhelper (>= 4.2.20)
-Standards-Version: 3.6.1
+Build-Depends: debhelper (>= 4.2.20), fakeroot, dpkg-dev (>= 1.13)
+Standards-Version: PBDEBSTD
+Vcs-Svn: svn://svn.project-builder.org/mondo/svn/pb/PBVER/PBPKG
+Vcs-Browser: http://trac.project-builder.org/browser/PBVER/PBPKG
+Homepage: PBURL
 
 Package: PBREALPKG
@@ -13 +16 @@
 Recommends: 
 Suggests: 
-Description: 
- Reusable perl function from the project-builder.org project
+Description: PBSUMMARY
+ PBDESC
  .
- Homepage: PBURL
 

pbconf/devel/ProjectBuilder/deb/rules

@@ -35 +35 @@
 
         # Add here commands to compile the package.
-        perl Makefile.PL CONFDIR=/etc/pb
+        perl Makefile.PL CONFDIR=/etc/pb INSTALLDIRS=vendor
         $(MAKE)
         touch $@

pbconf/devel/ProjectBuilder/pbcl

@@ -4 +4 @@
 
 devel (2030-01-01)
+- TBD
 
 0.9.8 (2009-10-24)
@@ -11 +12 @@
 
 0.9.7.1 (2009-07-05)
-- Fix a critical bug on pb, where a module was loaded optionaly with use instead of require (prevents update of VMs) (Bruno C
-ornec)
+- Fix a critical bug on pb, where a module was loaded optionaly with use instead of require (prevents update of VMs) (Bruno Cornec)
 
 0.9.7 (2009-07-04)

pbconf/devel/ProjectBuilder/pbfilter/all.pbf

@@ -1 @@
-filter PBDESC = ProjectBuilder is a perl module providing set of functions$/to help develop perl projects and deal with different Operating systems (Linux distributions, Solaris, ...).
+filter PBDESC = ProjectBuilder is a perl module providing set of functions$/to help develop packages for projects and deal$/with different Operating systems (Linux distributions, Solaris, ...).$/It implements a Continuous Packaging approach.
 # Summary of package
-filter PBSUMMARY = Perl module providing support and deal with OSes (Linux/Solaris/...)
+filter PBSUMMARY = Perl module providing multi-OSes (Linux/Solaris/...) Continuous Packaging

pbconf/devel/ProjectBuilder/pbfilter/deb.pbf

@@ -6 +6 @@
 
 # PBGRP is replaced by the RPM group of apps
-filter PBGRP = Admin
+filter PBGRP = perl
 

pbconf/devel/ProjectBuilder/pkg/pkginfo

@@ -2 +2 @@
 # $Id$
 #
-PKG="PBREALPKG"
+PKG="PBPKG"
 NAME="PBSUMMARY"
 VERSION="PBVER"
@@ -11 +11 @@
 VENDOR="PBPACKAGER"
 HOTLINE="PBURL"
-BASEDIR="/"
+BASEDIR=/

pbconf/devel/ProjectBuilder/rpm/perl-ProjectBuilder.spec

@@ -3 +3 @@
 #
 %define perlvendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)
-%define srcname PBPKG
+%define srcname PBPKG
 
 Summary:    PBSUMMARY
@@ -17 +17 @@
 BuildRoot:  %{_tmppath}/%{srcname}-%{version}-%{release}-root-%(id -u -n)
 BuildArch:  noarch
-Requires:   perl >= 5.8.4, PBDEP
+Requires:   perl >= 5.8.4,PBDEP
 
 %description

pbconf/devel/pbfilter/all.pbf

@@ -16 +16 @@
 filter PBDATE = $pb->{'date'}
 
-# PBLOG is replaced by the changelog if value is yes
-filter PBLOG = yes
-
 # PBTAG is replaced by the tag ($pb->{'tag'} in code)
 filter PBTAG = $pb->{'tag'}
@@ -34 +31 @@
 filter PBPACKAGER = $pb->{'packager'}
 
+# 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
+
 filter PBURL = http://trac.project-builder.org

pbconf/devel/project-builder/deb/compat

@@ -1 @@
-4
+PBDEBCOMP

pbconf/devel/project-builder/deb/control

@@ -3 +3 @@
 Priority: optional
 Maintainer: PBPACKAGER
-Build-Depends: debhelper (>= 4.2.20)
-Standards-Version: 3.6.1
+Build-Depends: debhelper (>= 4.2.20), fakeroot, dpkg-dev (>= 1.13)
+Standards-Version: PBDEBSTD
+Vcs-Svn: svn://svn.project-builder.org/mondo/svn/pb/PBVER/PBPKG
+Vcs-Browser: http://trac.project-builder.org/browser/PBVER/PBPKG
+Homepage: PBURL
 
 Package: PBPKG
@@ -10 +13 @@
 Section: PBGRP
 Priority: optional
-Depends: ${shlibs:Depends}, ${misc:Depends}, libdate-manip-perl, libfile-mimeinfo-perl, libmail-sendmail-perl, fakeroot, dpkg-dev, libprojectbuilder-perl
+Depends: ${shlibs:Depends}, ${misc:Depends}, libdate-manip-perl, libfile-mimeinfo-perl, libmail-sendmail-perl, libprojectbuilder-perl
 Recommends: 
 Suggests: libdbi-perl
-Description: 
- Project Builder aka pb is a tool to produce packages for multiple 
- distributions.
- It does that by minimizing the duplication of information required 
- and a set a very simple configuration files.
+Description: PBSUMMARY
+ PBDESC
  .
- Homepage: PBURL
 

pbconf/devel/project-builder/deb/rules

@@ -35 +35 @@
 
         # Add here commands to compile the package.
-        perl Makefile.PL
+        perl Makefile.PL INSTALLDIRS=vendor
         $(MAKE)
         touch $@

pbconf/devel/project-builder/pbcl

@@ -4 +4 @@
 
 devel (2030-01-01)
+- TBD
 
 0.9.8 (2009-10-24)
@@ -12 +13 @@
 
 0.9.7.1 (2009-07-05)
-- Fix a critical bug on pb, where a module was loaded optionaly with use instead of require (prevents update of VMs) (Bruno C
-ornec)
+- Fix a critical bug on pb, where a module was loaded optionaly with use instead of require (prevents update of VMs) (Bruno Cornec)
 
 0.9.7 (2009-07-04)

pbconf/devel/project-builder/pbfilter/all.pbf

@@ -1 @@
-filter PBDESC = Project Builder aka pb helps producing packages$/for multiple distributions. It does that by minimizing$/the duplication of information required and$/a set a very simple configuration files.
-filter PBSUMMARY = Project Builder aka pb helps producing packages for multiple distributions.
+filter PBDESC = ProjectBuilder aka pb helps producing packages$/for multiple OSes (Linux distributions, Solaris, ...).$/It does that by minimizing$/the duplication of information required and$/a set a very simple configuration files.$/It implements a Continuous Packaging approach.
+# Summary of package
+filter PBSUMMARY = Project Builder helps providing multi-OSes Continuous Packaging

pbconf/devel/project-builder/pbfilter/deb.pbf

@@ -6 +6 @@
 
 # PBGRP is replaced by the RPM group of apps
-filter PBGRP = Admin
+filter PBGRP = admin
 

pbconf/devel/project-builder/pkg/pkginfo

@@ -2 +2 @@
 # $Id$
 #
-PKG="PBREALPKG"
+PKG="PBPKG"
 NAME="PBSUMMARY"
 VERSION="PBVER"
 ARCH="all"
-CATEGORY="utility"
+CATEGORY="application"
 DESC="PBDESC"
 EMAIL="PBPACKAGER"
 VENDOR="PBPACKAGER"
 HOTLINE="PBURL"
+BASEDIR=/

pbconf/devel/project-builder/rpm/project-builder.spec

@@ -5 +5 @@
 %define srcname PBPKG
 
-Summary:    Project Builder aka pb is a tool to produce packages for multiple distributions
+Summary:    PBSUMMARY
 Summary(fr):    Project Builder ou pb produit des paquets pour diverses distributions
 
@@ -17 +17 @@
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n)
 BuildArch:  noarch
-Requires:   perl >= 5.8.4, perl-DateManip, perl-ProjectBuilder, rpm-build, PBDEP
+Requires:   perl >= 5.8.4,perl-DateManip,perl-ProjectBuilder,rpm-build,PBDEP
 
 %description