diff options
author | jorton <jorton@13f79535-47bb-0310-9956-ffa450edef68> | 2010-02-10 10:06:17 +0000 |
---|---|---|
committer | jorton <jorton@13f79535-47bb-0310-9956-ffa450edef68> | 2010-02-10 10:06:17 +0000 |
commit | 6b665339344668ed749fb07359e3543116fe3131 (patch) | |
tree | a506aae546955c51ec29af2f57a24f8b44630552 /build | |
parent | ca8c62689f8934731b6aa0736bda7ff4e87664cd (diff) | |
download | libapr-6b665339344668ed749fb07359e3543116fe3131.tar.gz |
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.4.x@908429 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'build')
-rwxr-xr-x | build/gen-build.py | 9 |
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 |