Changeset 2271 in ProjectBuilder for devel/pb

Timestamp:

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

Author:

Bruno Cornec

Message:

file install now uses precise directories for tar files

File:

• devel/pb/bin/pb (modified) (4 diffs)

devel/pb/bin/pb

@@ -3887 +3887 @@
 
 # We need to have that pb_distro_get_context function
-# Get it from Project-Builder::Distribution
+# Get it from ProjectBuilder::Distribution
 # And we now need the conf file required for this to work created above
 
@@ -4003 +4003 @@
     if ($itype =~ /^file/) {
         my $cmdget;
+        my ($pbver1,$pbver2,$pbextdir);
+        my ($tmp1,$tmp2);
         if (defined $sbx) {
             # Install from sandbox mean using the result of the just passed sbx2build command
             # Get content saved in cms2build
             my ($pkg) = pb_conf_read("$ENV{'PBDESTDIR'}/$ENV{'PBPROJVER'}-$ENV{'PBPROJTAG'}.yml","pbpkg");
-            my $pbextdir = pb_get_extdir();
+            $pbextdir = pb_get_extdir();
             die "Unable to get package list" if (not defined $pkg);
 
@@ -4016 +4018 @@
             pb_log(2,"Vertag1: $vertag1\n");
             pb_log(2,"Vertag2: $vertag2\n");
-            my ($pbver1,$tmp1) = split(/-/,$vertag1);
-            my ($pbver2,$tmp2) = split(/-/,$vertag2);
+            ($pbver1,$tmp1) = split(/-/,$vertag1);
+            ($pbver2,$tmp2) = split(/-/,$vertag2);
             $cmdget = "mv /tmp/ProjectBuilder-$pbver1$pbextdir.tar.gz ProjectBuilder-latest.tar.gz ; mv /tmp/project-builder-$pbver2$pbextdir.tar.gz project-builder-latest.tar.gz";
         } else {
@@ -4047 +4049 @@
 EOF
         print SCRIPT " $cmdget ; ";
-        print SCRIPT << 'EOF'
-gzip -cd ProjectBuilder-latest.tar.gz | tar xf - ; cd ProjectBuilder-* ; perl Makefile.PL ; make ; make install ; cd .. ; rm -rf ProjectBuilder-* ; gzip -cd project-builder-latest.tar.gz | tar xf - ; cd project-builder-* ; perl Makefile.PL ; make ; make install ; cd .. ; rm -rf project-builder-* ;","Building Project-Builder");
+        print SCRIPT << "EOF"
+gzip -cd ProjectBuilder-latest.tar.gz | tar xf - ; cd ProjectBuilder-$pbver1$pbextdir ; perl Makefile.PL ; make ; make install ; cd .. ; rm -rf ProjectBuilder-* ; gzip -cd project-builder-latest.tar.gz | tar xf - ; cd project-builder-$pbver2$pbextdir ; perl Makefile.PL ; make ; make install ; cd .. ; rm -rf project-builder-* ;","Building Project-Builder");
 EOF
     } elsif ($itype =~ /^pkg/) {