Merge r908427 from trunk:

* build/gen-build.py: Sort lists so that the generated
  build-outputs.mk is easy to diff across releases.
  (Cosmetic change only; no functional difference)



git-svn-id: http://svn.apache.org/repos/asf/apr/apr/branches/1.5.x@908432 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 8 insertions, 1 deletions

diff --git a/build/gen-build.py b/build/gen-build.py
index d59bf1d43..245be34fa 100755
--- a/build/gen-build.py
+++ b/build/gen-build.py
@@ -111,12 +111,16 @@ def main():
 
       symname = 'OBJECTS_%s_%s' % (subdir, platform)
 
+      objects.sort()
+
       # and write the symbol for the whole group
       f.write('\n%s = %s\n\n' % (symname, string.join(objects)))
 
       # and include that symbol in the group
       group.append('$(%s)' % symname)
 
+    group.sort()
+
     # write out a symbol which contains the necessary files
     f.write('OBJECTS_%s = %s\n\n' % (platform, string.join(group)))
 
@@ -176,7 +180,9 @@ def write_objects(f, legal_deps, h_deps, files):
     for hdr in deps.keys():
       deps.update(h_deps.get(hdr, {}))
 
-    f.write('%s: %s .make.dirs %s\n' % (obj, file, string.join(deps.values())))
+    f.write('%s: %s .make.dirs %s\n' % (obj, file, string.join(sorted(deps.values()))))
+
+  objects.sort()
 
   return objects, dirs
 
@@ -214,6 +220,7 @@ def get_files(patterns):
   files = [ ]
   for pat in string.split(patterns):
     files.extend(map(clean_path, glob.glob(pat)))
+  files.sort()
   return files