From 5d70e707dc420d64b089cbdeb556fda11415f9ad Mon Sep 17 00:00:00 2001 From: "Bernhard M. Wiedemann" Date: Mon, 22 May 2017 09:03:53 +1000 Subject: Bug [#1946]. Builds are made with a sorted list of lexers to be more reproducible. --- doc/ScintillaHistory.html | 5 +++++ gtk/makefile | 2 +- win32/makefile | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html index 0507227cd..fd6648a55 100644 --- a/doc/ScintillaHistory.html +++ b/doc/ScintillaHistory.html @@ -509,6 +509,7 @@ John Flatness Thorsten Kani + Bernhard M. Wiedemann

@@ -579,6 +580,10 @@ Bug #1940.

  • + Builds are made with a sorted list of lexers to be more reproducible. + Bug #1946. +
  • +
  • On Cocoa, a leak of mouse tracking areas was fixed.
  • diff --git a/gtk/makefile b/gtk/makefile index 5a4fa8231..a28aa092d 100644 --- a/gtk/makefile +++ b/gtk/makefile @@ -96,7 +96,7 @@ GLIB_GENMARSHAL_FLAGS = --prefix=scintilla_marshal .list.c: $(GLIB_GENMARSHAL) --body $(GLIB_GENMARSHAL_FLAGS) $< > $@ -LEXOBJS:=$(addsuffix .o,$(basename $(notdir $(wildcard $(srcdir)/../lexers/Lex*.cxx)))) +LEXOBJS:=$(addsuffix .o,$(basename $(sort $(notdir $(wildcard $(srcdir)/../lexers/Lex*.cxx))))) all: $(COMPLIB) diff --git a/win32/makefile b/win32/makefile index 22819c4f0..1af28c03f 100644 --- a/win32/makefile +++ b/win32/makefile @@ -70,7 +70,7 @@ analyze: deps: $(CXX) -MM $(CXXFLAGS) *.cxx ../src/*.cxx ../lexlib/*.cxx ../lexers/*.cxx >deps.mak -LEXOBJS:=$(addsuffix .o,$(basename $(notdir $(wildcard ../lexers/Lex*.cxx)))) +LEXOBJS:=$(addsuffix .o,$(basename $(sort $(notdir $(wildcard ../lexers/Lex*.cxx))))) BASEOBJS = \ -- cgit v1.2.3