incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From h..@apache.org
Subject svn commit: r1174165 - /incubator/ooo/trunk/main/solenv/bin/build.pl
Date Thu, 22 Sep 2011 14:35:09 GMT
Author: hdu
Date: Thu Sep 22 14:35:09 2011
New Revision: 1174165

URL: http://svn.apache.org/viewvc?rev=1174165&view=rev
Log:
better diagnotics when preparing an incompatible build

Modified:
    incubator/ooo/trunk/main/solenv/bin/build.pl

Modified: incubator/ooo/trunk/main/solenv/bin/build.pl
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/solenv/bin/build.pl?rev=1174165&r1=1174164&r2=1174165&view=diff
==============================================================================
--- incubator/ooo/trunk/main/solenv/bin/build.pl (original)
+++ incubator/ooo/trunk/main/solenv/bin/build.pl Thu Sep 22 14:35:09 2011
@@ -2317,7 +2317,7 @@ sub prepare_incompatible_build {
         }
         clear_delivered();
     }
-    my $old_output_tree = '';
+    my @old_output_trees = ();
     foreach $prj (sort keys %$deps_hash) {
         if ($prepare) {
             ensure_clear_module($prj);
@@ -2326,7 +2326,7 @@ sub prepare_incompatible_build {
             if ($modules_types{$prj} ne 'mod') {
                 push(@missing_modules, $prj);
             } elsif (-d $module_paths{$prj}. '/'. $ENV{INPATH}) {
-                $old_output_tree++;
+                push(@old_output_trees, $prj);
             };
         };
     };
@@ -2338,8 +2338,9 @@ sub prepare_incompatible_build {
         $$deps_hash{$build_all_cont} = ();
         $build_all_cont = '';
     };
-    if ($old_output_tree) {
-        push(@warnings, 'Some module(s) contain old output tree(s)!');
+    if( scalar @old_output_trees) {
+        my $warning_string = 'Some modules contain old output trees! Please check: ' . "@old_output_trees";
+        push(@warnings, $warning_string);
     };
     if (!$generate_config && scalar @warnings) {
         print "WARNING(S):\n";



Mime
View raw message