Changeset 435 in ProjectBuilder

Timestamp:

May 11, 2008, 11:54:06 PM (16 years ago)

Author:

Bruno Cornec

Message:

• Fix for #23
• preliminary slackware support added
• option UserKnownHostsFile of ssh used by default now

File:

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

devel/pb/bin/pb

@@ -484 +484 @@
         pb_cms_export($uri,"$ENV{'PBDIR'}/$dir",$dest);
 
-        # Get project info on authors and log file
-        my $chglog = "$ENV{'PBROOTDIR'}/$pbpkg/pbcl";
-        $chglog = "$ENV{'PBROOTDIR'}/pbcl" if (! -f $chglog);
-        $chglog = undef if (! -f $chglog);
-
-        my $authors = "$ENV{'PBROOTDIR'}/$pbpkg/pbauthors";
-        $authors = "$ENV{'PBROOTDIR'}/pbauthors" if (! -f $authors);
-        $authors = "/dev/null" if (! -f $authors);
-
-        # Extract cms log history and store it
-        if ((defined $chglog) && (! -f "$dest/NEWS")) {
-            pb_log(2,"Generating NEWS file from $chglog\n");
-            copy($chglog,"$dest/NEWS") || die "Unable to create $dest/NEWS";
-        }
-        pb_cms_log($scheme,"$ENV{'PBDIR'}/$dir",$dest,$chglog,$authors);
+        # Generated fake content for test versions to speed up stuff
+        my ($testver) = pb_conf_get_if("testver");
+        my $chglog;
+
+        if ((defined $testver) && (defined $testver->{$ENV{'PBPROJ'}}) && ($testver->{$ENV{'PBPROJ'}} =~ /true/i)) {
+            if (! -f "$dest/NEWS") {
+                open(NEWS,"> $dest/NEWS") || die "Unable to create $dest/NEWS";
+                close(NEWS);
+            }
+            open(CL,"> $dest/ChangeLog") || die "Unable to create $dest/ChangeLog";
+            close(CL);
+            open(CL,"> $dest/$ENV{'PBCMSLOGFILE'}") || die "Unable to create $dest/$ENV{'PBCMSLOGFILE'}";
+            close(CL);
+            $chglog = undef;
+        } else {
+
+            # Get project info on authors and log file
+            $chglog = "$ENV{'PBROOTDIR'}/$pbpkg/pbcl";
+            $chglog = "$ENV{'PBROOTDIR'}/pbcl" if (! -f $chglog);
+            $chglog = undef if (! -f $chglog);
+
+            my $authors = "$ENV{'PBROOTDIR'}/$pbpkg/pbauthors";
+            $authors = "$ENV{'PBROOTDIR'}/pbauthors" if (! -f $authors);
+            $authors = "/dev/null" if (! -f $authors);
+
+            # Extract cms log history and store it
+            if ((defined $chglog) && (! -f "$dest/NEWS")) {
+                pb_log(2,"Generating NEWS file from $chglog\n");
+                copy($chglog,"$dest/NEWS") || die "Unable to create $dest/NEWS";
+            }
+            pb_cms_log($scheme,"$ENV{'PBDIR'}/$dir",$dest,$chglog,$authors);
+        }
 
         my %build;
-
         my @pt;
+        my $tmpl = "";
+
         @pt = pb_conf_get_if("vmlist","velist");
-        my $tmpl = "";
         if (defined $pt[0]->{$ENV{'PBPROJ'}}) {
             $tmpl .= $pt[0]->{$ENV{'PBPROJ'}};
@@ -689 +706 @@
             # For gentoo we need to take pb as subsystem name
             # We put every apps here under sys-apps. hope it's correct
-            # We use pb's home dir in order o have a single OVERLAY line
+            # We use pb's home dir in order to have a single OVERLAY line
             my $tmpd = "$ENV{'HOME'}/portage/pb/sys-apps/$pbpkg";
             pb_mkdir_p($tmpd) if (! -d "$tmpd");
@@ -736 +753 @@
             $made="$made portage/pb/sys-apps/$pbpkg/$pbpkg-$pbver.ebuild";
         } elsif ($dtype eq "slackware") {
-            $made="$made build-$pbpkg/$pbpkg-$pbver-*-$pbtag.tgz";
-            pb_mkdir_p("$ENV{'PBBUILDDIR'}/install") if (! -d "$ENV{'PBBUILDDIR'}/install");
+            $made="$made $pbpkg/$pbpkg-$pbver-*-$pbtag.tgz";
+
+            chdir "$ENV{'PBBUILDDIR'}" || die "Unable to chdir to $ENV{'PBBUILDDIR'}";
+            pb_system("tar xfz $src","Extracting sources");
+            chdir "$pbpkg-$pbver" || die "Unable to chdir to $pbpkg-$pbver";
+            symlink "pbconf/$ddir-$dver","install" || die "Unable to symlink to pbconf/$ddir-$dver";
+            if (-x "install/pbslack") {
+                pb_system("./install/pbslack","Building package");
+                pb_system("sudo /sbin/makepkg -p -l y -c y $pbpkg","Packaging $pbpkg");
+            }
         } else {
             die "Unknown dtype format $dtype";
@@ -869 +894 @@
     if (($cmt eq "Sources") || ($cmt eq "Script")) {
         $tdir = "$sshdir->{$ENV{'PBPROJ'}}/src";
+        if ((defined $testver) && (defined $testver->{$ENV{'PBPROJ'}}) && ($testver->{$ENV{'PBPROJ'}} =~ /true/i)) {
+            # This is a test pkg => target dir is under test
+            $tdir = "$sshdir->{$ENV{'PBPROJ'}}/test/src";
+        }
     } elsif (($cmt eq "vm") || ($cmt eq "ve")) {
         $tdir = $sshdir->{$ENV{'PBPROJ'}}."/$ENV{'PBPROJ'}/delivery";
@@ -951 +980 @@
     if ($cmt ne "ve") {
         my $keyfile = pb_ssh_get(0);
-        $shcmd = "ssh -i $keyfile -q -p $nport $mac";
-        $cpcmd = "scp -i $keyfile -p -P $nport";
+        $shcmd = "ssh -i $keyfile -q -o UserKnownHostsFile=/dev/null -p $nport $mac";
+        $cpcmd = "scp -i $keyfile -p -o UserKnownHostsFile=/dev/null -P $nport";
         $cptarget = "$mac:$tdir";
         if ($cmt eq "vm") {
@@ -1362 +1391 @@
         $key = "\Q$zero1";
 
-        pb_system("cat $keyfile.pub | ssh -q -p $nport -i $keyfile root\@$vmhost->{$ENV{'PBPROJ'}} \"mkdir -p .ssh ; chmod 700 .ssh ; cat >> .ssh/authorized_keys ; chmod 600 .ssh/authorized_keys\"","Copying local keys to $vtype. This will require the root password");
+        pb_system("cat $keyfile.pub | ssh -q -o UserKnownHostsFile=/dev/null -p $nport -i $keyfile root\@$vmhost->{$ENV{'PBPROJ'}} \"mkdir -p .ssh ; chmod 700 .ssh ; cat >> .ssh/authorized_keys ; chmod 600 .ssh/authorized_keys\"","Copying local keys to $vtype. This will require the root password");
         # once this is done, we can do what we want on the VM remotely
     }