Changeset 1174 in ProjectBuilder for devel/pb/bin

Timestamp:

Feb 4, 2011, 2:25:47 AM (13 years ago)

Author:

Bruno Cornec

Message:

• Fix ebuild test name generation (Report Francesco)
• Fix project package generation from file URL
• Introduce hpux entry (not working)
• pb_cms_mod_http renamed pb_cms_mod_htftp and also now handles ftp protocol
• Fix pb_cms_compliant for file URL build

File:

• devel/pb/bin/pb (modified) (3 diffs)

devel/pb/bin/pb

@@ -752 +752 @@
         } else {
             # Get it from a subdir of the URI with same version as localy but different root
-            $sourceuri = "$ENV{'PBDIR'}/$dir";
-            $sourceuri =~ s|^$ENV{'PBPROJDIR'}/|$uri|;
+            # Only if using a real CMS
+            my ($scheme, $account, $host, $port, $path) = pb_get_uri($uri);
+            if (($scheme !~ /^file/) && ($scheme !~ /^(ht|f)tp/)) {
+                $sourceuri = "$ENV{'PBDIR'}/$dir"; 
+                $sourceuri =~ s|^$ENV{'PBPROJDIR'}/|$uri|;
+            }
         }
         my $preserve = pb_cms_export($sourceuri,$sourcedir,$dest);
@@ -1206 +1210 @@
                     # 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/$pbpkg-$pbver-r$pbtag.ebuild");
+                    if ($pbtag =~ /^0\./) {
+                        # This is a test version
+                        my $ntag = $pbtag;
+                        $ntag =~ s/^0\.//;
+                        move("$tmpd/$pbpkg-$pbver.ebuild","$ENV{'PBBUILDDIR'}/portage/pb/sys-apps/$pbpkg/$pbpkg-$pbver"."_p$ntag.ebuild");
+                        $made="$made portage/pb/sys-apps/$pbpkg/$pbpkg-$pbver"."_p$ntag.ebuild";
+                    } else {
+                        move("$tmpd/$pbpkg-$pbver.ebuild","$ENV{'PBBUILDDIR'}/portage/pb/sys-apps/$pbpkg/$pbpkg-$pbver-r$pbtag.ebuild");
+                        $made="$made portage/pb/sys-apps/$pbpkg/$pbpkg-$pbver-r$pbtag.ebuild";
+                    }
                 }
             }
 
-            $made="$made portage/pb/sys-apps/$pbpkg/$pbpkg-$pbver-r$pbtag.ebuild";
         } elsif ($dtype eq "tgz") {
             # Slackware family
@@ -1264 +1276 @@
             chdir ".." || die "Unable to chdir to parent dir";
             pb_system("rm -rf $pbpkg-$pbver $ENV{'PBBUILDDIR'}/$dtype $pkgdestdir", "Cleanup");
+        } elsif ($dtype eq "hpux") {
+            # HP-UX
+            chdir "$ENV{'PBBUILDDIR'}" || die "Unable to chdir to $ENV{'PBBUILDDIR'}";
+            pb_system("tar xfz $src","Extracting sources");
+            pb_system("tar xfz $src2","Extracting pbconf");
+
+            chdir "$pbpkg-$pbver" || die "Unable to chdir to $pbpkg-$pbver";
+            pb_system("buildpackage ","Building package","verbose");
+            # Get the name of the generated packages
+            open(LOG,"$ENV{'PBTMP'}/system.$$.log") || die "Unable to open $ENV{'PBTMP'}/system.$$.log";
+            while (<LOG>) {
+                chomp();
+                my $tmp = $_;
+                next if ($tmp !~ /^SD BUILD.*:/);
+                $tmp =~ s|.*../(.*)_(.*).sd.*|$1|;
+                $made="$made $tmp"."_*.sd";
+            }
+            close(LOG);
+            $made="$made $pbpkg-$pbver-$pbtag.sd";
+
+            pb_system("rm -rf $pbpkg-$pbver", "Cleanup");
         } else {
             die "Unknown dtype format $dtype";