diff -r b7c3b34661d5 -r 9d42b6c08a27 Project/ProjectInterfacesBrowser.py
--- a/Project/ProjectInterfacesBrowser.py Sat Jul 28 18:28:55 2018 +0200
+++ b/Project/ProjectInterfacesBrowser.py Sat Jul 28 19:14:11 2018 +0200
@@ -560,13 +560,14 @@
args.append("-bpython")
args.append("-I.")
for directory in params["IncludeDirs"]:
- args.append("-I{0}".format(directory))
+ args.append("-I{0}".format(
+ self.project.getAbsoluteUniversalPath(directory)))
for name in params["DefinedNames"]:
args.append("-D{0}".format(name))
for name in params["UndefinedNames"]:
args.append("-U{0}".format(name))
- fn = os.path.join(self.project.ppath, fn)
+ fn = self.project.getAbsoluteUniversalPath(fn)
self.idlFile = fn
args.append("-C{0}".format(os.path.dirname(fn)))
args.append(fn)
@@ -669,12 +670,6 @@
i += 1
progress.setValue(numIDLs)
-
- def __configureCorba(self):
- """
- Private method to open the configuration dialog.
- """
- e5App().getObject("UserInterface").showPreferences("corbaPage")
def __configureIdlCompiler(self):
"""
@@ -684,14 +679,17 @@
params = self.project.pdata["IDLPARAMS"]
# TODO: remove this test code once done
- print("__configureIdlCompiler")
- return
+ params = {
+ "IncludeDirs": ["sub3", "sub2"],
+ "DefinedNames": ["n2", "n1=1", "n3 = h e l p"],
+ "UndefinedNames": ["v5", "v2", "aa"],
+ }
# TODO: implement IDL compiler options dialog
from .IdlCompilerOptionsDialog import IdlCompilerOptionsDialog
dlg = IdlCompilerOptionsDialog(
params["IncludeDirs"][:], params["DefinedNames"][:],
- params["UndefinedNames"][:])
+ params["UndefinedNames"][:], self.project, self)
if dlg.exec_() == QDialog.Accepted:
include, defined, undefined = dlg.getData()
if include != params["IncludeDirs"]:
@@ -703,3 +701,9 @@
if undefined != params["UndefinedNames"]:
params["UndefinedNames"] = undefined[:]
self.project.setDirty(True)
+
+ def __configureCorba(self):
+ """
+ Private method to open the configuration dialog.
+ """
+ e5App().getObject("UserInterface").showPreferences("corbaPage")
