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

Timestamp:

Sep 24, 2008, 12:23:42 AM (16 years ago)

Author:

Bruno Cornec

Message:

• Adds documentation on QEMU
• Fix pb to improve website delivery

File:

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

devel/pb/bin/pb

@@ -228 +228 @@
 
 Announce the availability of the project through various means
+
+=back 
+
+=item B<web2ssh>
+
+Deliver the Web site content to the target server using ssh.
 
 =back 
@@ -444 +450 @@
     # For announce only. Require avoids the systematic load of these modules
     require DBI;
+    require DBD::SQLite;
 
     pb_announce();
 } elsif ($action =~ /^web2ssh$/) {
     require DBI;
+    require DBD::SQLite;
 
     pb_cms2build("Web");
@@ -462 +470 @@
     my $pkg;
     my @pkgs;
+    my $webdir;
+
+    my %pkgs;
+    my %pb;             # Structure to store conf info
 
     # If Website, then pkg is only the website
     if ((defined $param) && ($param eq "Web")) {
-        my $webdir = pb_conf_get("webdir");
-        @pkgs = ($webdir->{$ENV{'PBPROJ'}});
+        ($webdir) = pb_conf_get("webdir");
+        pb_log(2,"webdir: ".Dumper($webdir)."\n");
+        $pkgs[0] = $webdir->{$ENV{'PBPROJ'}};
         $extpkgdir = $webdir;
-        pb_log(0,"Packages: ".join(',',@pkgs)."\n");
+        pb_log(0,"Package: $pkgs[0]\n");
     } else {
         $pkg = pb_cms_get_pkg($defpkgdir,$extpkgdir);
         @pkgs = @$pkg;
     }
-
-    my %pkgs;
-    my %pb;             # Structure to store conf info
 
     my ($scheme, $uri) = pb_cms_init($pbinit);
@@ -1356 +1366 @@
             }
         if ($v =~ /x86_64/) {
-                $vmcmd = "$qemucmd64 -no-kqemu";
+                $vmcmd = "$qemucmd64";
+                # Not needed with latest versions of qemu it seems
+                #$vmcmd = "$qemucmd64 -no-kqemu";
+                # This one may now be needed
+                #$vmcmd = "$qemucmd64 -no-kvm";
             } else {
                 $vmcmd = "$qemucmd32";