Changeset 1259

Timestamp:

03/12/11 14:34:00 (2 years ago)

Author:

bruno

Message:

• Fix #92 as well as documentation generation which was also broken (linufr.org report)

File:

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

devel/pb/bin/pb

@@ -756 +756 @@
 
     # declare packager and repo for filtering
-    # TODO: Is pbrepo needed so early in the process ?
     my ($tmp1, $tmp2) = pb_conf_get("pbpackager","pbrepo");
     $ENV{'PBPACKAGER'} = $tmp1->{$ENV{'PBPROJ'}};
@@ -1067 +1066 @@
             pb_log(0,"No Build files found for ".join(',',sort(@notfound))."\n") if (@notfound);
 
-            # Apply filters to the non-build files
-            my $liste ="";
-            if (defined $filteredfiles->{$pbpkg}) {
-                foreach my $f (split(/,/,$filteredfiles->{$pbpkg})) {
-                    pb_filter_file_inplace($ptr,"$dest/$f",$pb);
-                    $liste = "$f $liste";
-                }
-            }
-            pb_log(2,"Files ".$liste."have been filtered\n");
-
-            # TODO: Make it CMS aware
-            # Execute the pbinit script if any
-            if (-x "$ENV{'PBROOTDIR'}/$pbpkg/pbinit") {
-                pb_filter_file("$ENV{'PBROOTDIR'}/$pbpkg/pbinit",$ptr,"$ENV{'PBTMP'}/pbinit",$pb);
-                chmod 0755,"$ENV{'PBTMP'}/pbinit";
-                pb_system("cd $dest ; $ENV{'PBTMP'}/pbinit","Executing init script from $ENV{'PBROOTDIR'}/$pbpkg/pbinit under $dest","verbose");
-            }
-
-            # 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*>) {
-                if (-x "$pbvf") {
-                    my $target = "$ENV{'PBDESTDIR'}/".basename($pbvf);
-                    pb_filter_file("$pbvf",$ptr,$target,$pb);
-                    chmod 0755,"$target";
-                }
-            }
         } else {
             # Instead call News generation
@@ -1112 +1084 @@
             close(SCRIPT);
             chmod 0755,"$ENV{'PBTMP'}/pbscript";
+        }
+
+        # Apply filters to the non-build files
+        my $liste ="";
+        if (defined $filteredfiles->{$pbpkg}) {
+            foreach my $f (split(/,/,$filteredfiles->{$pbpkg})) {
+                pb_filter_file_inplace($ptr,"$dest/$f",$pb);
+                $liste = "$f $liste";
+            }
+        }
+        pb_log(2,"Files ".$liste."have been filtered\n");
+
+        # TODO: Make it CMS aware
+        # Execute the pbinit script if any
+        if (-x "$ENV{'PBROOTDIR'}/$pbpkg/pbinit") {
+            pb_filter_file("$ENV{'PBROOTDIR'}/$pbpkg/pbinit",$ptr,"$ENV{'PBTMP'}/pbinit",$pb);
+            chmod 0755,"$ENV{'PBTMP'}/pbinit";
+            pb_system("cd $dest ; $ENV{'PBTMP'}/pbinit","Executing init script from $ENV{'PBROOTDIR'}/$pbpkg/pbinit under $dest","verbose");
+        }
+
+        # 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*>) {
+            if (-x "$pbvf") {
+                my $target = "$ENV{'PBDESTDIR'}/".basename($pbvf);
+                pb_filter_file("$pbvf",$ptr,$target,$pb);
+                chmod 0755,"$target";
+            }
         }