Version 1.7

ocelot-inc · Jun 8, 2022 · e788a8b · e788a8b
1 parent 8b66073
commit e788a8b
Show file tree

Hide file tree

Showing 15 changed files with 160 additions and 137 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -140,8 +140,8 @@
 
 # FILENAME_EXTRA
 # Default is blank. ocelotgui passes -DFILENAME_EXTRA="qt4" when building with qt4,
-# so the final package name will look like ocelotgui_1.6.0qt4-1_amd64.deb or
-# ocelotgui-1.6.0qt4-1.x86_64.rpm. Ordinarily it should not be specified.
+# so the final package name will look like ocelotgui_1.7.0qt4-1_amd64.deb or
+# ocelotgui-1.7.0qt4-1.x86_64.rpm. Ordinarily it should not be specified.
 
 # FILENAME_RELEASE
 # Default is "1". Ordinarily it doesn't need to be changed.
@@ -153,19 +153,19 @@
 
 # e.g. to generate .deb file and install with dpkg:
 # deb_build.sh, which copies files and invokes debian/rules, which uses CMakeLists.txt
-# sudo dpkg -i ocelotgui_1.6.0-1_amd64.deb
+# sudo dpkg -i ocelotgui_1.7.0-1_amd64.deb
 # but see also comments in deb_build.sh and debian/README.Debian
 
 # e.g. to generate .rpm file and install with rpm:
 # rpm_build.sh, which copies files and invokes ocelotgui.spec, which uses CMakeLists.txt
-# rpmlint ocelotgui-1.6.0-1.x86_64.rpm
-# rpm -i ocelotgui-1.6.0-1.x86_64.rpm
+# rpmlint ocelotgui-1.7.0-1.x86_64.rpm
+# rpm -i ocelotgui-1.7.0-1.x86_64.rpm
 # but see also comments in rpm_build.sh
 
 # Todo: We only check if CMAKE_SYSTEM_PROCESSOR = x86_64. On FreeBSD 12, uname -p says amd64.
 # Todo: Maybe set(CMAKE_CXX_FLAGS "${Qt6Widgets_EXECUTABLE_COMPILE_FLAGS}") as we do for Qt5Widgets.
 
-message("-- CmakeLists.txt for ocelotgui 1.6.0")
+message("-- CmakeLists.txt for ocelotgui 1.7.0")
 message("-- see comments in CMakeLists.txt for special instructions")
 message("-- see README.md for general instructions for building")
 
@@ -458,6 +458,7 @@ install(FILES README.md DESTINATION ${CMAKE_INSTALL_DOCDIR})
 install(FILES options.txt DESTINATION ${CMAKE_INSTALL_DOCDIR})
 install(FILES debugger_reference.txt DESTINATION ${CMAKE_INSTALL_DOCDIR})
 install(FILES tarantool.txt DESTINATION ${CMAKE_INSTALL_DOCDIR})
+install(FILES PKGBUILD DESTINATION ${CMAKE_INSTALL_DOCDIR})
 endif (NOT PACKAGE_TYPE MATCHES "RPM")
 endif (NOT PACKAGE_TYPE MATCHES "DEB")
 if (NOT PACKAGE_TYPE MATCHES "DEB")
@@ -494,14 +495,14 @@ if (PACKAGE_TYPE MATCHES "RPM")
   install(FILES ocelotgui.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1)
 endif (PACKAGE_TYPE MATCHES "RPM")
 
-# version = 1.6.0
+# version = 1.7.0
 set(CPACK_PACKAGE_VERSION_MAJOR "1")
-set(CPACK_PACKAGE_VERSION_MINOR "6")
+set(CPACK_PACKAGE_VERSION_MINOR "7")
 set(CPACK_PACKAGE_VERSION_PATCH "0")
 
-# I assume nobody wants package names like ocelotgui_1.6.0-Linux.deb
+# I assume nobody wants package names like ocelotgui_1.7.0-Linux.deb
 # but that's what I get if CMAKE_SYSTEM_NAME = "Linux".
-# I'd prefer ocelotgui_1.6.0-1_amd64.deb or ocelotgui-1.6.0.x86_64.rpm
+# I'd prefer ocelotgui_1.7.0-1_amd64.deb or ocelotgui-1.7.0.x86_64.rpm
 # If it's neither "DEB" nor "RPM", = default.
 set(FILENAME_PLATFORM_FOR_DEB "Linux")
 set(FILENAME_PLATFORM_FOR_RPM "Linux")

diff --git a/PKGBUILD b/PKGBUILD
@@ -12,7 +12,7 @@
 #               The file name should be PKGBUILD and the directory name should be ocelotgui.
 #               sudo pacman -S base-devel libmariadbclient cmake
 #               makepkg
