Changeset 344 in ProjectBuilder

Timestamp:

Mar 31, 2008, 2:04:24 AM (16 years ago)

Author:

Bruno Cornec

Message:

Lots of fixes in order to make it work for netperf from scratch (newver, cms2build, build2pkg, pbcl)

Location:

devel/pb

Files:

• bin/pb (modified) (1 diff)
• lib/ProjectBuilder/Base.pm (modified) (23 diffs)

devel/pb/bin/pb

@@ -587 +587 @@
         # Possibility to look at PBSRC to guess more the filename
         pb_system("tar cfz $pbpkg-$pbver.tar.gz $pbpkg-$pbver","Creating $pbpkg tar files compressed");
-        pb_log(2,"Under $ENV{'PBDESTDIR'}/$pbpkg-$pbver.tar.gz\n");
+        pb_log(0,"Under $ENV{'PBDESTDIR'}/$pbpkg-$pbver.tar.gz\n");
 
         # Keep track of what is generated by default

devel/pb/lib/ProjectBuilder/Base.pm

@@ -119 +119 @@
 
 my ($pbdefdir) = pb_conf_get_if("pbdefdir");
-my %pbdefdir = %$pbdefdir;
 
 if (not defined $ENV{'PBDEFDIR'}) {
-    if ((not defined $pbdefdir) || (not defined $pbdefdir{$ENV{'PBPROJ'}})) {
+    if ((not defined $pbdefdir) || (not defined $pbdefdir->{$ENV{'PBPROJ'}})) {
         pb_log(1,"WARNING: no pbdefdir defined, using /var/cache\n");
         pb_log(1,"         Please create a pbdefdir reference for project $ENV{'PBPROJ'} in $ENV{'PBETC'}\n");
@@ -129 +128 @@
     } else {
         # That's always the environment variable that will be used
-        $ENV{'PBDEFDIR'} = $pbdefdir{$ENV{'PBPROJ'}};
+        $ENV{'PBDEFDIR'} = $pbdefdir->{$ENV{'PBPROJ'}};
     }
 }
@@ -225 +224 @@
     # transform in full path if relative
     $ENV{'PBROOTDIR'} = "$ENV{'PBCONFDIR'}/$ENV{'PBROOTDIR'}" if ($ENV{'PBROOTDIR'} !~ /^\//);
+    pb_mkdir_p($ENV{'PBROOTDIR'}) if (defined $pbinit);
     die "$ENV{'PBROOTDIR'} is not a directory" if (not -d $ENV{'PBROOTDIR'});
 }
@@ -308 +308 @@
 #pburl $ENV{'PBPROJ'} = dir:///src/$ENV{'PBPROJ'}-devel
 
+# Check whether project is well formed 
+# (containing already a directory with the project-version name)
+#pbwf $ENV{'PBPROJ'} = 1
+
 #
 # Packager label
 #
-#pbpackager $ENV{'PBPROJ'} = "William Porte <bill\@$ENV{'PBPROJ'}.org>"
+#pbpackager $ENV{'PBPROJ'} = William Porte <bill\@$ENV{'PBPROJ'}.org>
 #
 
@@ -424 +428 @@
 
 # PBVER is replaced by the version (\$pbver in code)
-#filter PBVER = \$pbver
+filter PBVER = \$pbver
 
 # PBDATE is replaced by the date (\$pbdate in code)
-#filter PBDATE = \$pbdate
+filter PBDATE = \$pbdate
 
 # PBLOG is replaced by the changelog if value is yes
@@ -433 +437 @@
 
 # PBTAG is replaced by the tag (\$pbtag in code)
-#filter PBTAG = \$pbtag
+filter PBTAG = \$pbtag
 
 # PBREV is replaced by the revision (\$pbrev in code)
-#filter PBREV = \$pbrev
+filter PBREV = \$pbrev
 
 # PBPKG is replaced by the package name (\$pbpkg in code)
-#filter PBPKG = \$pbpkg
+filter PBPKG = \$pbpkg
 
 # PBPACKAGER is replaced by the packager name (\$pbpackager in code)
-#filter PBPACKAGER = \$pbpackager
+filter PBPACKAGER = \$pbpackager
 
 # PBDESC contains the description of the package
@@ -470 +474 @@
 #filter PBDEP =
 
-# PBSUF is replaced by the package name (\$pbpkg in code)
-#filter PBSUF = \$pbsuf
+# PBSUF is replaced by the package suffix (\$pbsuf in code)
+filter PBSUF = \$pbsuf
 
 # PBOBS is replaced by the Obsolete line
@@ -486 +490 @@
 #
 # PBGRP is replaced by the group of apps
-#filter PBGRP = utils
+filter PBGRP = utils
 
 # PBLIC is replaced by the license of the application
@@ -507 +511 @@
 # Specific group for Mandriva for $ENV{'PBPROJ'}
 # Cf: http://wiki.mandriva.com/en/Development/Packaging/Groups
-filter PBGRP = Archiving/Backup
+#filter PBGRP = Archiving/Backup
 
 # PBLIC is replaced by the license of the application
@@ -519 +523 @@
 # Specific group for SuSE for $ENV{'PBPROJ'}
 # Cf: http://en.opensuse.org/SUSE_Package_Conventions/RPM_Groups
-filter PBGRP = Productivity/Archiving/Backup
+#filter PBGRP = Productivity/Archiving/Backup
 
 # PBLIC is replaced by the license of the application
@@ -593 +597 @@
 EOF
             close(CONF);
-            open(CONF,"> $ENV{'PBROOTDIR'}/$pp/deb/pkg1.dirs") || die "Unable to create $ENV{'PBROOTDIR'}/$pp/deb/$pp.dirs";
+            open(CONF,"> $ENV{'PBROOTDIR'}/$pp/deb/$pp.dirs") || die "Unable to create $ENV{'PBROOTDIR'}/$pp/deb/$pp.dirs";
             print CONF << "EOF";
 EOF
@@ -761 +765 @@
 Source:         PBSRC
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n)
-Requires:       PBDEP
+#Requires:       PBDEP
 
 %description
