WIP: more Qt Python modules and better build scheme.

src/pymod/QtCore/QtCore.pro

@@ -1,21 +1,11 @@
 
-LIBDIR = $$OUT_PWD/../..
-DESTDIR = $$LIBDIR/pymod
 TARGET = QtCore
 
-include($$PWD/../../lib.pri)
+include($$PWD/../pymod.pri)
 
 SOURCES = \
   QtCoreMain.cc \
 
 HEADERS += \
 
-INCLUDEPATH += $$PYTHONINCLUDE $$TL_INC $$GSI_INC $$PYA_INC
-DEPENDPATH += $$PYTHONINCLUDE $$TL_INC $$GSI_INC $$PYA_INC
-LIBS += $$PYTHONLIBFILE -L$$LIBDIR -lklayout_tl -lklayout_db -lklayout_gsi -lklayout_pya -lklayout_QtCore
-
-# Python is somewhat sloppy and relies on the compiler initializing fields 
-# of strucs to 0:
-QMAKE_CXXFLAGS_WARN_ON += \
-    -Wno-missing-field-initializers
-
+LIBS += -lklayout_QtCore

src/pymod/QtDesigner/QtDesigner.pro

@@ -0,0 +1,11 @@
+
+TARGET = QtDesigner
+
+include($$PWD/../pymod.pri)
+
+SOURCES = \
+  QtDesignerMain.cc \
+
+HEADERS += \
+
+LIBS += -lklayout_QtDesigner

src/pymod/QtDesigner/QtDesignerMain.cc

@@ -0,0 +1,25 @@
+
+/*
+
+  KLayout Layout Viewer
+  Copyright (C) 2006-2018 Matthias Koefferlein
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+*/
+
+#include "../pymodHelper.h"
+
+DEFINE_PYMOD(QtDesigner, "QtDesigner", "KLayout/Qt module 'QtDesigner'")

src/pymod/QtGui/QtGui.pro

@@ -1,21 +1,11 @@
 
-LIBDIR = $$OUT_PWD/../..
-DESTDIR = $$LIBDIR/pymod
 TARGET = QtGui
 
-include($$PWD/../../lib.pri)
+include($$PWD/../pymod.pri)
 
 SOURCES = \
   QtGuiMain.cc \
 
 HEADERS += \
 
-INCLUDEPATH += $$PYTHONINCLUDE $$TL_INC $$GSI_INC $$PYA_INC
-DEPENDPATH += $$PYTHONINCLUDE $$TL_INC $$GSI_INC $$PYA_INC
-LIBS += $$PYTHONLIBFILE -L$$LIBDIR -lklayout_tl -lklayout_db -lklayout_gsi -lklayout_pya -lklayout_QtGui -lklayout_QtCore
-
-# Python is somewhat sloppy and relies on the compiler initializing fields 
-# of strucs to 0:
-QMAKE_CXXFLAGS_WARN_ON += \
-    -Wno-missing-field-initializers
-
+LIBS += -lklayout_QtGui

src/pymod/QtMultimedia/QtMultimedia.pro

@@ -0,0 +1,11 @@
+
+TARGET = QtMultimedia
+
+include($$PWD/../pymod.pri)
+
+SOURCES = \
+  QtMultimediaMain.cc \
+
+HEADERS += \
+
+LIBS += -lklayout_QtMultimedia

src/pymod/QtMultimedia/QtMultimediaMain.cc

@@ -0,0 +1,25 @@
+
+/*
+
+  KLayout Layout Viewer
+  Copyright (C) 2006-2018 Matthias Koefferlein
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+*/
+
+#include "../pymodHelper.h"
+
+DEFINE_PYMOD(QtMultimedia, "QtMultimedia", "KLayout/Qt module 'QtMultimedia'")

src/pymod/QtNetwork/QtNetwork.pro

@@ -0,0 +1,11 @@
+
+TARGET = QtNetwork
+
+include($$PWD/../pymod.pri)
+
+SOURCES = \
+  QtNetworkMain.cc \
+
+HEADERS += \
+
+LIBS += -lklayout_QtNetwork

src/pymod/QtNetwork/QtNetworkMain.cc

@@ -0,0 +1,25 @@
+
+/*
+
+  KLayout Layout Viewer
+  Copyright (C) 2006-2018 Matthias Koefferlein
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+*/
+
+#include "../pymodHelper.h"
+
+DEFINE_PYMOD(QtNetwork, "QtNetwork", "KLayout/Qt module 'QtNetwork'")

src/pymod/QtPrintSupport/QtPrintSupport.pro

@@ -0,0 +1,11 @@
+
+TARGET = QtPrintSupport
+
+include($$PWD/../pymod.pri)
+
+SOURCES = \
+  QtPrintSupportMain.cc \
+
+HEADERS += \
+
+LIBS += -lklayout_QtPrintSupport

