Changeset 2219 in ProjectBuilder

Timestamp:

Mar 23, 2017, 10:58:19 AM (7 years ago)

Author:

Bruno Cornec

Message:

Fix prev*pre/post scripts

• Use scripts located under the package name to have per package possibility
• Fix locations to be uniquely identified now under PBTMP
• Checked locally

File:

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

devel/pb/bin/pb

@@ -1326 +1326 @@
                 my $pbrealpkg = pb_cms_get_real_pkg($pbpkg,$pbos->{'type'});
                 $pb->{'realpkg'} = $pbrealpkg;
-                pb_log(1,"Virtual package $pbpkg has a real package name of $pbrealpkg on $pbos->{'name'}-$pbos->{'version'}\n") if ($pbrealpkg ne $pbpkg);
+                pb_log(2,"Virtual package $pbpkg has a real package name of $pbrealpkg on $pbos->{'name'}-$pbos->{'version'}\n") if ($pbrealpkg ne $pbpkg);
     
                 # Filter build files from the less precise up to the most with overloading
@@ -1541 +1541 @@
         # Do we have additional script to run to prepare the environement for the project ? 
         # Then include it in the pbconf delivery
-        foreach my $pbvf (<$ENV{'PBROOTDIR'}/pbv*.pre>,<$ENV{'PBROOTDIR'}/pbv*.post>, <$ENV{'PBROOTDIR'}/pbtest*>) {
+        foreach my $pbvf (<$ENV{'PBROOTDIR'}/$pbpkg/pbv*.pre>,<$ENV{'PBROOTDIR'}/$pbpkg/pbv*.post>, <$ENV{'PBROOTDIR'}/$pbpkg/pbtest*>) {
+            pb_log(1,"Handling file $pbvf\n");
             if (-x "$pbvf") {
-                my $target = "$ENV{'PBDESTDIR'}/".basename($pbvf);
+                my $target = "$ENV{'PBTMP'}/".basename($pbvf);
                 pb_filter_file("$pbvf",$ptr,$target,$pb);
                 chmod 0755,"$target";
+                pb_log(1,"Capturing file $pbvf in $target\n");
             }
         }
@@ -3401 +3403 @@
 
     # We may need to do some other tasks before building. Read a script here to finish setup
-    if (-x "$ENV{'PBDESTDIR'}/pb$vtype".".pre") {
+    if (-x "$ENV{'PBTMP'}/pb$vtype".".pre") {
         print SCRIPT "# Special pre-instructions to be launched\n";
-        print SCRIPT pb_get_content("$ENV{'PBDESTDIR'}/pb$vtype".".pre");
-    }
-
-    if (-x "$ENV{'PBDESTDIR'}/pb$vtype"."$action.pre") {
+        print SCRIPT pb_get_content("$ENV{'PBTMP'}/pb$vtype".".pre");
+    }
+
+    if (-x "$ENV{'PBTMP'}/pb$vtype"."$action.pre") {
         print SCRIPT "# Special pre-$action instructions to be launched\n";
-        print SCRIPT pb_get_content("$ENV{'PBDESTDIR'}/pb$vtype"."$action.pre");
+        print SCRIPT pb_get_content("$ENV{'PBTMP'}/pb$vtype"."$action.pre");
     }
 
@@ -3427 +3429 @@
 
     # We may need to do some other tasks after building. Read a script here to exit properly
-    if (-x "$ENV{'PBDESTDIR'}/pb$vtype"."$action.post") {
+    if (-x "$ENV{'PBTMP'}/pb$vtype"."$action.post") {
         print SCRIPT "# Special post-$action instructions to be launched\n";
-        print SCRIPT pb_get_content("$ENV{'PBDESTDIR'}/pb$vtype"."$action.post");
-    }
-
-    if (-x "$ENV{'PBDESTDIR'}/pb$vtype".".post") {
+        print SCRIPT pb_get_content("$ENV{'PBTMP'}/pb$vtype"."$action.post");
+    }
+
+    if (-x "$ENV{'PBTMP'}/pb$vtype".".post") {
         print SCRIPT "# Special post-instructions to be launched\n";
-        print SCRIPT pb_get_content("$ENV{'PBDESTDIR'}/pb$vtype".".post");
+        print SCRIPT pb_get_content("$ENV{'PBTMP'}/pb$vtype".".post");
     }