diff --git a/desktop/toolkit/qscintilla2/actions.py b/desktop/toolkit/qscintilla2/actions.py index 8fb6b159b1..3e1560169f 100644 --- a/desktop/toolkit/qscintilla2/actions.py +++ b/desktop/toolkit/qscintilla2/actions.py @@ -16,7 +16,7 @@ NoStrip = ["/usr/share/doc"] def setup(): shelltools.cd("Qt4Qt5") - qt5.configure() + shelltools.system("qmake-qt5 qscintilla.pro") # Change C/XXFLAGS pisitools.dosed("Makefile", "^CFLAGS.*\\$\\(DEFINES\\)", "CFLAGS = %s -fPIC $(DEFINES)" % get.CFLAGS()) @@ -24,7 +24,7 @@ def setup(): # Get designer plugin's Makefile shelltools.cd("../designer-Qt4Qt5/") - qt5.configure() + shelltools.system("qmake-qt5 designer.pro INCLUDEPATH+=../Qt4Qt5 QMAKE_LIBDIR+=../Qt4Qt5") # Change C/XXFLAGS of designer plugin's makefile pisitools.dosed("Makefile", "^CFLAGS.*\\$\\(DEFINES\\)", "CFLAGS = %s -fPIC $(DEFINES)" % get.CFLAGS()) @@ -33,17 +33,18 @@ def setup(): def build(): shelltools.system("cp -rf Python Python3") shelltools.cd("Qt4Qt5") - autotools.make("all staticlib CC=\"%s\" CXX=\"%s\" LINK=\"%s\"" % (get.CC(), get.CXX(), get.CXX())) - + qt5.make() + shelltools.cd("../designer-Qt4Qt5/") - autotools.make("DESTDIR=\"%s/%s/designer\"" % (get.installDIR(), qt5.plugindir)) - + qt5.make() + # Get Makefile of qscintilla-python via sip shelltools.cd("../Python") pythonmodules.run("configure.py -n ../Qt4Qt5 -o ../Qt4Qt5 -c --pyqt=PyQt5 --pyqt-sipdir=/usr/share/sip/Py2Qt5 --qsci-sipdir=/usr/share/sip/Py2Qt5 --sip-incdir=/usr/lib/python2.7/site-packages --qmake /usr/bin/qmake-qt5") pisitools.dosed("Makefile", "/usr/include/qt/QtPrintSupport", "/usr/include/qt5/QtPrintSupport") pisitools.dosed("Makefile", "/usr/include/qt/QtWidgets", "/usr/include/qt5/QtWidgets") autotools.make() + shelltools.cd("../Python3") pythonmodules.run("configure.py -n ../Qt4Qt5 -o ../Qt4Qt5 -c --pyqt=PyQt5 --qmake /usr/bin/qmake-qt5", pyVer = "3") pisitools.dosed("Makefile", "/usr/include/qt/QtPrintSupport", "/usr/include/qt5/QtPrintSupport") @@ -52,23 +53,23 @@ def build(): def install(): shelltools.cd("Qt4Qt5") - qt5.install() + qt5.install("INSTALL_ROOT=%s" % get.installDIR()) shelltools.cd("../designer-Qt4Qt5/") - qt5.install() + qt5.install("INSTALL_ROOT=%s" % get.installDIR()) #build and install qscintilla-python shelltools.cd("../Python3") - autotools.rawInstall("DESTDIR=%s" % get.installDIR()) + #autotools.rawInstall("DESTDIR=%s" % get.installDIR()) + qt5.install("INSTALL_ROOT=%s" % get.installDIR()) pisitools.insinto("/usr/lib/python3.4/site-packages/PyQt5", "Qsci.so") shelltools.cd("../Python") - autotools.rawInstall("DESTDIR=%s" % get.installDIR()) + #autotools.rawInstall("DESTDIR=%s" % get.installDIR()) + qt5.install("INSTALL_ROOT=%s" % get.installDIR()) pisitools.insinto("/usr/lib/python2.7/site-packages/PyQt5", "Qsci.so") shelltools.cd("..") pisitools.dohtml("doc/html-Qt4Qt5/") pisitools.insinto("/usr/share/doc/%s/Scintilla" % get.srcNAME(), "doc/Scintilla/*") - #pisitools.removeDir("/usr/share/qt4") - pisitools.dodoc("LICENSE*", "NEWS", "README")