Changeset 87 in ProjectBuilder

Timestamp:

Sep 3, 2007, 2:46:15 PM (18 years ago)

Author:

Bruno Cornec

Message:

confparam is gone. params are stored in .pbrc instead

Location:

devel

Files:

• pb/bin/pb (modified) (2 diffs)
• pb/lib/ProjectBuilder/Base.pm (modified) (4 diffs)
• pb/lib/ProjectBuilder/Changelog.pm (modified) (3 diffs)
• pbconf/pb.pb (modified) (1 diff)

devel/pb/bin/pb

@@ -99 +99 @@
     pb_cms2build();
     pb_build2pkg();
+} elsif ($action =~ /^build2ftp$/) {
+    pb_build2ftp();
+} elsif ($action =~ /^pkg2ftp$/) {
+    pb_pkg2ftp();
 } else {
     print $LOG "'$action' is not available\n";
@@ -333 +337 @@
 }
 
+sub pb_build2ftp {
+
+    # Get list of packages to build
+    my $ptr = pb_get_pkg();
+    @pkgs = @$ptr;
+
+    # Get the running distro to build on
+    my ($ddir, $dver, $dfam, $dtype, $dsuf) = pb_distro_init();
+    print $LOG "DEBUG: distro tuple: ".join(',',($ddir, $dver, $dfam, $dtype, $dsuf))."\n" if ($debug >= 1);
+
+    # Get content saved in cms2build
+    my $pkg = pb_conf_read("$ENV{'PBDESTDIR'}/$pbprojver-$pbprojtag.pb","pbpkg");
+    $pkg = { } if (not defined $pkg);
+    my %pkg = %$pkg;
+
+    chdir "$ENV{'PBBUILDDIR'}";
+    foreach my $pbpkg (@pkgs) {
+        my $vertag = $pkg{$pbpkg};
+        # get the version of the current package - maybe different
+        ($pbver,$pbtag) = split(/-/,$vertag);
+
+        my $src="$ENV{'PBDESTDIR'}/$pbpkg-$pbver.tar.gz";
+        print $LOG "Source file: $src\n" if ($debug >= 0);
+
+    }
+}
+sub pb_pkg2ftp {
+
+    # Get list of packages to build
+    my $ptr = pb_get_pkg();
+    @pkgs = @$ptr;
+
+    # Get the running distro to build on
+    my ($ddir, $dver, $dfam, $dtype, $dsuf) = pb_distro_init();
+    print $LOG "DEBUG: distro tuple: ".join(',',($ddir, $dver, $dfam, $dtype, $dsuf))."\n" if ($debug >= 1);
+
+    # Get content saved in cms2build
+    my $pkg = pb_conf_read("$ENV{'PBDESTDIR'}/$pbprojver-$pbprojtag.pb","pbpkg");
+    $pkg = { } if (not defined $pkg);
+    my %pkg = %$pkg;
+
+    chdir "$ENV{'PBBUILDDIR'}";
+    foreach my $pbpkg (@pkgs) {
+        my $vertag = $pkg{$pbpkg};
+        # get the version of the current package - maybe different
+        ($pbver,$pbtag) = split(/-/,$vertag);
+
+        my $src="$ENV{'PBDESTDIR'}/$pbpkg-$pbver.tar.gz";
+        print $LOG "Source file: $src\n" if ($debug >= 0);
+
+        if ($dtype eq "rpm") {
+            # rpm has its own standard build directory
+            my $tmp=`rpmquery --eval '%{_topdir}' 2> /dev/null`;
+            chomp($tmp);
+            $ENV{'PBBUILDDIR'}=$tmp;
+            print $LOG "Working under $ENV{'PBBUILDDIR'}\n" if ($debug >= 0);
+            foreach my $d ('RPMS','SRPMS','SPECS','SOURCES','BUILD') {
+                if (! -d "$ENV{'PBBUILDDIR'}/$d") {
+                pb_mkdir_p("$ENV{'PBBUILDDIR'}/$d") || die "Please ensure that you can write into $ENV{'PBBUILDDIR'} to create $d\nSolution: setup _topdir in your ~/.rpmmacros or\nchown the $ENV{'PBBUILDDIR'} directory to your uid";
+                }
+            }
+
+            # We need to first extract the spec file
+            symlink "$src","$ENV{'PBBUILDDIR'}/SOURCES/".basename($src) || die "Unable to symlink $src in $ENV{'PBBUILDDIR'}/SOURCES";
+            my @specfile;
+            @specfile = pb_extract_build_files($src,"$pbpkg-$pbver/pbconf/$ddir-$dver/","$ENV{'PBBUILDDIR'}/SPECS");
+
+            print $LOG "specfile: ".Dumper(\@specfile)."\n" if ($debug >= 1);
+            # set LANGUAGE to check for correct log messages
+            $ENV{'LANGUAGE'}="C";
+            #system("ls -R $ENV{'PBBUILDDIR'}") if ($debug >= 1);
+            foreach my $f (@specfile) {
+                if ($f =~ /\.spec$/) {
+                    pb_system("rpmbuild -ba $f","Building package with $f");
+                    last;
+                }
+            }
+        } elsif ($dtype eq "tgz") {
+            pb_mkdir_p("$ENV{'PBBUILDDIR'}/install") if (! -d "$ENV{'PBBUILDDIR'}/install");
+        } elsif ($dtype eq "ebuild") {
+            pb_mkdir_p("$ENV{'PBBUILDDIR'}/portage") if (! -d "$ENV{'PBBUILDDIR'}/portage");
+        } else {
+        }
+    }
+}
+
 sub pb_get_pkg {
 

devel/pb/lib/ProjectBuilder/Base.pm

@@ -76 +76 @@
 
 my %version = ();
-my %confparam = ();
 
 if (-f "$ENV{'PBCONF'}/$proj.pb") {
-    # main parameter confparam (mandatory)
     # List of pkg to build by default (mandatory)
     # List of additional pkg to build when all is called (optional)
     # Valid version names (optional)
     # List of files to filter (optional)
-    my $ptr = pb_conf_read("$ENV{'PBCONF'}/$proj.pb","confparam","defpkgdir","extpkgdir","version","filteredfiles");
-    my ($confparam, $defpkgdir, $extpkgdir, $version, $filteredfiles) = @$ptr;
-    print "DEBUG: confparam: ".Dumper($confparam)."\n" if ($debug >= 1);
+    my $ptr = pb_conf_read("$ENV{'PBCONF'}/$proj.pb","defpkgdir","extpkgdir","version","filteredfiles");
+    my ($defpkgdir, $extpkgdir, $version, $filteredfiles) = @$ptr;
     print "DEBUG: defpkgdir: ".Dumper($defpkgdir)."\n" if ($debug >= 1);
     print "DEBUG: extpkgdir: ".Dumper($extpkgdir)."\n" if ($debug >= 1);
     print "DEBUG: version: ".Dumper($version)."\n" if ($debug >= 1);
     print "DEBUG: filteredfiles: ".Dumper($filteredfiles)."\n" if ($debug >= 1);
-    die "Unable to find confparam in $ENV{'PBCONF'}/$proj.pb" if (not defined $confparam);
     die "Unable to find defpkgdir in $ENV{'PBCONF'}/$proj.pb" if (not defined $defpkgdir);
-    %confparam = %$confparam;
     # Global
     %defpkgdir = %$defpkgdir;
@@ -106 +101 @@
 } else {
     die "Unable to open $ENV{'PBCONF'}/$proj.pb";
-}
-
-#
-# Export content if needed
-#
-if (defined $confparam{"cvsroot"}) {
-    $ENV{'CVSROOT'} = $confparam{"cvsroot"}; 
 }
 
@@ -278 +266 @@
 my $ret;
 
-my $cms = pb_conf_read("$ENV{'PBETC'}","cms");
+my ($cms,$cvsroot) = pb_conf_read("$ENV{'PBETC'}","cms","cvsroot");
 die "No CMS defined for $proj" if (not defined $cms);
 my %cms = %$cms;
@@ -295 +283 @@
     $ENV{'PBCMSLOGFILE'}="cvs.log";
     $ENV{'PBCMSEXP'}="cvs export"
+    #
+    # Export content if needed
+    #
+    $ENV{'CVSROOT'} = $cvsroot{$proj} if (defined $cvsroot{$proj});
 } else {
     die "CMS $cms{$proj} unknown";

devel/pb/lib/ProjectBuilder/Changelog.pm

@@ -66 +66 @@
     my $n2date = &UnixDate($date,"%a, %d %b %Y %H:%M:%S %z");
     #print "**$ndate**\n";
-    my $confparam = pb_conf_read("$ENV{'PBCONF'}/$ENV{'PBPROJ'}.pb", "confparam");
-    my %confparam = %$confparam;
+    my $packager = pb_conf_read("$ENV{'PBETC'}", "packager");
+    my %packager = %$packager;
     if (($dtype eq "rpm") || ($dtype eq "fc")) {
         if ($ver !~ /-/) {
@@ -79 +79 @@
             $ver2 = "$ver$dsuf";
         }
-        print $OUTPUT "* $ndate $confparam{'packager'} $ver2\n";
+        print $OUTPUT "* $ndate $packager{$ENV{'PBPROJ'}} $ver2\n";
         print $OUTPUT "- Updated to $ver\n";
         }
@@ -102 +102 @@
 
     if ($dtype eq "deb") {
-        print $OUTPUT " -- $confparam{'packager'} $n2date\n\n";
+        print $OUTPUT " -- $packager{$ENV{'PBPROJ'}} $n2date\n\n";
         print $OUTPUT "\n";
         }

devel/pbconf/pb.pb

@@ -5 +5 @@
 # $Id$
 #
-
-# confparam is a hash to ease interface
-
-# Packager for ChangeLogs
-confparam packager = "Bruno Cornec <bruno@mondorescue.org>"
-
-# If CVS give login method with CVSROOT
-#cvsroot = ":pserver:anonymous@linuxcoe.cvs.sourceforge.net:/cvsroot/linuxcoe"
-confparam cvsroot = " "
 
 # Hash of default package/package directory