Changeset 287 in ProjectBuilder

Timestamp:

Nov 16, 2007, 12:31:29 AM (16 years ago)

Author:

Bruno Cornec

Message:

• Fix build process for new pb functions on changelogs
• Fix bugs in newproj where project wasn't always used (some fixed pb were remaining)

Location:

devel

Files:

• pb/lib/ProjectBuilder/Base.pm (modified) (3 diffs)
• pb/lib/ProjectBuilder/Distribution.pm (modified) (2 diffs)
• pbconf/project-builder/rpm/project-builder.spec (modified) (1 diff)

devel/pb/lib/ProjectBuilder/Base.pm

@@ -176 +176 @@
 # 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,ubuntu_7.10
+#vmlist $proj = 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
 
 #
@@ -187 +187 @@
 
 # We suppose we can commmunicate with the VM through SSH
-#vmhost pb = localhost
-#vmlogin pb = pb
-#vmport pb = 2222
+#vmhost $proj = localhost
+#vmlogin $proj = pb
+#vmport $proj = 2222
 
 # Timeout to wait when VM is launched/stopped
@@ -195 +195 @@
 
 # per VMs needed paramaters
-#vmopt pb = -m 384 -daemonize
-#vmpath pb = /home/qemu
-#vmsize pb = 5G
+#vmopt $proj = -m 384 -daemonize
+#vmpath $proj = /home/qemu
+#vmsize $proj = 5G
 
 #

devel/pb/lib/ProjectBuilder/Distribution.pm

@@ -158 +158 @@
 # Tested
     'gentoo'                => '.* version (.+)',
-    'debian'                => '(.+)',
     'slackware'             => 'S[^ ]* (.+)$',
 # There should be no ambiguity between potential ambiguous distro
@@ -172 +171 @@
     'suse'                  => 'SUSE LINUX (\d.+) \(',
     'opensuse'              => 'openSUSE (\d.+) \(',
+    'debian'                => '(.+)',
     'lsb'                   => '.*[^Ubunt].*\nDISTRIB_RELEASE=(.+)',
 # Ubuntu 6.06 includes a /etc/debian_version file that needs to be 

devel/pbconf/project-builder/rpm/project-builder.spec

@@ -48 +48 @@
 %files
 %defattr(-,root,root)
-%doc ChangeLog
-%doc INSTALL COPYING README AUTHORS contrib/pbsetupqemu
+%doc ChangeLog NEWS AUTHORS
+%doc INSTALL COPYING README contrib/pbsetupqemu
 
 %{perlvendorlib}/*