Skip to content

Commit

Permalink
Version 2.3.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@pgulutzan
pgulutzan committed Mar 18, 2024
1 parent b6c9c30 commit 84cbdc9
Show file tree
Hide file tree
Showing 15 changed files with 169 additions and 134 deletions.
20 changes: 10 additions & 10 deletions CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -151,8 +151,8 @@

# FILENAME_EXTRA
# Default is blank. ocelotgui passes -DFILENAME_EXTRA="qt4" when building with qt4,
# so the final package name will look like ocelotgui_2.2.0qt4-1_amd64.deb or
# ocelotgui-2.2.0qt4-1.x86_64.rpm. Ordinarily it should not be specified.
# so the final package name will look like ocelotgui_2.3.0qt4-1_amd64.deb or
# ocelotgui-2.3.0qt4-1.x86_64.rpm. Ordinarily it should not be specified.

# FILENAME_RELEASE
# Default is "1". Ordinarily it doesn't need to be changed.
Expand All @@ -164,21 +164,21 @@

# 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_2.2.0-1_amd64.deb
# sudo dpkg -i ocelotgui_2.3.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-2.2.0-1.x86_64.rpm
# rpm -i ocelotgui-2.2.0-1.x86_64.rpm
# rpmlint ocelotgui-2.3.0-1.x86_64.rpm
# rpm -i ocelotgui-2.3.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.
# Todo: We do not install README_tarantool.htm or the *_tarantool.png files, though we put them on github.
# Todo: We do not install ocelotgui-logo.png, we only install ocelotgui_logo.png.

message("-- CmakeLists.txt for ocelotgui 2.2.0")
message("-- CmakeLists.txt for ocelotgui 2.3.0")
message("-- see comments in CMakeLists.txt for special instructions")
message("-- see README.md for general instructions for building")

Expand Down Expand Up @@ -573,14 +573,14 @@ if (PACKAGE_TYPE MATCHES "RPM")
install(FILES ocelotgui.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1)
endif (PACKAGE_TYPE MATCHES "RPM")

# version = 2.2.0
# version = 2.3.0
set(CPACK_PACKAGE_VERSION_MAJOR "2")
set(CPACK_PACKAGE_VERSION_MINOR "2")
set(CPACK_PACKAGE_VERSION_MINOR "3")
set(CPACK_PACKAGE_VERSION_PATCH "0")

# I assume nobody wants package names like ocelotgui_2.2.0-Linux.deb
# I assume nobody wants package names like ocelotgui_2.3.0-Linux.deb
# but that's what I get if CMAKE_SYSTEM_NAME = "Linux".
# I'd prefer ocelotgui_2.2.0-1_amd64.deb or ocelotgui-2.2.0.x86_64.rpm
# I'd prefer ocelotgui_2.3.0-1_amd64.deb or ocelotgui-2.3.0.x86_64.rpm
# If it's neither "DEB" nor "RPM", = default.
set(FILENAME_PLATFORM_FOR_DEB "Linux")
set(FILENAME_PLATFORM_FOR_RPM "Linux")
Expand Down
58 changes: 32 additions & 26 deletions README.htm
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

ocelotgui

<P>Version 2.2.0</P>
<P>Version 2.3.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.
Expand Down Expand Up @@ -123,21 +123,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/2.2.0/ocelotgui_2.2.0-1_i386.deb
sudo apt install ./ocelotgui_2.2.0-1_i386.deb</PRE>
wget https://github.com/ocelot-inc/ocelotgui/releases/download/2.3.0/ocelotgui_2.3.0-1_i386.deb
sudo apt install ./ocelotgui_2.3.0-1_i386.deb</PRE>
For 64-bit, Debian-like, Qt5<PRE>
wget https://github.com/ocelot-inc/ocelotgui/releases/download/2.2.0/ocelotgui_2.2.0-1_amd64.deb
sudo apt install ./ocelotgui_2.2.0-1_amd64.deb</PRE>
wget https://github.com/ocelot-inc/ocelotgui/releases/download/2.3.0/ocelotgui_2.3.0-1_amd64.deb
sudo apt install ./ocelotgui_2.3.0-1_amd64.deb</PRE>
For 64-bit, RPM-like, Qt5<PRE>
wget https://github.com/ocelot-inc/ocelotgui/releases/download/2.2.0/ocelotgui-2.2.0-1.x86_64.rpm
sudo rpm -i ocelotgui-2.2.0-1.x86_64.rpm</PRE>
wget https://github.com/ocelot-inc/ocelotgui/releases/download/2.3.0/ocelotgui-2.3.0-1.x86_64.rpm
sudo rpm -i ocelotgui-2.3.0-1.x86_64.rpm</PRE>
For 64-bit, any Linux, Qt5<PRE>
wget https://github.com/ocelot-inc/ocelotgui/releases/download/2.2.0/ocelotgui-2.2.0.tar.gz
tar zxvf ocelotgui-2.2.0.tar.gz
wget https://github.com/ocelot-inc/ocelotgui/releases/download/2.3.0/ocelotgui-2.3.0.tar.gz
tar zxvf ocelotgui-2.3.0.tar.gz
ocelotgui/ocelotgui-qt5</PRE>
For 64-bit, any Linux, Qt4 (deprecated)<PRE>
wget https://github.com/ocelot-inc/ocelotgui/releases/download/2.2.0/ocelotgui-2.2.0.tar.gz
tar zxvf ocelotgui-2.2.0.tar.gz
wget https://github.com/ocelot-inc/ocelotgui/releases/download/2.3.0/ocelotgui-2.3.0.tar.gz
tar zxvf ocelotgui-2.3.0.tar.gz
ocelotgui/ocelotgui-qt4</PRE>
</P>

