Changeset 265 in ProjectBuilder for devel

Timestamp:

Oct 27, 2007, 7:10:45 PM (16 years ago)

Author:

Bruno Cornec

Message:

• Ubuntu 7.10 support added
• pbinit executed after filtering (solves configure.in issue)
• pbinit itself filtered (allow for mondo doc support)

Location:

devel

Files:

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

devel/pb/ChangeLog

@@ -4 +4 @@
 
 0.8.9 (2007-10-25)
-- Fix a bug for support of PBLOG = no
+- Fix a bug for support of PBLOG = no (Bruno Cornec)
 
 0.8.8 (2007-10-25)
-- Add correct support for PBLOG = no
+- Add correct support for PBLOG = no (Bruno Cornec)
 
 0.8.7 (2007-10-23)
-- Fix #2
+- Fix #2 (Bruno Cornec)
 
 0.8.6 (2007-10-22)
-- Add Debian build support
-- New filtering rules
-- Add flat support to svn and cvs
-- Fix #4 
+- Add Debian build support (Bruno Cornec)
+- New filtering rules (Bruno Cornec)
+- Add flat support to svn and cvs (Bruno Cornec)
+- Fix #4  (Bruno Cornec)
 
 0.8.5 (2007-10-16)
-- First public version
+- First public version (Bruno Cornec)
 
 0.5 (2007-07-26)
-- Creation of the project based on mondorescue build tools
+- Creation of the project based on mondorescue build tools (Bruno Cornec)

devel/pb/bin/pb

@@ -254 +254 @@
                 next;
             }
+            $bfiles{"pbinit"} = "$pbpkg/pbinit";
             print $LOG "DEBUG bfiles: ".Dumper(\%bfiles)."\n" if ($debug >= 1);
 
@@ -277 +278 @@
             print $LOG "No Build files found for ".join(',',@notfound)."\n";
         }
-        # Prepare the dest directory for archive
-        if (-x "$ENV{'PBCONF'}/$pbpkg/pbinit") {
-            #pb_system("cd $dest ; $ENV{'PBCONF'}/$pbpkg/pbinit","Executing init script $ENV{'PBCONF'}/$pbpkg/pbinit");
-            print $LOG "Executing init script $ENV{'PBCONF'}/$pbpkg/pbinit\n";
-            system("cd $dest ; $ENV{'PBCONF'}/$pbpkg/pbinit");
-        }
-
         # Get the generic filter (all.pbf) and 
         # apply those to the non-build files including those
@@ -299 +293 @@
         }
         print $LOG "Files ".$liste."have been filtered\n";
+
+        # Prepare the dest directory for archive
+        if (-x "$ENV{'PBCONF'}/$pbpkg/pbinit") {
+            pb_system("cd $dest ; $ENV{'PBCONF'}/$pbpkg/pbinit","Executing init script $ENV{'PBCONF'}/$pbpkg/pbinit");
+        }
 
         # Archive dest dir

devel/pb/lib/ProjectBuilder/Base.pm

@@ -239 +239 @@
     $p1 = $ptr1[$i];
     $p2 = $ptr2[$i];
-    die "No $param[$i] defined for $ENV{'PBPROJ'}" if ((not defined @ptr1) && (not defined @ptr2));
+    die "No $param[$i] defined for $ENV{'PBPROJ'}" if ((not @ptr1) && (not @ptr2));
     die "No $param[$i] defined for $ENV{'PBPROJ'}" if ((not defined $p1) && (not defined $p2));
     # Always try to take the param from the home dir conf file in priority

devel/pb/lib/ProjectBuilder/Distribution.pm

@@ -176 +176 @@
 # renamed to /etc/debian_version.sav as there is no way to distinguish
 # Ubuntu 6.06 from debian testing otherwise
+# Same is true for Ubuntu 7.10 :-(
     'ubuntu'                => '.*Ubuntu.*\nDISTRIB_RELEASE=(.+)',
 # Not tested

devel/pbconf/pb.pb

@@ -32 +32 @@
 # a QEMU rhel_3 here means that the VM will be named rhel_3.qemu
 #
-vmlist pb = mandrake_10.1,mandrake_10.2,mandriva_2006.0,mandriva_2007.0,mandriva_2007.1,mandriva_2008.0,redhat_7.3,redhat_9,fedora_4,fedora_5,fedora_6,fedora_7,rhel_3,rhel_4,rhel_5,suse_10.0,suse_10.1,suse_10.2,suse_10.3,sles_9,sles_10,gentoo_nover,debian_3.1,debian_4.0,ubuntu_6.06,ubuntu_7.04
+vmlist pb = mandrake_10.1,mandrake_10.2,mandriva_2006.0,mandriva_2007.0,mandriva_2007.1,mandriva_2008.0,redhat_7.3,redhat_9,fedora_4,fedora_5,fedora_6,fedora_7,rhel_3,rhel_4,rhel_5,suse_10.0,suse_10.1,suse_10.2,suse_10.3,sles_9,sles_10,gentoo_nover,debian_3.1,debian_4.0,ubuntu_6.06,ubuntu_7.04,ubuntu_7.10
 
 #
@@ -53 +53 @@
 vmopt pb = -m 384 -daemonize
 vmpath pb = /users/qemu
+vmsize pb = 5G
 
 #