@@ -1089 +1093 @@
     pb_mkdir_p($destdir);
 
+    # Check whether the file is well formed 
+    # (containing already a directory with the project-version name)
+    my ($pbwf) = pb_conf_get_if("pbwf");
+    if ((defined $pbwf) && (defined $pbwf->{$ENV{'PBPROJ'}})) {
+        $destdir = dirname($destdir);
+    }
+
     if ($mm =~ /\/x-bzip-compressed-tar$/) {
         # tar+bzip2
@@ -1105 +1116 @@
         pb_system("cd $destdir ; unzip $path","Extracting $path in $destdir");
     }
-    # Maybe we created an extra level of dir under destdir
-    opendir(DIR,$destdir) || die "Unable to open $destdir";
-    my $cnt = 0;
-    my $d0;
-    foreach my $d (readdir(DIR)) {
-        pb_log(3,"Looking at \'$d\'...");
-        next if ($d =~ /^\./);
-        $cnt++;
-        $d0 = $d;
-    }
-    closedir(DIR);
-    # Fix that by moving everything below that extra dir under destdir 
-    # and remove the extra dir
-    if ($cnt == 1) {
-        pb_system("cd $destdir/$d0 ; mv * .??* .. 2>/dev/null");
-        pb_rm_rf("$destdir/$d0");
-    }
 } elsif ($scheme =~ /^cvs/) {
     # CVS needs a relative path !
@@ -1301 +1295 @@
 if ($scheme =~ /^svn/) {
     pb_system("svn co $url $destination","Checking out $url to $destination ");
-} elsif ($scheme eq "flat") {
+} elsif (($scheme eq "ftp") || ($scheme eq "http")) {
+    return;
 } elsif ($scheme =~ /^cvs/) {
+    pb_system("cvs co $url $destination","Checking out $url to $destination ");
 } else {
     die "cms $scheme unknown";
@@ -1354 +1350 @@
 my $ddir = shift || "";
 my $dver = shift || "";
-my $ptr; # returned value pointer on the hash of filters
-my %ptr;
+my $ptr = undef; # returned value pointer on the hash of filters
 my %h;
 
@@ -1401 +1396 @@
         pb_log(2,"DEBUG f:".Dumper($ptr)."\n");
     }
-} else {
-    $ptr = { };
-}
-%ptr = %$ptr;
-return(\%ptr);
+}
+return($ptr);
 }
 
@@ -1591 +1583 @@
 
 if ((! -d "$ENV{$envar}") || (defined $pbinit)) {
-    pb_log(1,"Checking out $uri\n");
-    pb_cms_checkout($scheme,$uri,$ENV{$envar});
+    if (defined $pbinit) {
+        pb_mkdir_p("$ENV{$envar}");
+    } else {
+        pb_log(1,"Checking out $uri\n");
+        pb_cms_checkout($scheme,$uri,$ENV{$envar});
+    }
 } elsif (($scheme !~ /^cvs/) || ($scheme !~ /^svn/)) {
     # Do not compare if it's not a real cms
@@ -1653 +1649 @@
 my $ver;
 my $ver2;
-my ($packager) = pb_conf_get("pbpackager");
+my ($pbpackager) = pb_conf_get("pbpackager");
+
+if (not defined $pbpackager->{$ENV{'PBPROJ'}}) {
+    $pbpackager->{$ENV{'PBPROJ'}} = "undefined\@noproject.noorg";
+}
 
 # If we don't need to do it, or don't have it fake something
@@ -1663 +1663 @@
     if (($dtype eq "rpm") || ($dtype eq "fc")) {
         $ver2 = "$pbver-$pbtag$dsuf";
-        print $OUTPUT "* $ndate $packager->{$ENV{'PBPROJ'}} $ver2\n";
+        print $OUTPUT "* $ndate $pbpackager->{$ENV{'PBPROJ'}} $ver2\n";
         print $OUTPUT "- Updated to $pbver\n";
         }
@@ -1669 +1669 @@
         print $OUTPUT "$pkg ($pbver) unstable; urgency=low\n";
         print $OUTPUT "\n";
-        print $OUTPUT " -- $packager->{$ENV{'PBPROJ'}}  $n2date\n\n\n";
+        print $OUTPUT " -- $pbpackager->{$ENV{'PBPROJ'}}  $n2date\n\n\n";
         }
     return;
@@ -1712 +1712 @@
             $ver2 = "$ver$dsuf";
         }
-        print $OUTPUT "* $ndate $packager->{$ENV{'PBPROJ'}} $ver2\n";
+        print $OUTPUT "* $ndate $pbpackager->{$ENV{'PBPROJ'}} $ver2\n";
         print $OUTPUT "- Updated to $ver\n";
         }
@@ -1737 +1737 @@
     if ($dtype eq "deb") {
         # Cf: http://www.debian.org/doc/debian-policy/ch-source.html#s-dpkgchangelog
-        print $OUTPUT " -- $packager->{$ENV{'PBPROJ'}}  $n2date\n\n\n";
+        print $OUTPUT " -- $pbpackager->{$ENV{'PBPROJ'}}  $n2date\n\n\n";
         }