-#               sudo pacman -U ./ocelotgui-1.6.0-1-x86_64.pkg.tar.zst
+#               sudo pacman -U ./ocelotgui-1.7.0-1-x86_64.pkg.tar.zst
 #               Now ocelotgui is ready to run. It might be necessary to run it twice.
 # For Qt 6:     Change depends=('qt5-base' ...) to depends=('qt6-base' ...)
 #               Change -DQT_VERSION=5 to -DQT_VERSION=6
@@ -32,7 +32,7 @@
 #Re cmake:      This is an out-of-source build and produces a RelWithDebInfo executable with an -O2 flag.
 #               For other options read CMakeLists.txt.
 pkgname=ocelotgui
-pkgver=1.6.0
+pkgver=1.7.0
 pkgrel=1
 pkgdesc="GUI client for MySQL or MariaDB or Tarantool DBMS"
 arch=("i686" "x86_64")

diff --git a/README.htm b/README.htm
@@ -1,7 +1,7 @@
 
 ocelotgui
 
-<P>Version 1.6.0</P>
+<P>Version 1.7.0</P>
 
 <P>The ocelotgui GUI, a database client, allows users to connect to
 a MySQL or MariaDB DBMS server, enter SQL statements, and receive results.
@@ -77,7 +77,9 @@ <H3 id="getting-the-qt-library">Getting the Qt library</H3><HR>
 If the response starts with libQtGui.so.4 then you have Qt4,
 if the response starts with libQt5Gui.so.5 then you have Qt5.
 Alternatively it sometimes can be found with qmake -v.
-Peter Gulutzan supplies executables only for Qt version 5, but if you have Qt version 4 or Qt version 6 you can build from source.
+Peter Gulutzan supplies executables only for Qt version 5, but
+often appropriate files are downloaded automatically during ocelotgui installation.
+To force use of a different Qt version you can build from source.
 </P>
 
 <P>The Qt library is necessary for ocelotgui installation.</P>
@@ -118,21 +120,21 @@ <H3 id="getting-the-ocelotgui-executable-package">Getting the ocelotgui executab
 cut and paste the corresponding pair of instructions onto your computer and
 you can be up and running in about 15 seconds.<BR><BR>
 For 32-bit, Debian-like, Qt5<PRE>
-wget https://github.com/ocelot-inc/ocelotgui/releases/download/1.6.0/ocelotgui_1.6.0-1_i386.deb
-sudo apt install ./ocelotgui_1.6.0-1_i386.deb</PRE>
+wget https://github.com/ocelot-inc/ocelotgui/releases/download/1.7.0/ocelotgui_1.7.0-1_i386.deb
+sudo apt install ./ocelotgui_1.7.0-1_i386.deb</PRE>
 For 64-bit, Debian-like, Qt5<PRE>
-wget https://github.com/ocelot-inc/ocelotgui/releases/download/1.6.0/ocelotgui_1.6.0-1_amd64.deb
-sudo apt install ./ocelotgui_1.6.0-1_amd64.deb</PRE>
+wget https://github.com/ocelot-inc/ocelotgui/releases/download/1.7.0/ocelotgui_1.7.0-1_amd64.deb
+sudo apt install ./ocelotgui_1.7.0-1_amd64.deb</PRE>
 For 64-bit, RPM-like, Qt5<PRE>
-wget https://github.com/ocelot-inc/ocelotgui/releases/download/1.6.0/ocelotgui-1.6.0-1.x86_64.rpm
-sudo rpm -i ocelotgui-1.6.0-1.x86_64.rpm</PRE>
+wget https://github.com/ocelot-inc/ocelotgui/releases/download/1.7.0/ocelotgui-1.7.0-1.x86_64.rpm
+sudo rpm -i ocelotgui-1.7.0-1.x86_64.rpm</PRE>
 For 64-bit, any Linux, Qt5<PRE>
-wget https://github.com/ocelot-inc/ocelotgui/releases/download/1.6.0/ocelotgui-1.6.0.tar.gz
-tar zxvf ocelotgui-1.6.0.tar.gz
+wget https://github.com/ocelot-inc/ocelotgui/releases/download/1.7.0/ocelotgui-1.7.0.tar.gz
+tar zxvf ocelotgui-1.7.0.tar.gz
 ocelotgui/ocelotgui-qt5</PRE>
 For 64-bit, any Linux, Qt4 (deprecated)<PRE>
-wget https://github.com/ocelot-inc/ocelotgui/releases/download/1.6.0/ocelotgui-1.6.0.tar.gz
-tar zxvf ocelotgui-1.6.0.tar.gz
+wget https://github.com/ocelot-inc/ocelotgui/releases/download/1.7.0/ocelotgui-1.7.0.tar.gz
+tar zxvf ocelotgui-1.7.0.tar.gz
 ocelotgui/ocelotgui-qt4</PRE>
 </P>
 
