[tor-commits] [tor-browser/tor-browser-17.0.6esr-6] Build Determinism Fix: Hack toolkit.manifest a canonical form.

[mikeperry at torproject.org]

commit 375e007c20f5402ef753edc988b5a25347918136
Author: Mike Perry <mikeperry-git at torproject.org>
Date:   Fri Jun 21 20:42:45 2013 -0700

    Build Determinism Fix: Hack toolkit.manifest a canonical form.
    
    Does anyone know where the hell this file is *actually* created at? I couldn't
    find it...
---
 toolkit/mozapps/installer/link-manifests.py |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/toolkit/mozapps/installer/link-manifests.py b/toolkit/mozapps/installer/link-manifests.py
index 1597c1e..bce92a7 100644
--- a/toolkit/mozapps/installer/link-manifests.py
+++ b/toolkit/mozapps/installer/link-manifests.py
@@ -17,7 +17,13 @@ for manifestdir in manifestdirs:
     for name in sorted(os.listdir(manifestdir)):
         infd = open(os.path.join(manifestdir, name))
         print >>outfd, "# %s" % name
-        outfd.write(infd.read())
+        # XXX: Ugly determinism hack for toolkit.manifest. For the life of me,
+        # I could not find where it is built, but it is built
+        # non-deterministically and included here.
+        if name == "toolkit.manifest":
+            outfd.writelines(sorted(infd.readlines()))
+        else:
+            outfd.write(infd.read())
         print >>outfd
         infd.close()