Commit 1413bd92 authored by Mike Perry's avatar Mike Perry
Browse files

Build determinism fixes 

Enforce sorted ordering on build and link lists. Also omit hostname from
buildinfo.
parent ba5c67eb

config/JarMaker.py

+1 −1
Original line number Diff line number Diff line
@@ -189,7 +189,7 @@ class JarMaker(object): 
            continue

          myregister[l] = None

        mf.seek(0)

      for k in myregister.iterkeys():

      for k in sorted(myregister.iterkeys()):

        mf.write(k + os.linesep)

      mf.close()

    finally:

config/buildlist.py

+2 −2
Original line number Diff line number Diff line
@@ -25,11 +25,11 @@ def addEntriesToListFile(listFile, entries): 
      f.close()

    else:

      existing = set()

    f = open(listFile, 'a')

    for e in entries:

      if e not in existing:

        f.write("{0}\n".format(e))

        existing.add(e)

    f = open(listFile, 'w')

    f.write("\n".join(sorted(existing))+"\n")

    f.close()

  finally:

    lock = None

config/expandlibs_exec.py

+1 −1
Original line number Diff line number Diff line
@@ -316,7 +316,7 @@ def main(): 
        if options.uselist:

            args.makelist()



        if options.verbose:

        if True: #options.verbose:

            print_command(sys.stderr, args)

        proc = subprocess.Popen(args, stdout = subprocess.PIPE, stderr = subprocess.STDOUT)

        (stdout, stderr) = proc.communicate()

js/src/config/expandlibs_exec.py

+1 −1
Original line number Diff line number Diff line
@@ -316,7 +316,7 @@ def main(): 
        if options.uselist:

            args.makelist()



        if options.verbose:

        if True: #options.verbose:

            print_command(sys.stderr, args)

        proc = subprocess.Popen(args, stdout = subprocess.PIPE, stderr = subprocess.STDOUT)

        (stdout, stderr) = proc.communicate()

toolkit/content/Makefile.in

+2 −2
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ ifneq (,$(filter http%,$(source_repo))) 
  DEFINES += -DSOURCE_REPO="$(source_repo)"

endif



BUILD_HOSTNAME = $(shell hostname -s || hostname)

DEFINES += -DBUILD_HOSTNAME="$(BUILD_HOSTNAME)"

# BUILD_HOSTNAME = $(shell hostname -s || hostname)

# DEFINES += -DBUILD_HOSTNAME="$(BUILD_HOSTNAME)"



include $(topsrcdir)/config/rules.mk