@@ -166,7 +168,7 @@ <H2 ID="some-screenshots">Some screenshots</H2><HR>
 
 <H2 ID="user-manual">User Manual</H2><HR><HR>
 
-<P>Version 1.6.0, January 9 2022</P>
+<P>Version 1.7.0, June 8 2022</P>
 
 <P>Copyright (c) 2022 by Peter Gulutzan. All rights reserved.</P>
 
@@ -1794,7 +1796,7 @@ <H3 id="Appendix-3">Appendix 3 Tarantool</H3><HR>
 Tarantool library, its code is embedded in ocelotgui.exe.</P>
 
 <P>You need the latest ocelotgui client.
-The Release 1.6.0 version is okay at the time of release,
+The Release 1.7.0 version is okay at the time of release,
 but some things might not be up to date.
 It may be better to build it from source.
 Download from github.com/ocelot-inc/ocelotgui.</P>
@@ -1955,11 +1957,11 @@ <H3 id="Appendix-4">Appendix 4 Windows</H3><HR>
 * Download the ocelotgui zip file from github.
   Check https://github.com/ocelot-inc/ocelotgui/blob/master/README.md
   to see where the latest release is. For example it might be
-  https://github.com/ocelot-inc/ocelotgui/releases/download/1.6.0/ocelotgui-1.6.0-1.ocelotgui.zip<br>
+  https://github.com/ocelot-inc/ocelotgui/releases/download/1.7.0/ocelotgui-1.7.0-1.ocelotgui.zip<br>
 * Unzip. It was zipped with 7-zip from http://www.7-zip.org,
   but other utilities should work. For example, on Windows command prompt,
   if you have the PowerShell utility on your path:
-  PowerShell Expand-Archive ocelotgui-1.6.0-1.ocelotgui.zip c:\ocelotgui<br>
+  PowerShell Expand-Archive ocelotgui-1.7.0-1.ocelotgui.zip c:\ocelotgui<br>
 * Read the COPYING and LICENSE arrangements.
   On Windows ocelotgui is statically linked to Qt and MariaDB libraries,
   so the copyright and licensing is not the same as for Linux.<br>
@@ -2210,9 +2212,9 @@ <H4>Building ocelotgui.exe from source</H4>
 : Make sure you can unzip ocelotgui.zip with both 7-zip and winzip.
 copy release\ocelotgui.exe ocelotgui.exe
 del ocelotui.zip
-"C:\Program Files (x86)\7-Zip\7z" a -tzip ocelotgui.zip ocelotgui.exe changelog               manual.htm         ocelotgui-logo.png ocelotgui_logo.png           shot8.jpg CMakeLists.txt          menu-debug.png     ocelotgui.pro                   shot9.jpg codeeditor.h            menu-edit.png      ocelotgui.ui                  special-detach.png COPYING                 menu-file.png      options.txt                shot10.jpg             special-images.png COPYING.thirdparty      menu-help.png      ostrings.h                 shot11.png             special-settings.png copyright               menu-options.png   README.htm                 shot1.jpg              special-vertical.png debugger.png            menu-run.png       README.md                  shot2.jpg              starting-dialog.png debugger_reference.txt  menu-settings.png  README.txt                 shot3.png              starting.png example.cnf             ocelotgui.1        readmylogin.c              shot4.jpg              statement-widget-example.png hparse.h                ocelotgui.cpp      result-widget-example.png  shot5.jpg              third_party.h install_sql.cpp         ocelotgui.desktop  rpmchangelog               shot6.jpg              windows.txt LICENSE.GPL             ocelotgui.h                shot7.jpg tarantool.txt rpm_build.sh ocelotgui.spec completer_1.png completer_2.png completer_3.png conditional.png
+"C:\Program Files (x86)\7-Zip\7z" a -tzip ocelotgui.zip ocelotgui.exe changelog               manual.htm         ocelotgui-logo.png ocelotgui_logo.png           shot8.jpg CMakeLists.txt          menu-debug.png     ocelotgui.pro                   shot9.jpg codeeditor.h            menu-edit.png      ocelotgui.ui                  special-detach.png COPYING                 menu-file.png      options.txt                shot10.jpg             special-images.png COPYING.thirdparty      menu-help.png      ostrings.h                 shot11.png             special-settings.png copyright               menu-options.png   README.htm                 shot1.jpg              special-vertical.png debugger.png            menu-run.png       README.md                  shot2.jpg              starting-dialog.png debugger_reference.txt  menu-settings.png  README.txt                 shot3.png              starting.png example.cnf     PKGBUILD        ocelotgui.1        readmylogin.c              shot4.jpg              statement-widget-example.png hparse.h                ocelotgui.cpp      result-widget-example.png  shot5.jpg              third_party.h install_sql.cpp         ocelotgui.desktop  rpmchangelog               shot6.jpg              windows.txt LICENSE.GPL             ocelotgui.h                shot7.jpg tarantool.txt rpm_build.sh ocelotgui.spec completer_1.png completer_2.png completer_3.png conditional.png
 
