Changeset 916 in ProjectBuilder for devel/pb/bin/pb

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.

File:

• devel/pb/bin/pb (modified) (3 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");