Mercurial > mxe-octave

annotate src/qscintilla.mk @ 4222:44b1a9b2193e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
qt5: add initial qt5 to mxe-octave, based on mxe.cc * src/qt5.mk: new file * src/qtbase-1-fixes.patch: new file * src/qtbase.mk: new file * src/qtimageformats-1.patch: new file * src/qtimageformats.mk: new file * src/qtsvg.mk: new file * src/qttools-1.patch: new file * added src/qttools.mk: new file * changed Makefile.in: added ENABLE_QT5 option * configure.ac: added enable-qt5 option * index.html: added new files to packages * installer-files/octave-firsttime.vbs: added setup of qt5 bin, plugin path * installer-files/octave.vbs: added setup of qt5 bin, plugin path * installer-files/octave.bat: added setup of qt5 bin path * src/default-octave.mk: added settig fot qt5 usage * src/qscintilla.mk: added qt5 path
author John D
date Thu, 29 Sep 2016 11:22:51 -0400
parents 7016a319a835
children 9b1f851080b6
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
2935
8cf0cbcdaeea Include qscintilla as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
1 # This file is part of MXE.
8cf0cbcdaeea Include qscintilla as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
2 # See index.html for further information.
8cf0cbcdaeea Include qscintilla as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
3
8cf0cbcdaeea Include qscintilla as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
4 PKG := qscintilla
8cf0cbcdaeea Include qscintilla as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
5 $(PKG)_IGNORE :=
4201
7016a319a835 qscintiilla: update to 2.9.3
John D
parents: 4135
diff changeset
6 $(PKG)_VERSION := 2.9.3
7016a319a835 qscintiilla: update to 2.9.3
John D
parents: 4135
diff changeset
7 $(PKG)_CHECKSUM := d62c36272f47a176177613dd8260961d50d0ed64
4135
6616bddf55fb qscintilla: update to 2.9.2
John Donoghue
parents: 4054
diff changeset
8 $(PKG)_SUBDIR := QScintilla_gpl-$($(PKG)_VERSION)
6616bddf55fb qscintilla: update to 2.9.2
John Donoghue
parents: 4054
diff changeset
9 $(PKG)_FILE := QScintilla_gpl-$($(PKG)_VERSION).tar.gz
3064
be70678cc47b Update QScintilla to 2.7.2
"John Donoghue <john.donoghue@ieee.org>
parents: 3014
diff changeset
10 $(PKG)_URL := http://sourceforge.net/projects/pyqt/files/QScintilla2/QScintilla-$($(PKG)_VERSION)/$($(PKG)_FILE)
4222
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents: 4201
diff changeset
11
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents: 4201
diff changeset
12
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents: 4201
diff changeset
13 ifeq ($(ENABLE_QT5),yes)
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents: 4201
diff changeset
14 $(PKG)_DEPS := qt5
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents: 4201
diff changeset
15 else
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents: 4201
diff changeset
16 $(PKG)_DEPS := qt
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents: 4201
diff changeset
17 endif
2935
8cf0cbcdaeea Include qscintilla as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
18
3613
62901e283b28 qscintilla: use '' for install root in native mingw.
John Donoghue <john.donoghue@ieee.org>
parents: 3597
diff changeset
19 ifeq ($(MXE_NATIVE_MINGW_BUILD),yes)
62901e283b28 qscintilla: use '' for install root in native mingw.
John Donoghue <john.donoghue@ieee.org>
parents: 3597
diff changeset
20 $(PKG)_INSTALL_ROOT :=
62901e283b28 qscintilla: use '' for install root in native mingw.
John Donoghue <john.donoghue@ieee.org>
parents: 3597
diff changeset
21 else
62901e283b28 qscintilla: use '' for install root in native mingw.
John Donoghue <john.donoghue@ieee.org>
parents: 3597
diff changeset
22 $(PKG)_INSTALL_ROOT := $(3)
62901e283b28 qscintilla: use '' for install root in native mingw.
John Donoghue <john.donoghue@ieee.org>
parents: 3597
diff changeset
23 endif
62901e283b28 qscintilla: use '' for install root in native mingw.
John Donoghue <john.donoghue@ieee.org>
parents: 3597
diff changeset
24
2935
8cf0cbcdaeea Include qscintilla as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
25 define $(PKG)_UPDATE
3708
d95b8b84cea7 enable additional $(PKG)_UPDATE targets.
John W. Eaton <jwe@octave.org>
parents: 3645
diff changeset
26 $(WGET) -q -O- 'http://www.riverbankcomputing.com/software/qscintilla/download' | \
d95b8b84cea7 enable additional $(PKG)_UPDATE targets.
John W. Eaton <jwe@octave.org>
parents: 3645
diff changeset
27 grep QScintilla-gpl | \
d95b8b84cea7 enable additional $(PKG)_UPDATE targets.
John W. Eaton <jwe@octave.org>
parents: 3645
diff changeset
28 head -n 1 | \
d95b8b84cea7 enable additional $(PKG)_UPDATE targets.
John W. Eaton <jwe@octave.org>
parents: 3645
diff changeset
29 $(SED) -n 's,.*QScintilla-gpl-\([0-9][^>]*\)\.zip.*,\1,p'
2935
8cf0cbcdaeea Include qscintilla as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
30 endef
8cf0cbcdaeea Include qscintilla as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
31
2997
4f9b72cf7ee7 allow native builds too
John W. Eaton <jwe@octave.org>
parents: 2935
diff changeset
32 ifneq ($(MXE_NATIVE_BUILD),yes)
4f9b72cf7ee7 allow native builds too
John W. Eaton <jwe@octave.org>
parents: 2935
diff changeset
33 ifeq ($(MXE_SYSTEM),mingw)
4222
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents: 4201
diff changeset
34 ifeq ($(ENABLE_QT5),yes)
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents: 4201
diff changeset
35 $(PKG)_QMAKE_SPEC_OPTION := -spec '$(BUILD_TOOLS_PREFIX)/mkspecs/win32-g++'
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents: 4201
diff changeset
36 else
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents: 4201
diff changeset
37 $(PKG)_QMAKE_SPEC_OPTION := -spec '$(HOST_PREFIX)/mkspecs/win32-g++'
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents: 4201
diff changeset
38 endif
2997
4f9b72cf7ee7 allow native builds too
John W. Eaton <jwe@octave.org>
parents: 2935
diff changeset
39 endif
3130
3c1afa2c8e43 [MSVC] enable qscintilla compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3065
diff changeset
40 ifeq ($(MXE_SYSTEM),msvc)
3c1afa2c8e43 [MSVC] enable qscintilla compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3065
diff changeset
41 # FIXME: compute "2010" suffix dynamically
3c1afa2c8e43 [MSVC] enable qscintilla compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3065
diff changeset
42 $(PKG)_QMAKE_SPEC_OPTION := -spec '$(HOST_LIBDIR)/qt4/mkspecs/win32-msvc2010'
3c1afa2c8e43 [MSVC] enable qscintilla compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3065
diff changeset
43 endif
2997
4f9b72cf7ee7 allow native builds too
John W. Eaton <jwe@octave.org>
parents: 2935
diff changeset
44 endif
4f9b72cf7ee7 allow native builds too
John W. Eaton <jwe@octave.org>
parents: 2935
diff changeset
45
2935
8cf0cbcdaeea Include qscintilla as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
46 define $(PKG)_BUILD
3746
0ef36efbd9cd qt: for cross compile, move the native binaries to the builkd directory
John Donoghue
parents: 3725
diff changeset
47 cd '$(1)/Qt4Qt5' && '$(MXE_QMAKE)' -makefile $($(PKG)_QMAKE_SPEC_OPTION) QMAKE_UIC=$(MXE_UIC) QMAKE_MOC=$(MXE_MOC)
2935
8cf0cbcdaeea Include qscintilla as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
48
3130
3c1afa2c8e43 [MSVC] enable qscintilla compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3065
diff changeset
49 if [ $(MXE_SYSTEM) = msvc ]; then \
3293
cf6f40cededb Support file list generation in packages.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3291
diff changeset
50 mkdir -p '$(3)' && \
3130
3c1afa2c8e43 [MSVC] enable qscintilla compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3065
diff changeset
51 cd '$(1)/Qt4Qt5' && \
3c1afa2c8e43 [MSVC] enable qscintilla compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3065
diff changeset
52 env -u MAKE -u MAKEFLAGS nmake && \
3293
cf6f40cededb Support file list generation in packages.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3291
diff changeset
53 env -u MAKE -u MAKEFLAGS nmake \
cf6f40cededb Support file list generation in packages.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3291
diff changeset
54 INSTALL_ROOT=`cd $(3) && pwd -W | sed -e 's,^[a-zA-Z]:,,' -e 's,/,\\\\,g'` install; \
3130
3c1afa2c8e43 [MSVC] enable qscintilla compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3065
diff changeset
55 else \
3c1afa2c8e43 [MSVC] enable qscintilla compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3065
diff changeset
56 $(MAKE) -C '$(1)/Qt4Qt5' -j '$(JOBS)' && \
3613
62901e283b28 qscintilla: use '' for install root in native mingw.
John Donoghue <john.donoghue@ieee.org>
parents: 3597
diff changeset
57 $(MAKE) -C '$(1)/Qt4Qt5' -j 1 install INSTALL_ROOT='$($(PKG)_INSTALL_ROOT)'; \
3293
cf6f40cededb Support file list generation in packages.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3291
diff changeset
58 fi
cf6f40cededb Support file list generation in packages.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3291
diff changeset
59
4222
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents: 4201
diff changeset
60 if [ $(MXE_SYSTEM)$(ENABLE_QT5) = mingwyes ]; then \
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents: 4201
diff changeset
61 $(INSTALL) -d '$($(PKG)_INSTALL_ROOT)$(HOST_PREFIX)/qt5/lib'; \
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents: 4201
diff changeset
62 $(INSTALL) -m755 '$($(PKG)_INSTALL_ROOT)$(HOST_PREFIX)/qt5/lib/$(LIBRARY_PREFIX)qscintilla2$(LIBRARY_SUFFIX).dll' '$($(PKG)_INSTALL_ROOT)$(HOST_PREFIX)/qt5/bin/'; \
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents: 4201
diff changeset
63 rm -f '$($(PKG)_INSTALL_ROOT)$(HOST_PREFIX)/qt5/lib/$(LIBRARY_PREFIX)qscintilla2$(LIBRARY_SUFFIX).dll'; \
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents: 4201
diff changeset
64 $(INSTALL) -m755 '$($(PKG)_INSTALL_ROOT)$(HOST_PREFIX)/qt5/lib/libqscintilla2.a' '$($(PKG)_INSTALL_ROOT)$(HOST_PREFIX)/qt5/lib/libqscintilla2-qt5.a'; \
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents: 4201
diff changeset
65 fi
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents: 4201
diff changeset
66 if [ $(MXE_SYSTEM)$(ENABLE_QT5) = mingwno ]; then \
3613
62901e283b28 qscintilla: use '' for install root in native mingw.
John Donoghue <john.donoghue@ieee.org>
parents: 3597
diff changeset
67 $(INSTALL) -d '$($(PKG)_INSTALL_ROOT)$(HOST_BINDIR)'; \
62901e283b28 qscintilla: use '' for install root in native mingw.
John Donoghue <john.donoghue@ieee.org>
parents: 3597
diff changeset
68 $(INSTALL) -m755 '$($(PKG)_INSTALL_ROOT)$(HOST_LIBDIR)/$(LIBRARY_PREFIX)qscintilla2$(LIBRARY_SUFFIX).dll' '$($(PKG)_INSTALL_ROOT)$(HOST_BINDIR)/'; \
62901e283b28 qscintilla: use '' for install root in native mingw.
John Donoghue <john.donoghue@ieee.org>
parents: 3597
diff changeset
69 rm -f '$($(PKG)_INSTALL_ROOT)$(HOST_LIBDIR)/$(LIBRARY_PREFIX)qscintilla2$(LIBRARY_SUFFIX).dll'; \
3130
3c1afa2c8e43 [MSVC] enable qscintilla compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3065
diff changeset
70 fi
3c1afa2c8e43 [MSVC] enable qscintilla compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3065
diff changeset
71
4222
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents: 4201
diff changeset
72
3293
cf6f40cededb Support file list generation in packages.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3291
diff changeset
73 # Qmake under MSVC uses Win32 paths. When combining this with
cf6f40cededb Support file list generation in packages.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3291
diff changeset
74 # DESTDIR usage (or equivalent), the real Win32 directory hierarchy
cf6f40cededb Support file list generation in packages.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3291
diff changeset
75 # is recreated under DESTDIR, not the MSYS hierarchy.
cf6f40cededb Support file list generation in packages.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3291
diff changeset
76 if [ $(MXE_SYSTEM) = msvc ]; then \
3613
62901e283b28 qscintilla: use '' for install root in native mingw.
John Donoghue <john.donoghue@ieee.org>
parents: 3597
diff changeset
77 $(INSTALL) -d '$($(PKG)_INSTALL_ROOT)$(CMAKE_HOST_PREFIX)/bin'; \
62901e283b28 qscintilla: use '' for install root in native mingw.
John Donoghue <john.donoghue@ieee.org>
parents: 3597
diff changeset
78 $(INSTALL) -m755 '$($(PKG)_INSTALL_ROOT)$(CMAKE_HOST_PREFIX)/lib/$(LIBRARY_PREFIX)qscintilla2$(LIBRARY_SUFFIX).dll' '$($(PKG)_INSTALL_ROOT)$(CMAKE_HOST_PREFIX)/bin/'; \
62901e283b28 qscintilla: use '' for install root in native mingw.
John Donoghue <john.donoghue@ieee.org>
parents: 3597
diff changeset
79 rm -f '$($(PKG)_INSTALL_ROOT)$(CMAKE_HOST_PREFIX)/lib/$(LIBRARY_PREFIX)qscintilla2$(LIBRARY_SUFFIX).dll'; \
2997
4f9b72cf7ee7 allow native builds too
John W. Eaton <jwe@octave.org>
parents: 2935
diff changeset
80 fi
4222
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents: 4201
diff changeset
81
2935
8cf0cbcdaeea Include qscintilla as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
82 endef