-: What we actually put in the release looks like ocelotgui-1.6.0-1.ocelotgui.zip, so rename the .zip file at some point.
+: What we actually put in the release looks like ocelotgui-1.7.0-1.ocelotgui.zip, so rename the .zip file at some point.
 
 
 : (Dynamic linking)
@@ -2290,14 +2292,14 @@ <H3 id="getting-and-using-the-ocelotgui-source">Appendix 5 Getting and using the
 by github and is named ocelotgui-[version].tar.gz.
 Since version 1.0.9, there is also a release file named ocelotgui_[version].orig.tar.gz
 which is preferable because it does not contain unnecessary executables.
-Thus release 1.6.0 is at
-https://github.com/ocelot-inc/ocelotgui/releases/download/1.6.0/ocelotgui_1.6.0.orig.tar.gz.
+Thus release 1.7.0 is at
+https://github.com/ocelot-inc/ocelotgui/releases/download/1.7.0/ocelotgui_1.7.0.orig.tar.gz.
 Typically, to get it, one would cd to a download directory, then
 <PRE>
-wget https://github.com/ocelot-inc/ocelotgui/releases/download/1.6.0/ocelotgui_1.6.0.orig.tar.gz
+wget https://github.com/ocelot-inc/ocelotgui/releases/download/1.7.0/ocelotgui_1.7.0.orig.tar.gz
 </PRE>
 or use a browser to go to <A HREF="https://github.com/ocelot-inc/ocelotgui/releases">https://github.com/ocelot-inc/ocelotgui/releases</A>
-and click ocelotgui_1.6.0.orig.tar.gz.</P>
+and click ocelotgui_1.7.0.orig.tar.gz.</P>
 
 <P>On Debian-like systems some packages must be installed first.
 For example on Ubuntu:<PRE>
@@ -2336,8 +2338,8 @@ <H3 id="getting-and-using-the-ocelotgui-source">Appendix 5 Getting and using the
 <P>(Package builds on ArchLinux-like systems can also be done with the PKGBUILD file in the ocelotgui github repository.)</P>
 
 <P>Unpack all the source files by saying:<PRE>
- tar -zxvf ocelotgui_1.6.0.orig.tar.gz
- cd ocelotgui-1.6.0</PRE>
+ tar -zxvf ocelotgui_1.7.0.orig.tar.gz
+ cd ocelotgui-1.7.0</PRE>
 At this point it is a good idea to examine the file CMakeLists.txt.
 This file has comments about options which are available to
 customize the build process: CMAKE_PREFIX_PATH, CMAKE_INSTALL_PREFIX,
@@ -2361,12 +2363,12 @@ <H3 id="getting-and-using-the-ocelotgui-source">Appendix 5 Getting and using the
 Please read the comments in the scripts before using them.
 For Debian-like platforms say<PRE>
  ./deb_build.sh
- sudo apt install /tmp/debian3/ocelotgui_1.6.0-1_amd64.deb
- #or sudo apt install /tmp/debian3/ocelotgui_1.6.0-1_i386.deb</PRE>
+ sudo apt install /tmp/debian3/ocelotgui_1.7.0-1_amd64.deb
+ #or sudo apt install /tmp/debian3/ocelotgui_1.7.0-1_i386.deb</PRE>
 For RPM-like platforms say<PRE>
  ./rpm_build.sh
- sudo rpm -i ~/ocelotgui_rpm//rp/rpmbuild/RPMS/x86_64/ocelotgui-1.6.0-1.x86_64.rpm
- #or sudo rpm -i ~/ocelotgui_rpm//rp/rpmbuild/RPMS/x86_64/ocelotgui-1.6.0-1.i686.rpm</PRE>
+ sudo rpm -i ~/ocelotgui_rpm//rp/rpmbuild/RPMS/x86_64/ocelotgui-1.7.0-1.x86_64.rpm
+ #or sudo rpm -i ~/ocelotgui_rpm//rp/rpmbuild/RPMS/x86_64/ocelotgui-1.7.0-1.i686.rpm</PRE>
 Usually the result will go to subdirectories of /usr, in which case,
 if /usr/bin is on your PATH, then saying ocelotgui will start the program.
 </P>