src/pymod/QtPrintSupport/QtPrintSupportMain.cc

@@ -0,0 +1,25 @@
+
+/*
+
+  KLayout Layout Viewer
+  Copyright (C) 2006-2018 Matthias Koefferlein
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+*/
+
+#include "../pymodHelper.h"
+
+DEFINE_PYMOD(QtPrintSupport, "QtPrintSupport", "KLayout/Qt module 'QtPrintSupport'")

src/pymod/QtSql/QtSql.pro

@@ -0,0 +1,11 @@
+
+TARGET = QtSql
+
+include($$PWD/../pymod.pri)
+
+SOURCES = \
+  QtSqlMain.cc \
+
+HEADERS += \
+
+LIBS += -lklayout_QtSql

src/pymod/QtSql/QtSqlMain.cc

@@ -0,0 +1,25 @@
+
+/*
+
+  KLayout Layout Viewer
+  Copyright (C) 2006-2018 Matthias Koefferlein
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+*/
+
+#include "../pymodHelper.h"
+
+DEFINE_PYMOD(QtSql, "QtSql", "KLayout/Qt module 'QtSql'")

src/pymod/QtSvg/QtSvg.pro

@@ -0,0 +1,11 @@
+
+TARGET = QtSvg
+
+include($$PWD/../pymod.pri)
+
+SOURCES = \
+  QtSvgMain.cc \
+
+HEADERS += \
+
+LIBS += -lklayout_QtSvg

src/pymod/QtSvg/QtSvgMain.cc

@@ -0,0 +1,25 @@
+
+/*
+
+  KLayout Layout Viewer
+  Copyright (C) 2006-2018 Matthias Koefferlein
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+*/
+
+#include "../pymodHelper.h"
+
+DEFINE_PYMOD(QtSvg, "QtSvg", "KLayout/Qt module 'QtSvg'")

src/pymod/QtWidgets/QtWidgets.pro

@@ -0,0 +1,11 @@
+
+TARGET = QtWidgets
+
+include($$PWD/../pymod.pri)
+
+SOURCES = \
+  QtWidgetsMain.cc \
+
+HEADERS += \
+
+LIBS += -lklayout_QtWidgets

src/pymod/QtWidgets/QtWidgetsMain.cc

@@ -0,0 +1,25 @@
+
+/*
+
+  KLayout Layout Viewer
+  Copyright (C) 2006-2018 Matthias Koefferlein
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+*/
+
+#include "../pymodHelper.h"
+
+DEFINE_PYMOD(QtWidgets, "QtWidgets", "KLayout/Qt module 'QtWidgets'")

src/pymod/QtXml/QtXml.pro

@@ -0,0 +1,11 @@
+
+TARGET = QtXml
+
+include($$PWD/../pymod.pri)
+
+SOURCES = \
+  QtXmlMain.cc \
+
+HEADERS += \
+
+LIBS += -lklayout_QtXml

src/pymod/QtXml/QtXmlMain.cc

@@ -0,0 +1,25 @@
+
+/*
+
+  KLayout Layout Viewer
+  Copyright (C) 2006-2018 Matthias Koefferlein
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+*/
+
+#include "../pymodHelper.h"
+
+DEFINE_PYMOD(QtXml, "QtXml", "KLayout/Qt module 'QtXml'")

src/pymod/QtXmlPatterns/QtXmlPatterns.pro

@@ -0,0 +1,11 @@
+
+TARGET = QtXmlPatterns
+
+include($$PWD/../pymod.pri)
+
+SOURCES = \
+  QtXmlPatternsMain.cc \
+
+HEADERS += \
+
+LIBS += -lklayout_QtXmlPatterns

src/pymod/QtXmlPatterns/QtXmlPatternsMain.cc

@@ -0,0 +1,25 @@
+
+/*
+
+  KLayout Layout Viewer
+  Copyright (C) 2006-2018 Matthias Koefferlein
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+*/
+
+#include "../pymodHelper.h"
+
+DEFINE_PYMOD(QtXmlPatterns, "QtXmlPatterns", "KLayout/Qt module 'QtXmlPatterns'")

src/pymod/db/db.pro

@@ -1,21 +1,12 @@
 
-LIBDIR = $$OUT_PWD/../..
-DESTDIR = $$LIBDIR/pymod
 TARGET = db
 
-include($$PWD/../../lib.pri)
+include($$PWD/../pymod.pri)
 
 SOURCES = \
   dbMain.cc \
 
 HEADERS += \
 
