Changeset 1156 in ProjectBuilder for devel/pb-modules


Ignore:
Timestamp:
Jan 13, 2011, 1:18:37 PM (14 years ago)
Author:
Bruno Cornec
Message:
  • Adds a global variable REVISION for version management
  • Do not return in pb_send2target if pb file not available in order to shutdown VM in all cases
  • Code and test sbx2setupvm
  • setup_v now needs a fake pb_version_init fct added at the end of the script
  • Fix pbdistrocheck install comand printing
  • Fix mandralinux old distro build in pb.conf (Note only non symlink release files are important)
Location:
devel/pb-modules
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • devel/pb-modules/bin/pbdistrocheck

    r1111 r1156  
    144144        $pbsuf = "Suffix:\t$pbsuf";
    145145        $pbupd = "Update:\t$pbupd";
    146         $pbins = "Install:\t$pbupd";
     146        $pbins = "Install:\t$pbins";
    147147        $arch = "Arch:\t$arch";
    148148        print "Project-Builder tuple:\n";

  • devel/pb-modules/etc/pb.conf

    r1155 r1156  
    3333osrelfile mandriva = /etc/mandriva-release
    3434
    35 # Mandrake = 10.1,10.2
    36 osrelfile mandrake = /etc/mandrakelinux-release
     35# Mageia TBC
     36osrelfile mageia = /etc/mageia-release
    3737
    3838# Fedora >= 4
    … …  
    8383# Here are the ambiguous file association
    8484# E.g. the file /etc/redhat-release is found on multiple distro such as redhat, rhel, centos, mandrake, vmware
    85 #
    86 
    87 # Mandrake <= 10.1
    88 osrelambfile mandrake = /etc/mandrake-release
     85# These files should no be links
     86#
     87
     88# Mandrake >= 10.1
     89osrelambfile mandrake = /etc/mandrakelinux-release
    8990
    9091# Debian >= 3.1
    … …  
    117118osrelexpr slackware = S[^ ]* (.+)$
    118119osrelexpr mandriva = Mandr[^ ]* [^ ]* release (.+) \(
    119 osrelexpr mandrake = Mandrakelinux release (.+) \(
     120osrelexpr mandrake = Mandr[^ ]* release (.+) \(
    120121osrelexpr fedora = Fedora .*release (\d+) \(
    121122osrelexpr vmware = VMware ESX Server (\d+) \(
    … …  
    394395osperldep mandrake-10.1 = Date-Manip
    395396ospkgdep mandrake-10.1 = rpm-build,wget,patch,make,ntp-client,perl-File-MimeInfo,diffutils
     397ospkgdep mandrake-10.2 = rpm-build,wget,patch,make,ntp-client,perl-File-MimeInfo,diffutils,perl-DateManip
    396398osperldep md =
    397399ospkgdep md = rpm-build,wget,patch,make,ntp-client,perl-File-MimeInfo,perl-File-BaseDir,perl-Date-Manip,diffutils

  • devel/pb-modules/lib/ProjectBuilder/Base.pm

    r1148 r1156  
    2525# Inherit from the "Exporter" module which handles exporting functions.
    2626 
    27 use vars qw($VERSION @ISA @EXPORT);
     27use vars qw($VERSION $REVISION @ISA @EXPORT);
    2828use Exporter;
    2929 
    … …  
    4040our @ISA = qw(Exporter);
    4141our @EXPORT = qw(pb_mkdir_p pb_system pb_rm_rf pb_get_date pb_log pb_log_init pb_get_uri pb_get_content pb_set_content pb_display_file pb_syntax_init pb_syntax pb_temp_init pb_get_arch pb_check_requirements pb_check_req $pbdebug $pbLOG $pbdisplaytype $pblocale);
    42 $VERSION = "$ProjectBuilder::Version::VERSION";
     42($VERSION,$REVISION) = pb_version_init();
    4343
    4444=pod

  • devel/pb-modules/lib/ProjectBuilder/Conf.pm

    r1148 r1156  
    1717# Inherit from the "Exporter" module which handles exporting functions.
    1818 
    19 use vars qw($VERSION @ISA @EXPORT);
     19use vars qw($VERSION $REVISION @ISA @EXPORT);
    2020use Exporter;
    2121 
    … …  
    2525our @ISA = qw(Exporter);
    2626our @EXPORT = qw(pb_conf_init pb_conf_add pb_conf_read pb_conf_read_if pb_conf_get pb_conf_get_if);
    27 $VERSION = "$ProjectBuilder::Version::VERSION";
     27($VERSION,$REVISION) = pb_version_init();
    2828
    2929# Global hash of conf files

  • devel/pb-modules/lib/ProjectBuilder/Display.pm

    r1148 r1156  
    2323# Inherit from the "Exporter" module which handles exporting functions.
    2424 
    25 use vars qw($VERSION @ISA @EXPORT);
     25use vars qw($VERSION $REVISION @ISA @EXPORT);
    2626use Exporter;
    2727 
    … …  
    3535our @ISA = qw(Exporter);
    3636our @EXPORT = qw(pb_display pb_display_init $pbdisplaytype $pblocale);
    37 $VERSION = "$ProjectBuilder::Version::VERSION";
     37($VERSION,$REVISION) = pb_version_init();
    3838
    3939=pod

  • devel/pb-modules/lib/ProjectBuilder/Distribution.pm

    r1148 r1156  
    1919# Inherit from the "Exporter" module which handles exporting functions.
    2020 
    21 use vars qw($VERSION @ISA @EXPORT);
     21use vars qw($VERSION $REVISION @ISA @EXPORT);
    2222use Exporter;
    2323 
    … …  
    2727our @ISA = qw(Exporter);
    2828our @EXPORT = qw(pb_distro_conffile pb_distro_init pb_distro_get pb_distro_getlsb pb_distro_installdeps pb_distro_getdeps pb_distro_only_deps_needed pb_distro_setuprepo pb_distro_setuposrepo pb_distro_get_param);
    29 $VERSION = "$ProjectBuilder::Version::VERSION";
     29($VERSION,$REVISION) = pb_version_init();
    3030
    3131=pod
    … …  
    156156This function returns a list of 2 parameters indicating the distribution name and version of the underlying Linux distribution. The value of those 2 fields may be "unknown" in case the function was unable to recognize on which distribution it is running.
    157157
    158 On my home machine it would currently report ("mandriva","2009.0").
     158On my home machine it would currently report ("mandriva","2010.2").
    159159
    160160=cut

  • devel/pb-modules/lib/ProjectBuilder/Version.pm

    r1148 r1156  
    1111# Inherit from the "Exporter" module which handles exporting functions.
    1212 
    13 use vars qw($VERSION @ISA @EXPORT);
     13use vars qw($VERSION $REVISION @ISA @EXPORT);
    1414use Exporter;
    1515 
    … …  
    1919our @EXPORT = qw(pb_version_init);
    2020
    21 $VERSION = 'PBVER';
     21$VERSION = "PBVER";
     22$REVISION = "PBREV";
    2223
    2324sub pb_version_init {
    2425
    25 my $projectbuilderver = "PBVER";
    26 my $projectbuilderrev = "PBREV";
     26my $projectbuilderver = $VERSION;
     27my $projectbuilderrev = $REVISION;
    2728
    2829return($projectbuilderver,$projectbuilderrev);
Note: See TracChangeset for help on using the changeset viewer.