Expand Down Expand Up @@ -172,7 +172,7 @@ <H2 ID="some-screenshots">Some screenshots</H2><HR>

<H2 ID="user-manual">User Manual</H2><HR><HR>

<P>Version 2.2.0, February 15 2024</P>
<P>Version 2.3.0, March 18 2024</P>

<P>Copyright (c) 2024 by Peter Gulutzan. All rights reserved.</P>

Expand Down Expand Up @@ -657,6 +657,12 @@ <H3 id="special-effects">Special Effects</H3><HR>
<P>RE: EXPORT. A result set can be dumped to a file as text, as table, or as html.
</P>


<P>RE: SHOW. There is a way to make SHOW (and similar statements like ANALYZE or CHECK or CHECKSUM or DESCRIBE or EXPLAIN or HELP)
accept SELECT-style clauses and return SELECT-style result sets. Details are in the blog post
<a href="http://ocelot.ca/blog/blog/2024/02/29/make-show-as-good-as-select/">Make SHOW as good as SELECT</a>.
</P>

<P>RE: TARANTOOL. By default ocelotgui is a client for MySQL or MariaDB.
To use it as a client for Tarantool, read
<A HREF="#Appendix-3">Appendix 3 Tarantool</A>.<P>
Expand Down Expand Up @@ -2135,7 +2141,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 2.2.0 version is okay at the time of release,
The Release 2.3.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>
Expand Down Expand Up @@ -2296,11 +2302,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/2.2.0/ocelotgui-2.2.0-1.ocelotgui.zip<br>
https://github.com/ocelot-inc/ocelotgui/releases/download/2.3.0/ocelotgui-2.3.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-2.2.0-1.ocelotgui.zip c:\ocelotgui<br>
PowerShell Expand-Archive ocelotgui-2.3.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>
Expand Down Expand Up @@ -2544,7 +2550,7 @@ <H4>Building ocelotgui.exe from source</H4>
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 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 explorer1.png explorer2.png explorer3.png explorer4.png explorer5.png explorer6.png explorer7.png explorer8.png explorer9.png

: What we actually put in the release looks like ocelotgui-2.2.0-1.ocelotgui.zip, so rename the .zip file at some point.
: What we actually put in the release looks like ocelotgui-2.3.0-1.ocelotgui.zip, so rename the .zip file at some point.


: (Dynamic linking)
Expand Down Expand Up @@ -2622,14 +2628,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 2.2.0 is at
https://github.com/ocelot-inc/ocelotgui/releases/download/2.2.0/ocelotgui_2.2.0.orig.tar.gz.
Thus release 2.3.0 is at
https://github.com/ocelot-inc/ocelotgui/releases/download/2.3.0/ocelotgui_2.3.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/2.2.0/ocelotgui_2.2.0.orig.tar.gz
wget https://github.com/ocelot-inc/ocelotgui/releases/download/2.3.0/ocelotgui_2.3.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_2.2.0.orig.tar.gz.</P>
and click ocelotgui_2.3.0.orig.tar.gz.</P>

<P>On Debian-like systems some packages must be installed first.
For example on Ubuntu:<PRE>
Expand Down Expand Up @@ -2670,8 +2676,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_2.2.0.orig.tar.gz
cd ocelotgui-2.2.0</PRE>
tar -zxvf ocelotgui_2.3.0.orig.tar.gz
cd ocelotgui-2.3.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,
Expand All @@ -2695,12 +2701,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_2.2.0-1_amd64.deb
#or sudo apt install /tmp/debian3/ocelotgui_2.2.0-1_i386.deb</PRE>
sudo apt install /tmp/debian3/ocelotgui_2.3.0-1_amd64.deb
#or sudo apt install /tmp/debian3/ocelotgui_2.3.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-2.2.0-1.x86_64.rpm
#or sudo rpm -i ~/ocelotgui_rpm//rp/rpmbuild/RPMS/x86_64/ocelotgui-2.2.0-1.i686.rpm</PRE>
sudo rpm -i ~/ocelotgui_rpm//rp/rpmbuild/RPMS/x86_64/ocelotgui-2.3.0-1.x86_64.rpm
#or sudo rpm -i ~/ocelotgui_rpm//rp/rpmbuild/RPMS/x86_64/ocelotgui-2.3.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>
Expand Down
Loading

0 comments on commit 84cbdc9

Please sign in to comment.