Changeset 2270 in ProjectBuilder for devel

Timestamp:

Aug 30, 2017, 5:07:53 PM (7 years ago)

Author:

Bruno Cornec

Message:

FIX usage of PBCONFVER in VE/VM

Location:

devel

Files:

• pb-modules/lib/ProjectBuilder/Base.pm (modified) (2 diffs)
• pb-modules/lib/ProjectBuilder/Version.pm (modified) (3 diffs)
• pb/bin/pb (modified) (4 diffs)

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

@@ -26 +26 @@
 # Inherit from the "Exporter" module which handles exporting functions.
  
-use vars qw($VERSION $REVISION @ISA @EXPORT);
+use vars qw($VERSION $REVISION $PBCONFVER @ISA @EXPORT);
 use Exporter;
  
@@ -41 +41 @@
 our @ISA = qw(Exporter);
 our @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);
-($VERSION,$REVISION) = pb_version_init();
+($VERSION,$REVISION,$PBCONFVER) = pb_version_init();
 
 =pod

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

@@ -14 +14 @@
 # Inherit from the "Exporter" module which handles exporting functions.
  
-use vars qw($VERSION $REVISION @ISA @EXPORT);
+use vars qw($VERSION $REVISION $PBCONFVER @ISA @EXPORT);
 use Exporter;
  
@@ -24 +24 @@
 $VERSION = "PBVER"."PBEXTDIR";
 $REVISION = "PBREV";
+# We fix the format of the conf file for this version of pb
+$PBCONFVER = 1;
 
 sub pb_version_init {
@@ -29 +31 @@
 my $projectbuilderver = $VERSION;
 my $projectbuilderrev = $REVISION;
+my $projectbuilderconfver = $PBCONFVER;
 
 return($projectbuilderver,$projectbuilderrev);

devel/pb/bin/pb

@@ -734 +734 @@
 # ---------------------------------------------------------------------------
 
-my ($projectbuilderver,$projectbuilderrev) = pb_version_init();
+my ($projectbuilderver,$projectbuilderrev,$projectbuilderconfver) = pb_version_init();
 my $appname = "pb";
 
 # Initialize the syntax string
 
-pb_syntax_init("$appname (aka project-builder.org) Version $projectbuilderver-$projectbuilderrev\n");
+pb_syntax_init("$appname (aka project-builder.org) Version $projectbuilderver-$projectbuilderrev Conf $projectbuilderconfver\n");
 
 GetOptions("help|?|h+" => \$opts{'h'}, 
@@ -3753 +3753 @@
 $ppref \$pbdisplaytype = "text";
 $ppref \$pblocale = "";
+$ppref \$PBCONFVER = $projectbuilderconfver;
 EOF
     print SCRIPT << 'EOF';
@@ -3774 +3775 @@
         print SCRIPT << "EOF";
 # For VE we need a good null dev
-# Except for RedHat 6.2 where it's good and doesnt like being recreated
+# Except for RedHat 6.2 where it's good and doesn't like being recreated
 EOF
         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/));
@@ -4110 +4111 @@
 sub pb_version_init {
 
-return("$projectbuilderver","$projectbuilderrev");
+return("$projectbuilderver","$projectbuilderrev","$projectbuilderconfver");
 }
 1;