From ca79b65eea2653ecbf62eb0f1d0caf4ff6dea601 Mon Sep 17 00:00:00 2001
From: mitchell <unknown>
Date: Sun, 5 Jan 2020 17:10:23 -0500
Subject: Synchronizing LongTerm3 with default. Ideally this covers anything
 missed during the backport process.

---
 scripts/Dependencies.py |  5 ++++-
 scripts/LexGen.py       | 10 +++++++++-
 2 files changed, 13 insertions(+), 2 deletions(-)

(limited to 'scripts')

diff --git a/scripts/Dependencies.py b/scripts/Dependencies.py
index 90b8b9529..db705137c 100644
--- a/scripts/Dependencies.py
+++ b/scripts/Dependencies.py
@@ -21,7 +21,10 @@
 
 import codecs, glob, os, sys
 
-from . import FileGenerator
+if __name__ == "__main__":
+	import FileGenerator
+else:
+	from . import FileGenerator
 
 continuationLineEnd = " \\"
 
diff --git a/scripts/LexGen.py b/scripts/LexGen.py
index 8748a744b..0494286b3 100644
--- a/scripts/LexGen.py
+++ b/scripts/LexGen.py
@@ -13,10 +13,12 @@ from FileGenerator import Regenerate, UpdateLineInFile, \
     FindSectionInList
 import ScintillaData
 import HFacer
+import os
 import uuid
 import sys
 
-sys.path.append("../")
+baseDirectory = os.path.dirname(os.path.dirname(ScintillaData.__file__))
+sys.path.insert(0, baseDirectory)
 
 import win32.DepGen
 import gtk.DepGen
@@ -116,13 +118,19 @@ def RegenerateXcodeProject(path, lexers, lexerReferences):
 
 def RegenerateAll(root):
 
+    scintillaBase = os.path.abspath(root)
+
     sci = ScintillaData.ScintillaData(root)
 
     Regenerate(root + "src/Catalogue.cxx", "//", sci.lexerModules)
     Regenerate(root + "win32/scintilla.mak", "#", sci.lexFiles)
 
+    startDir = os.getcwd()
+    os.chdir(os.path.join(scintillaBase, "win32"))
     win32.DepGen.Generate()
+    os.chdir(os.path.join(scintillaBase, "gtk"))
     gtk.DepGen.Generate()
+    os.chdir(startDir)
 
     RegenerateXcodeProject(root + "cocoa/ScintillaFramework/ScintillaFramework.xcodeproj/project.pbxproj",
         sci.lexFiles, sci.lexersXcode)
-- 
cgit v1.2.3