Official Release 19.0.0 (#54)

* Update NEWS file for 19.0.0.

* Update the version number in the build system.

* Update ax_have_qt.m4

* Official Release 19.0.0

CMakeLists.txt

@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.5)
 
-project(rcssmonitor VERSION 18.0.0)
+project(rcssmonitor VERSION 19.0.0)
 
 if(CMAKE_VERSION VERSION_LESS "3.7.0")
     set(CMAKE_INCLUDE_CURRENT_DIR ON)

ChangeLog

@@ -1,3 +1,12 @@
+2024-03-25  Hidehisa Akiyama  <[email protected]>
+
+	* CMakeLists.txt:
+	* NEWS:
+	* configurea.ac:
+	- updated a major version number. Official release 19.0.0.
+	- improve the rcg parser library.
+	- support a new JSON monitor protocol.
+
 2023-03-07  Hidehisa Akiyama  <[email protected]>
 
 	* CMakeLists.txt:

NEWS

@@ -1,3 +1,11 @@
+[19.0.0]
+  * Support new server parameters.
+
+  * Reimplement a rcg parser library. A faster JSON parser is now
+    avaiable.
+
+  * Fix warnings that occur with Qt-5.15
+
 [18.0.0]
   * Support the changes of JSON-based protocol. To use the JSON-based
     monitor protocol, -1 is required for client-version.

configure.ac

@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.61)
-AC_INIT([rcssmonitor],[18.0.0],[https://github.com/rcsoccersim/rcssmonitor])
+AC_INIT([rcssmonitor],[19.0.0],[https://github.com/rcsoccersim/rcssmonitor])
 
 #LT_PREREQ(2.2.4)
 

m4/ax_have_qt.m4

@@ -25,6 +25,7 @@
 #     QT_LRELEASE
 #     QT_LUPDATE
 #     QT_DIR
+#     QMAKE
 #
 #   which respectively contain an "-I" flag pointing to the Qt include
 #   directory, link flags necessary to link with Qt and X, the full path to
@@ -54,30 +55,31 @@
 #   and this notice are preserved. This file is offered as-is, without any
 #   warranty.
 
-#serial 19
+#serial 25
 
 AU_ALIAS([BNV_HAVE_QT], [AX_HAVE_QT])
 AC_DEFUN([AX_HAVE_QT],
 [
   AC_REQUIRE([AC_PROG_CXX])
   AC_REQUIRE([AC_PATH_X])
   AC_REQUIRE([AC_PATH_XTRA])
-
-  AC_MSG_CHECKING(for Qt)
-
   # openSUSE leap 15.3 installs qmake-qt5, not qmake, for example.
-  # Store the full name (like qmake-qt5) into am_have_qt_qmexe
+  # Store the full name (like qmake-qt5) into QMAKE
   # and the specifier (like -qt5 or empty) into am_have_qt_qmexe_suff.
-  AC_CHECK_PROGS(am_have_qt_qmexe,qmake qmake-qt6 qmake-qt5,[])
-  am_have_qt_qmexe_suff=`echo $am_have_qt_qmexe | cut -b 6-`
+  AC_ARG_VAR([QMAKE],"Qt make tool")
+  AC_CHECK_TOOLS([QMAKE],[qmake qmake-qt6 qmake-qt5],[false])
+
+  AC_MSG_CHECKING(for Qt)
+  am_have_qt_qmexe_suff=`echo $QMAKE | sed 's,^.*qmake,,'`
   # If we have Qt5 or later in the path, we're golden
-  ver=`$am_have_qt_qmexe --version | grep -o "Qt version ."`
+  ver=`$QMAKE --version | grep -o "Qt version ."`
 
   if test "$ver" ">" "Qt version 4"; then
     have_qt=yes
     # This pro file dumps qmake's variables, but it only works on Qt 5 or later
     am_have_qt_dir=`mktemp -d`
     am_have_qt_pro="$am_have_qt_dir/test.pro"
+    am_have_qt_stash="$am_have_qt_dir/.qmake.stash"
     am_have_qt_makefile="$am_have_qt_dir/Makefile"
     # http://qt-project.org/doc/qt-5/qmake-variable-reference.html#qt
     cat > $am_have_qt_pro << EOF
@@ -118,10 +120,10 @@ percent.target = %
 percent.commands = @echo -n "\$(\$(@))\ "
 QMAKE_EXTRA_TARGETS += percent
 EOF
-    $am_have_qt_qmexe $am_have_qt_pro -o $am_have_qt_makefile
+    $QMAKE $am_have_qt_pro -o $am_have_qt_makefile
     QT_CXXFLAGS=`cd $am_have_qt_dir; make -s -f $am_have_qt_makefile CXXFLAGS INCPATH`
     QT_LIBS=`cd $am_have_qt_dir; make -s -f $am_have_qt_makefile LIBS`
-    rm $am_have_qt_pro $am_have_qt_makefile
+    rm $am_have_qt_pro $am_have_qt_stash $am_have_qt_makefile
     rmdir $am_have_qt_dir
 
     # Look for specific tools in $PATH
@@ -132,7 +134,7 @@ EOF
     QT_LUPDATE=`which lupdate$am_have_qt_qmexe_suff`
 
     # Get Qt version from qmake
-    QT_DIR=`$am_have_qt_qmexe --version | grep -o -E /.+`
+    QT_DIR=`$QMAKE --version | grep -o -E /.+`
 
     # All variables are defined, report the result
     AC_MSG_RESULT([$have_qt:
@@ -165,6 +167,7 @@ EOF
   AC_SUBST(QT_RCC)
   AC_SUBST(QT_LRELEASE)
   AC_SUBST(QT_LUPDATE)
+  AC_SUBST(QMAKE)
 
   #### Being paranoid:
   if test x"$have_qt" = xyes; then