apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jor...@apache.org
Subject svn commit: r908432 - in /apr/apr/branches/1.5.x: ./ build/gen-build.py
Date Wed, 10 Feb 2010 10:09:18 GMT
Author: jorton
Date: Wed Feb 10 10:09:18 2010
New Revision: 908432

URL: http://svn.apache.org/viewvc?rev=908432&view=rev
Log:
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)


Modified:
    apr/apr/branches/1.5.x/   (props changed)
    apr/apr/branches/1.5.x/build/gen-build.py

Propchange: apr/apr/branches/1.5.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 10 10:09:18 2010
@@ -1 +1 @@
-/apr/apr/trunk:733052,747990,748361,748371,748565,748888,748988,749810,782838,783398,783958,784633,784773,788588,793192,794118,794485,795267,799497,800627,809745,809854,810472,811455,813063,821306,829490,831641
+/apr/apr/trunk:733052,747990,748361,748371,748565,748888,748988,749810,782838,783398,783958,784633,784773,788588,793192,794118,794485,795267,799497,800627,809745,809854,810472,811455,813063,821306,829490,831641,908427

Modified: apr/apr/branches/1.5.x/build/gen-build.py
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.5.x/build/gen-build.py?rev=908432&r1=908431&r2=908432&view=diff
==============================================================================
--- apr/apr/branches/1.5.x/build/gen-build.py (original)
+++ apr/apr/branches/1.5.x/build/gen-build.py Wed Feb 10 10:09:18 2010
@@ -111,12 +111,16 @@
 
       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 @@
     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 @@
   files = [ ]
   for pat in string.split(patterns):
     files.extend(map(clean_path, glob.glob(pat)))
+  files.sort()
   return files
 
 



Mime
View raw message