Mercurial > mxe-octave

annotate src/qscintilla.mk @ 6161:8fcac4d6d983 release

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
of-queueing: Fix syntax error with Octave 7 (bug #62314). * src/of-queueing-1-octave7.patch: Add new file. * dist-files.mk: Include new patch.
author Markus Mützel <markus.muetzel@gmx.de>
date Thu, 14 Apr 2022 19:27:13 +0200
parents 3f37fcd900e0
children 0d4bc5e57834
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 :=
5924
3f37fcd900e0 * src/qscintilla.mk: update to v2.13.1
John Donoghue <john.donoghue@ieee.org>
parents: 5922
diff changeset
6 $(PKG)_VERSION := 2.13.1
3f37fcd900e0 * src/qscintilla.mk: update to v2.13.1
John Donoghue <john.donoghue@ieee.org>
parents: 5922
diff changeset
7 $(PKG)_CHECKSUM := 082cbaa8419ff1911cd9d7fec79ce21ca621eeb6
5922
78901dc12b99 qscintilla: update to v2.13.0
John Donoghue <john.donoghue@ieee.org>
parents: 5587
diff changeset
8 $(PKG)_SUBDIR := QScintilla_src-$($(PKG)_VERSION)
78901dc12b99 qscintilla: update to v2.13.0
John Donoghue <john.donoghue@ieee.org>
parents: 5587
diff changeset
9 $(PKG)_FILE := QScintilla_src-$($(PKG)_VERSION).tar.gz
5042
56cce715e32f * src/qscintilla.mk: update package url
John Donoghue
parents: 4975
diff changeset
10 $(PKG)_URL := https://www.riverbankcomputing.com/static/Downloads/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' | \
5922
78901dc12b99 qscintilla: update to v2.13.0
John Donoghue <john.donoghue@ieee.org>
parents: 5587
diff changeset
27 $(SED) -n 's,.*QScintilla_src-\([0-9][^>]*\)\.zip.*,\1,p' | \
4618
de2eedecd6ba update broken PKG_UPDATE rules, handle missing update rules
John Donoghue
parents: 4614
diff changeset
28 head -n 1
2935
8cf0cbcdaeea Include qscintilla as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
29 endef
8cf0cbcdaeea Include qscintilla as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
30
2997
4f9b72cf7ee7 allow native builds too
John W. Eaton <jwe@octave.org>
parents: 2935
diff changeset
31 ifneq ($(MXE_NATIVE_BUILD),yes)
4f9b72cf7ee7 allow native builds too
John W. Eaton <jwe@octave.org>
parents: 2935
diff changeset
32 ifeq ($(MXE_SYSTEM),mingw)
4222
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents: 4201
diff changeset
33 ifeq ($(ENABLE_QT5),yes)
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents: 4201
diff changeset
34 $(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
35 else
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents: 4201
diff changeset
36 $(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
37 endif
2997
4f9b72cf7ee7 allow native builds too
John W. Eaton <jwe@octave.org>
parents: 2935
diff changeset
38 endif
3130
3c1afa2c8e43 [MSVC] enable qscintilla compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3065
diff changeset
39 ifeq ($(MXE_SYSTEM),msvc)
3c1afa2c8e43 [MSVC] enable qscintilla compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3065
diff changeset
40 # FIXME: compute "2010" suffix dynamically
3c1afa2c8e43 [MSVC] enable qscintilla compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3065
diff changeset
41 $(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
42 endif
2997
4f9b72cf7ee7 allow native builds too
John W. Eaton <jwe@octave.org>
parents: 2935
diff changeset
43 endif
4f9b72cf7ee7 allow native builds too
John W. Eaton <jwe@octave.org>
parents: 2935
diff changeset
44
2935
8cf0cbcdaeea Include qscintilla as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
45 define $(PKG)_BUILD
5922
78901dc12b99 qscintilla: update to v2.13.0
John Donoghue <john.donoghue@ieee.org>
parents: 5587
diff changeset
46 cd '$(1)/src' && \
4503
bb63484e88ae qscintilla: Pass MXE_LDFLAGS to qmake.
John W. Eaton <jwe@octave.org>
parents: 4410
diff changeset
47 '$(MXE_QMAKE)' -makefile \
bb63484e88ae qscintilla: Pass MXE_LDFLAGS to qmake.
John W. Eaton <jwe@octave.org>
parents: 4410
diff changeset
48 $($(PKG)_QMAKE_SPEC_OPTION) \
bb63484e88ae qscintilla: Pass MXE_LDFLAGS to qmake.
John W. Eaton <jwe@octave.org>
parents: 4410
diff changeset
49 QMAKE_UIC='$(MXE_UIC)' \
bb63484e88ae qscintilla: Pass MXE_LDFLAGS to qmake.
John W. Eaton <jwe@octave.org>
parents: 4410
diff changeset
50 QMAKE_MOC='$(MXE_MOC)' \
bb63484e88ae qscintilla: Pass MXE_LDFLAGS to qmake.
John W. Eaton <jwe@octave.org>
parents: 4410
diff changeset
51 QMAKE_LFLAGS=$(MXE_LDFLAGS) \
bb63484e88ae qscintilla: Pass MXE_LDFLAGS to qmake.
John W. Eaton <jwe@octave.org>
parents: 4410
diff changeset
52 QMAKE_CXXFLAGS='-std=c++11'
2935
8cf0cbcdaeea Include qscintilla as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
53
3130
3c1afa2c8e43 [MSVC] enable qscintilla compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3065
diff changeset
54 if [ $(MXE_SYSTEM) = msvc ]; then \
3293
cf6f40cededb Support file list generation in packages.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3291
diff changeset
55 mkdir -p '$(3)' && \
5922
78901dc12b99 qscintilla: update to v2.13.0
John Donoghue <john.donoghue@ieee.org>
parents: 5587
diff changeset
56 cd '$(1)/src' && \
3130
3c1afa2c8e43 [MSVC] enable qscintilla compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3065
diff changeset
57 env -u MAKE -u MAKEFLAGS nmake && \
3293
cf6f40cededb Support file list generation in packages.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3291
diff changeset
58 env -u MAKE -u MAKEFLAGS nmake \
cf6f40cededb Support file list generation in packages.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3291
diff changeset
59 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
60 else \
5922
78901dc12b99 qscintilla: update to v2.13.0
John Donoghue <john.donoghue@ieee.org>
parents: 5587
diff changeset
61 $(MAKE) -C '$(1)/src' -j '$(JOBS)' && \
78901dc12b99 qscintilla: update to v2.13.0
John Donoghue <john.donoghue@ieee.org>
parents: 5587
diff changeset
62 $(MAKE) -C '$(1)/src' -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
63 fi
cf6f40cededb Support file list generation in packages.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3291
diff changeset
64
4517
8e522798c9a7 qscintilla: simplify DLL install rules
John W. Eaton <jwe@octave.org>
parents: 4503
diff changeset
65 if [ $(MXE_SYSTEM) = mingw ]; then \
8e522798c9a7 qscintilla: simplify DLL install rules
John W. Eaton <jwe@octave.org>
parents: 4503
diff changeset
66 $(INSTALL) -d '$($(PKG)_INSTALL_ROOT)$(HOST_BINDIR)'; \
8e522798c9a7 qscintilla: simplify DLL install rules
John W. Eaton <jwe@octave.org>
parents: 4503
diff changeset
67 if [ $(ENABLE_QT5) = yes ]; then \
8e522798c9a7 qscintilla: simplify DLL install rules
John W. Eaton <jwe@octave.org>
parents: 4503
diff changeset
68 mv '$($(PKG)_INSTALL_ROOT)$(HOST_PREFIX)/qt5/lib/qscintilla2_qt5.dll' '$($(PKG)_INSTALL_ROOT)$(HOST_BINDIR)'; \
8e522798c9a7 qscintilla: simplify DLL install rules
John W. Eaton <jwe@octave.org>
parents: 4503
diff changeset
69 else \
8e522798c9a7 qscintilla: simplify DLL install rules
John W. Eaton <jwe@octave.org>
parents: 4503
diff changeset
70 mv '$($(PKG)_INSTALL_ROOT)$(HOST_LIBDIR)/qscintilla2_qt4.dll' '$($(PKG)_INSTALL_ROOT)$(HOST_BINDIR)/'; \
8e522798c9a7 qscintilla: simplify DLL install rules
John W. Eaton <jwe@octave.org>
parents: 4503
diff changeset
71 fi; \
4222
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents: 4201
diff changeset
72 fi
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents: 4201
diff changeset
73
3293
cf6f40cededb Support file list generation in packages.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3291
diff changeset
74 # 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
75 # 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
76 # 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
77 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
78 $(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
79 $(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
80 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
81 fi
4222
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents: 4201
diff changeset
82
2935
8cf0cbcdaeea Include qscintilla as a dependency of Octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
83 endef