Changeset 2270


Ignore:
Timestamp:
Aug 30, 2017, 5:07:53 PM (3 months ago)
Author:
bruno
Message:

FIX usage of PBCONFVER in VE/VM

Location:
devel
Files:
3 edited

Legend:

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

    r2119 r2270  
    2626# Inherit from the "Exporter" module which handles exporting functions.
    2727 
    28 use vars qw($VERSION $REVISION @ISA @EXPORT);
     28use vars qw($VERSION $REVISION $PBCONFVER @ISA @EXPORT);
    2929use Exporter;
    3030 
     
    4141our @ISA = qw(Exporter);
    4242our @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_get_osrelease pb_check_requirements pb_check_req pb_path_expand pb_exit $pbdebug $pbLOG $pbdisplaytype $pblocale);
    43 ($VERSION,$REVISION) = pb_version_init();
     43($VERSION,$REVISION,$PBCONFVER) = pb_version_init();
    4444
    4545=pod
  • devel/pb-modules/lib/ProjectBuilder/Version.pm

    r2241 r2270  
    1414# Inherit from the "Exporter" module which handles exporting functions.
    1515 
    16 use vars qw($VERSION $REVISION @ISA @EXPORT);
     16use vars qw($VERSION $REVISION $PBCONFVER @ISA @EXPORT);
    1717use Exporter;
    1818 
     
    2424$VERSION = "PBVER"."PBEXTDIR";
    2525$REVISION = "PBREV";
     26# We fix the format of the conf file for this version of pb
     27$PBCONFVER = 1;
    2628
    2729sub pb_version_init {
     
    2931my $projectbuilderver = $VERSION;
    3032my $projectbuilderrev = $REVISION;
     33my $projectbuilderconfver = $PBCONFVER;
    3134
    3235return($projectbuilderver,$projectbuilderrev);
  • devel/pb/bin/pb

    r2267 r2270  
    734734# ---------------------------------------------------------------------------
    735735
    736 my ($projectbuilderver,$projectbuilderrev) = pb_version_init();
     736my ($projectbuilderver,$projectbuilderrev,$projectbuilderconfver) = pb_version_init();
    737737my $appname = "pb";
    738738
    739739# Initialize the syntax string
    740740
    741 pb_syntax_init("$appname (aka project-builder.org) Version $projectbuilderver-$projectbuilderrev\n");
     741pb_syntax_init("$appname (aka project-builder.org) Version $projectbuilderver-$projectbuilderrev Conf $projectbuilderconfver\n");
    742742
    743743GetOptions("help|?|h+" => \$opts{'h'},
     
    37533753$ppref \$pbdisplaytype = "text";
    37543754$ppref \$pblocale = "";
     3755$ppref \$PBCONFVER = $projectbuilderconfver;
    37553756EOF
    37563757    print SCRIPT << 'EOF';
     
    37743775        print SCRIPT << "EOF";
    37753776# For VE we need a good null dev
    3776 # Except for RedHat 6.2 where it's good and doesnt like being recreated
     3777# Except for RedHat 6.2 where it's good and doesn't like being recreated
    37773778EOF
    37783779        print SCRIPT "pb_system('rm -f /dev/null; mknod /dev/null c 1 3; chmod 777 /dev/null');\n" unless (($pbos->{'name'} =~ /^redhat/) && ($pbos->{'version'} =~ /^6/));
     
    41104111sub pb_version_init {
    41114112
    4112 return("$projectbuilderver","$projectbuilderrev");
     4113return("$projectbuilderver","$projectbuilderrev","$projectbuilderconfver");
    41134114}
    411441151;
Note: See TracChangeset for help on using the changeset viewer.