Merged changes from 3.14 branch to revno 12636

src/tools/convertRelease.pl

@@ -215,7 +215,7 @@ sub checkRelease {
     delete $macros{RULES};
     delete $macros{TOP};
     delete $macros{TEMPLATE_TOP};
-    
+
     while (my ($app, $path) = each %macros) {
         my %check = (TOP => $path);
         my @order = ();
@@ -238,7 +238,35 @@ sub checkRelease {
             }
         }
     }
-    print "\n" if ($status);
+
+    my @modules = @apps;
+    my $app = shift @modules;
+    my $latest = AbsPath($macros{$app});
+    my %paths = ($latest => $app);
+    foreach $app (@modules) {
+        my $path = AbsPath($macros{$app});
+        if ($path ne $latest && exists $paths{$path}) {
+            my $prev = $paths{$path};
+            print "\n" unless ($status);
+            print "This application's RELEASE file(s) define\n";
+            print "\t$app = $macros{$app}\n";
+            print "after but not adjacent to\n\t$prev = $macros{$prev}\n";
+            print "both of which resolve to $path\n"
+                if $path ne $macros{$app} || $path ne $macros{$prev};
+            $status = 2;
+        }
+        $paths{$path} = $app;
+        $latest = $path;
+    }
+    if ($status == 2) {
+        print "Module definitions that share paths must be grouped together.\n";
+        print "Either remove a definition, or move it to a line immediately\n";
+        print "above or below the other(s).\n";
+        print "Any non-module definitions belong in configure/CONFIG_SITE.\n";
+        $status = 1;
+    }
+
+    print "\n" if $status;
     exit $status;
 }