Changeset 287


Ignore:
Timestamp:
Nov 16, 2007, 12:31:29 AM (12 years ago)
Author:
bruno
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:
3 edited

Legend:

Unmodified
Added
Removed
  • devel/pb/lib/ProjectBuilder/Base.pm

    r286 r287  
    176176# a QEMU rhel_3 here means that the VM will be named rhel_3.qemu
    177177#
    178 #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
     178#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
    179179
    180180#
     
    187187
    188188# We suppose we can commmunicate with the VM through SSH
    189 #vmhost pb = localhost
    190 #vmlogin pb = pb
    191 #vmport pb = 2222
     189#vmhost $proj = localhost
     190#vmlogin $proj = pb
     191#vmport $proj = 2222
    192192
    193193# Timeout to wait when VM is launched/stopped
     
    195195
    196196# per VMs needed paramaters
    197 #vmopt pb = -m 384 -daemonize
    198 #vmpath pb = /home/qemu
    199 #vmsize pb = 5G
     197#vmopt $proj = -m 384 -daemonize
     198#vmpath $proj = /home/qemu
     199#vmsize $proj = 5G
    200200
    201201#
  • devel/pb/lib/ProjectBuilder/Distribution.pm

    r265 r287  
    158158# Tested
    159159    'gentoo'                => '.* version (.+)',
    160     'debian'                => '(.+)',
    161160    'slackware'             => 'S[^ ]* (.+)$',
    162161# There should be no ambiguity between potential ambiguous distro
     
    172171    'suse'                  => 'SUSE LINUX (\d.+) \(',
    173172    'opensuse'              => 'openSUSE (\d.+) \(',
     173    'debian'                => '(.+)',
    174174    'lsb'                   => '.*[^Ubunt].*\nDISTRIB_RELEASE=(.+)',
    175175# Ubuntu 6.06 includes a /etc/debian_version file that needs to be
  • devel/pbconf/project-builder/rpm/project-builder.spec

    r286 r287  
    4848%files
    4949%defattr(-,root,root)
    50 %doc ChangeLog
    51 %doc INSTALL COPYING README AUTHORS contrib/pbsetupqemu
     50%doc ChangeLog NEWS AUTHORS
     51%doc INSTALL COPYING README contrib/pbsetupqemu
    5252
    5353%{perlvendorlib}/*
Note: See TracChangeset for help on using the changeset viewer.