-INCLUDEPATH += $$PYTHONINCLUDE $$TL_INC $$GSI_INC $$PYA_INC
-DEPENDPATH += $$PYTHONINCLUDE $$TL_INC $$GSI_INC $$PYA_INC
-LIBS += $$PYTHONLIBFILE -L$$LIBDIR -lklayout_tl -lklayout_gsi -lklayout_db -lklayout_pya
-
-# Python is somewhat sloppy and relies on the compiler initializing fields 
-# of strucs to 0:
-QMAKE_CXXFLAGS_WARN_ON += \
-    -Wno-missing-field-initializers
+LIBS += -lklayout_db
 

src/pymod/lay/lay.pro

@@ -1,21 +1,11 @@
 
-LIBDIR = $$OUT_PWD/../..
-DESTDIR = $$LIBDIR/pymod
 TARGET = lay
 
-include($$PWD/../../lib.pri)
+include($$PWD/../pymod.pri)
 
 SOURCES = \
   layMain.cc \
 
 HEADERS += \
 
-INCLUDEPATH += $$PYTHONINCLUDE $$TL_INC $$GSI_INC $$PYA_INC
-DEPENDPATH += $$PYTHONINCLUDE $$TL_INC $$GSI_INC $$PYA_INC
-LIBS += $$PYTHONLIBFILE -L$$LIBDIR -lklayout_tl -lklayout_db -lklayout_gsi -lklayout_pya -lklayout_lay -lklayout_laybasic
-
-# Python is somewhat sloppy and relies on the compiler initializing fields 
-# of strucs to 0:
-QMAKE_CXXFLAGS_WARN_ON += \
-    -Wno-missing-field-initializers
-
+LIBS += -lklayout_lay

src/pymod/pymod.pri

@@ -0,0 +1,30 @@
+
+DESTDIR = $$OUT_PWD/..
+LIBDIR = $$OUT_PWD/../..
+DESTDIR_PYMOD = $$LIBDIR/pykl
+
+include($$PWD/../lib.pri)
+
+INCLUDEPATH += $$PYTHONINCLUDE $$TL_INC $$GSI_INC $$PYA_INC
+DEPENDPATH += $$PYTHONINCLUDE $$TL_INC $$GSI_INC $$PYA_INC
+LIBS += $$PYTHONLIBFILE -L$$LIBDIR -lklayout_tl -lklayout_gsi -lklayout_pya
+
+# Python is somewhat sloppy and relies on the compiler initializing fields 
+# of strucs to 0:
+QMAKE_CXXFLAGS_WARN_ON += \
+    -Wno-missing-field-initializers
+
+# Only on Windows, DESTDIR_TARGET is usable. On this platform, a blank happens to appear between
+# $(DESTDIR) and $(TARGET)
+win32 {
+
+  QMAKE_POST_LINK += $(MKDIR) $$DESTDIR_PYMOD && $(COPY) $(DESTDIR_TARGET) $$DESTDIR_PYMOD/$${TARGET}.dll
+
+  # to avoid the major version being appended to the dll name - in this case -lxyz won't link it again
+  # because the library is called xyx0.dll.
+  CONFIG += skip_target_version_ext
+
+} else {
+  QMAKE_POST_LINK += $(MKDIR) $$DESTDIR_PYMOD && $(COPY) $(DESTDIR)$(TARGET) $$DESTDIR_PYMOD/$${TARGET}.so
+}
+

src/pymod/pymod.pro

@@ -4,6 +4,31 @@ SUBDIRS = \
   db \
   tl \
   lay \
-  QtGui \
-  QtCore \
+
+equals(HAVE_QT5, "1") {
+
+  SUBDIRS += \
+    QtCore \
+    QtGui \
+    QtNetwork \
+    QtSql \
+    QtWidgets \
+    QtDesigner \
+    QtMultimedia \
+    QtPrintSupport \
+    QtSvg \
+    QtXmlPatterns \
+    QtXml
+
+} else {
+
+  SUBDIRS += \
+    QtCore \
+    QtGui \
+    QtXml \
+    QtSql \
+    QtNetwork \
+    QtDesigner
+
+}
 

src/pymod/tl/tl.pro

@@ -1,21 +1,10 @@
 
-LIBDIR = $$OUT_PWD/../..
-DESTDIR = $$LIBDIR/pymod
 TARGET = tl
 
-include($$PWD/../../lib.pri)
+include($$PWD/../pymod.pri)
 
 SOURCES = \
   tlMain.cc \
 
 HEADERS += \
 
-INCLUDEPATH += $$PYTHONINCLUDE $$TL_INC $$GSI_INC $$PYA_INC
-DEPENDPATH += $$PYTHONINCLUDE $$TL_INC $$GSI_INC $$PYA_INC
-LIBS += $$PYTHONLIBFILE -L$$LIBDIR -lklayout_tl -lklayout_gsi -lklayout_pya
-
-# Python is somewhat sloppy and relies on the compiler initializing fields 
-# of strucs to 0:
-QMAKE_CXXFLAGS_WARN_ON += \
-    -Wno-missing-field-initializers
-