From f093b305bf0d70c8aa127c49a1662ce203af4ac2 Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Sun, 3 Jun 2018 13:05:12 +0200 Subject: [PATCH] WIP: include __init__.py generation in .pro files. --- src/pymod/__init__.py.noqt | 5 +++++ src/pymod/__init__.py.qt4 | 5 +++++ src/pymod/__init__.py.qt5 | 7 ++++++ src/pymod/lay/lay.pro | 19 ++++++++++++++++ src/pymod/pymod.pro | 44 ++++++++++++++++++++------------------ 5 files changed, 59 insertions(+), 21 deletions(-) create mode 100644 src/pymod/__init__.py.noqt create mode 100644 src/pymod/__init__.py.qt4 create mode 100644 src/pymod/__init__.py.qt5 diff --git a/src/pymod/__init__.py.noqt b/src/pymod/__init__.py.noqt new file mode 100644 index 000000000..83b190ba0 --- /dev/null +++ b/src/pymod/__init__.py.noqt @@ -0,0 +1,5 @@ + +# pykl library definition file + +__all__ = [ "tl", "db", "lay" ] + diff --git a/src/pymod/__init__.py.qt4 b/src/pymod/__init__.py.qt4 new file mode 100644 index 000000000..bd01416e4 --- /dev/null +++ b/src/pymod/__init__.py.qt4 @@ -0,0 +1,5 @@ + +# pykl library definition file + +__all__ = [ "tl", "db", "lay", "QtCore", "QtGui", "QtXml", "QtSql", "QtNetwork", "QtDesigner" ] + diff --git a/src/pymod/__init__.py.qt5 b/src/pymod/__init__.py.qt5 new file mode 100644 index 000000000..6315cf1d8 --- /dev/null +++ b/src/pymod/__init__.py.qt5 @@ -0,0 +1,7 @@ + +# pykl library definition file + +__all__ = [ "tl", "db", "lay", + "QtCore", "QtGui", "QtNetwork", "QtSql", "QtWidgets", "QtDesigner", + "QtMultimedia", "QtPrintSupport", "QtSvg", "QtXmlPatterns", "QtXml" ] + diff --git a/src/pymod/lay/lay.pro b/src/pymod/lay/lay.pro index 4be33a91d..27875b832 100644 --- a/src/pymod/lay/lay.pro +++ b/src/pymod/lay/lay.pro @@ -9,3 +9,22 @@ SOURCES = \ HEADERS += \ LIBS += -lklayout_lay + +# Use this opportunity to provide the __init__.py file + +equals(HAVE_QTBINDINGS, "1") { + equals(HAVE_QT5, "1") { + INIT_PY = $$PWD/../__init__.py.qt5 + } else { + INIT_PY = $$PWD/../__init__.py.qt4 + } +} else { + INIT_PY = $$PWD/../__init__.py.noqt +} + +QMAKE_POST_LINK += && $(COPY) $$INIT_PY $$DESTDIR/../pykl/__init__.py + +# INSTALLS needs to be inside a lib or app templates. +init_target.path = $$PREFIX/pykl/__init__.py +init_target.files += $$INIT_PY +INSTALLS += init_target diff --git a/src/pymod/pymod.pro b/src/pymod/pymod.pro index c1471d747..53e39ffd6 100644 --- a/src/pymod/pymod.pro +++ b/src/pymod/pymod.pro @@ -5,29 +5,31 @@ SUBDIRS = \ tl \ lay \ -equals(HAVE_QT5, "1") { +equals(HAVE_QTBINDINGS, "1") { + equals(HAVE_QT5, "1") { - SUBDIRS += \ - QtCore \ - QtGui \ - QtNetwork \ - QtSql \ - QtWidgets \ - QtDesigner \ - QtMultimedia \ - QtPrintSupport \ - QtSvg \ - QtXmlPatterns \ - QtXml + SUBDIRS += \ + QtCore \ + QtGui \ + QtNetwork \ + QtSql \ + QtWidgets \ + QtDesigner \ + QtMultimedia \ + QtPrintSupport \ + QtSvg \ + QtXmlPatterns \ + QtXml -} else { + } else { - SUBDIRS += \ - QtCore \ - QtGui \ - QtXml \ - QtSql \ - QtNetwork \ - QtDesigner + SUBDIRS += \ + QtCore \ + QtGui \ + QtXml \ + QtSql \ + QtNetwork \ + QtDesigner + } }