Mercurial > octave

changeset 33445:2383f7553930 bytecode-interpreter

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: Merge default to bytecode-interpreter.
author Markus Mützel <markus.muetzel@gmx.de>
date Mon, 22 Apr 2024 17:53:10 +0200
parents b6bb53ff12b4 (current diff) f57b492b5527 (diff)
children 662938d6b684
files .github/workflows/make.yaml
diffstat 3 files changed, 17 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/.github/workflows/make.yaml	Sun Apr 21 11:22:37 2024 -0400
+++ b/.github/workflows/make.yaml	Mon Apr 22 17:53:10 2024 +0200
@@ -785,7 +785,7 @@
             ${{ matrix.target-prefix }}-ccache
             ${{ matrix.target-prefix }}-icoutils
             ${{ matrix.target-prefix }}-librsvg
-            texinfo
+            ${{ matrix.target-prefix }}-texinfo
 
             unzip
             zip
@@ -880,15 +880,10 @@
         continue-on-error: true
         timeout-minutes: 60
 
-        # Perl scripts cannot be run as executables on Windows (no shebang mechanism).
-        # We need to wrap them by calling the perl executable explicitly.
-
         # mkoctfile seems to have trouble when gcc is called via ccache. So,
         # remove the directory with the ccache wrappers from PATH.
 
         run: |
-          echo "makeinfo_program (sprintf ('%s && cd %s && perl makeinfo', [s=nthargout(2, @system, 'cygpath -w /usr/bin')](1:2), strtrim (s)));" \
-            >> ./scripts/startup/site-rcfile
           export PATH=$(echo "$PATH" | sed -e "s|$MINGW_PREFIX/lib/ccache/bin:||g")
           make -C ./.build check-tree-evaluator RUN_OCTAVE_OPTIONS="--no-gui-libs" | tee ./test-suite.log
 
--- a/libgui/src/m-editor/octave-qscintilla.cc	Sun Apr 21 11:22:37 2024 -0400
+++ b/libgui/src/m-editor/octave-qscintilla.cc	Mon Apr 22 17:53:10 2024 +0200
@@ -888,8 +888,22 @@
   for (int i = 0; i < lines.count (); i++)
     {
       QString line = lines.at (i);
+
       if (line.trimmed ().isEmpty ())
         continue;
+
+      if (line.startsWith ("%!"))   // Handle tests and demos
+        {
+          // Do not remove %! if keyword is directly following.
+          // Exception: assert
+            {
+              // assert might be used without leading space
+              line.replace (QRegularExpression("^%!assert(\\s*)([^\\s]+)"), "assert\\1\\2");
+              // Remove "%! "
+              line.replace (QRegularExpression("^%!\\s+"), "");
+            }
+        }
+
       QString line_escaped = line;
       line_escaped.replace (QString ("'"), QString ("''"));
       QString line_history = line;
--- a/m4/acinclude.m4	Sun Apr 21 11:22:37 2024 -0400
+++ b/m4/acinclude.m4	Mon Apr 22 17:53:10 2024 +0200
@@ -2047,10 +2047,10 @@
     ## Check for Qt libraries
     case "$qt_version" in
       5)
-        QT_MODULES="Qt5Core Qt5Gui Qt5Help Qt5Network Qt5OpenGL Qt5PrintSupport Qt5Xml"
+        QT_MODULES="Qt5Core Qt5Gui Qt5Help Qt5Network Qt5OpenGL Qt5PrintSupport Qt5Widgets Qt5Xml"
       ;;
       6)
-        QT_MODULES="Qt6Core Qt6Gui Qt6Help Qt6Network Qt6OpenGL Qt6OpenGLWidgets Qt6PrintSupport Qt6Xml"
+        QT_MODULES="Qt6Core Qt6Gui Qt6Help Qt6Network Qt6OpenGL Qt6OpenGLWidgets Qt6PrintSupport Qt6Widgets Qt6Xml"
         case $host_os in
           mingw* | msdosmsvc*)
           ;;