Skip to content

Commit

Permalink
Version 1.0.8
Browse files Browse the repository at this point in the history
  • Loading branch information
@pgulutzan
pgulutzan committed Jan 9, 2019
1 parent 60bc602 commit c023354
Show file tree
Hide file tree
Showing 22 changed files with 233 additions and 194 deletions.
30 changes: 15 additions & 15 deletions CMakeLists.txt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2014-2018 by Ocelot Computer Services Inc. All rights reserved.
# Copyright (c) 2014-2019 by Ocelot Computer Services Inc. All rights reserved.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
Expand Down Expand Up @@ -141,8 +141,8 @@

# FILENAME_EXTRA
# Default is blank. Ocelot passes -DFILENAME_EXTRA="qt4" when building with qt4,
# so the final package name will look like ocelotgui_1.0.7qt4-1_amd64.deb or
# ocelotgui-1.0.7qt4-1.x86_64.rpm. Ordinarily it should not be specified.
# so the final package name will look like ocelotgui_1.0.8qt4-1_amd64.deb or
# ocelotgui-1.0.8qt4-1.x86_64.rpm. Ordinarily it should not be specified.

# FILENAME_RELEASE
# Default is "1". This affects filenames generated by cpack. Ordinarily it doesn't need to be changed.
Expand All @@ -157,8 +157,8 @@
# make
# strip --remove-section=.comment ocelotgui
# cpack
# lintian ocelotgui_1.0.7-1_amd64.deb
# sudo dpkg -i ocelotgui_1.0.7-1_amd64.deb
# lintian ocelotgui_1.0.8-1_amd64.deb
# sudo dpkg -i ocelotgui_1.0.8-1_amd64.deb
# Todo: lintian will warn "new-package-should-close-itp-bug", which we ignore.
# Todo: lintian will warn about permissions if you are not root, which we work around by being root.
# but see also comments in rpm_build.sh and debian/README.Debian, we intend to stop using cpack
Expand All @@ -167,14 +167,14 @@
# cmake . -DCPACK_GENERATOR="RPM"
# make
# cpack
# rpmlint ocelotgui-1.0.7-1.x86_64.rpm
# rpm -i ocelotgui-1.0.7-1.x86_64.rpm
# rpmlint ocelotgui-1.0.8-1.x86_64.rpm
# rpm -i ocelotgui-1.0.8-1.x86_64.rpm
# Todo: rpmlint will warn "standard-dir-owned-by-package" for /usr/share/man and /usr/share/man/man1, which we ignore.
# Todo: rpmlint will warn "no-signature", which we ignore.
# Todo: rpmlint will warn "no-packager-tag", wich we ignore.
# but see also comments in rpm_build.sh and debian/README.Debian, we intend to stop using cpack

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

Expand Down Expand Up @@ -452,7 +452,7 @@ install(FILES ocelotgui-logo.png DESTINATION ${CMAKE_INSTALL_DATADIR}/pixmaps)
if (CPACK_GENERATOR MATCHES "DEB")
#lintian complains changelog-file-missing-in-native-package, this fixes it,
#but lintian will still complain new-package-should-close-itp-bug
#which we cannot fix until version >= 1.0.7 and someone posts an ITP bug
#which we cannot fix until version >= 1.0.9 and someone posts an ITP bug
execute_process(COMMAND cp ${CMAKE_CURRENT_SOURCE_DIR}/changelog ${CMAKE_CURRENT_SOURCE_DIR}/changelog.bak)
execute_process(COMMAND gzip -9 -f -n ${CMAKE_CURRENT_SOURCE_DIR}/changelog)
execute_process(COMMAND mv ${CMAKE_CURRENT_SOURCE_DIR}/changelog.bak ${CMAKE_CURRENT_SOURCE_DIR}/changelog)
Expand Down Expand Up @@ -497,21 +497,21 @@ if (PACKAGE_TYPE MATCHES "RPM")
endif (PACKAGE_TYPE MATCHES "RPM")


# version = 1.0.7
# version = 1.0.8
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "GUI client for MySQL or MariaDB")
set(CPACK_PACKAGE_VENDOR "Ocelot Computer Services Inc.")
set(CPACK_PACKAGE_CONTACT "Peter Gulutzan")
set(CPACK_PACKAGE_VERSION_MAJOR "1")
set(CPACK_PACKAGE_VERSION_MINOR "0")
set(CPACK_PACKAGE_VERSION_PATCH "7")
set(CPACK_PACKAGE_VERSION_PATCH "8")
# Todo: set(CPACK_PACKAGE_DESCRIPTION_FILE first-lines-of-README)
# CPACK_PACKAGE_INSTALL_DIRECTORY = default
set(CPACK_PACKAGE_ICON ocelotgui-logo.png)
# CPACK_PROJECT_CONFIG_FILE = nonexistent

# I assume nobody wants package names like ocelotgui_1.0.7-Linux.deb
# I assume nobody wants package names like ocelotgui_1.0.8-Linux.deb
# but that's what I get if CMAKE_SYSTEM_NAME = "Linux".
# I'd prefer ocelotgui_1.0.7-1_amd64.deb or ocelotgui-1.0.7.x86_64.rpm
# I'd prefer ocelotgui_1.0.8-1_amd64.deb or ocelotgui-1.0.8.x86_64.rpm
# If it's neither "DEB" nor "RPM", CPACK_PACKAGE_FILE_NAME = default.
set(FILENAME_PLATFORM_FOR_DEB "Linux")
set(FILENAME_PLATFORM_FOR_RPM "Linux")
Expand Down Expand Up @@ -554,7 +554,7 @@ if (CPACK_GENERATOR MATCHES "DEB")
# CPACK_RESOURCE_FILE_WELCOME = nonexistent
# CPACK_GENERATOR = we expect it to be specified if cpack will be used.
# CPACK_DEBIAN_PACKAGE_NAME = default = CPACK_PACKAGE_NAME = project name
# CPACK_DEBIAN_PACKAGE_VERSION = default = CPACK_PACKAGE_VERSION = 1.0.7
# CPACK_DEBIAN_PACKAGE_VERSION = default = CPACK_PACKAGE_VERSION = 1.0.8
# CPACK_DEBIAN_PACKAGE_DEPENDS = todo?
set(CPACK_DEBIAN_PACKAGE_MAINTAINER "Peter Gulutzan <pgulutzan@ocelot.ca>")
set(CPACK_DEBIAN_PACKAGE_DESCRIPTION "Ocelot GUI (ocelotgui), a database client, allows users to connect to
Expand All @@ -575,7 +575,7 @@ if (CPACK_GENERATOR MATCHES "RPM")
# Todo: For other than Mageia prefer CPACK_RPM_PACKAGE_GROUP "Applications/Databases"
#CPACK_RPM_PACKAGE_SUMMARY = default = CPACK_PACKAGE_DESCRIPTION_SUMMARY
set(CPACK_RPM_PACKAGE_NAME "ocelotgui")
#CPACK_RPM_PACKAGE_VERSION = DEFAULT = CPACK_PACKAGE_VERSION = 1.0.7
#CPACK_RPM_PACKAGE_VERSION = DEFAULT = CPACK_PACKAGE_VERSION = 1.0.8
set(CPACK_RPM_PACKAGE_RELEASE ${FILENAME_RELEASE})
set(CPACK_RPM_PACKAGE_LICENSE GPLv2)
set(CPACK_RPM_PACKAGE_GROUP "Databases")
Expand Down
72 changes: 37 additions & 35 deletions README.htm
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@

Ocelot ocelotgui

<P>Version 1.0.7</P>
<P>Version 1.0.8</P>

<P>The Ocelot GUI (ocelotgui), a database client, allows users to connect to
a MySQL or MariaDB DBMS server, enter SQL statements, and receive results.
Some of its features are: syntax highlighting, user-settable colors
and fonts for each part of the screen, result-set displays
with multi-line rows and resizable columns, and a debugger.</P>

<P>Copyright (c) 2014-2018, Ocelot Computer Services Inc.
<P>Copyright (c) 2014-2019, Ocelot Computer Services Inc.
All rights reserved.</P>

<P>For the GPL license terms see <A href="https://github.com/ocelot-inc/ocelotgui/blob/master/LICENSE.GPL">https://github.com/ocelot-inc/ocelotgui/blob/master/LICENSE.GPL</A>.</P>
Expand Down Expand Up @@ -114,27 +114,26 @@ <H3 id="getting-the-ocelotgui-executable-package">Getting the ocelotgui executab
If one of the following ocelotgui binary packages is compatible with your platform,
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, Qt4<PRE>
wget https://github.com/ocelot-inc/ocelotgui/releases/download/1.0.7/ocelotgui_1.0.7qt4-1_i386.deb
sudo dpkg -i ocelotgui_1.0.7qt4-1_i386.deb</PRE>
For 32-bit, Debian-like, Qt5<PRE>
wget https://github.com/ocelot-inc/ocelotgui/releases/download/1.0.7/ocelotgui_1.0.7-1_i386.deb
sudo dpkg -i ocelotgui_1.0.7-1_i386.deb</PRE>
For 64-bit, Debian-like, Qt4<PRE>
wget https://github.com/ocelot-inc/ocelotgui/releases/download/1.0.7/ocelotgui_1.0.7qt4-1_amd64.deb
sudo dpkg -i ocelotgui_1.0.7qt4-1_amd64.deb</PRE>
wget https://github.com/ocelot-inc/ocelotgui/releases/download/1.0.8/ocelotgui_1.0.8-1_i386.deb
sudo dpkg -i ocelotgui_1.0.8-1_i386.deb</PRE>
For 64-bit, Debian-like, Qt5<PRE>
wget https://github.com/ocelot-inc/ocelotgui/releases/download/1.0.7/ocelotgui_1.0.7-1_amd64.deb
sudo dpkg -i ocelotgui_1.0.7-1_amd64.deb</PRE>
For 64-bit, RPM-like, Qt4<PRE>
wget https://github.com/ocelot-inc/ocelotgui/releases/download/1.0.7/ocelotgui-1.0.7qt4-1.x86_64.rpm
sudo rpm -i ocelotgui-1.0.7qt4-1.x86_64.rpm</PRE>
wget https://github.com/ocelot-inc/ocelotgui/releases/download/1.0.8/ocelotgui_1.0.8-1_amd64.deb
sudo dpkg -i ocelotgui_1.0.8-1_amd64.deb</PRE>
For 64-bit, RPM-like, Qt5<PRE>
wget https://github.com/ocelot-inc/ocelotgui/releases/download/1.0.7/ocelotgui-1.0.7-1.x86_64.rpm
sudo rpm -i ocelotgui-1.0.7-1.x86_64.rpm</PRE>
wget https://github.com/ocelot-inc/ocelotgui/releases/download/1.0.8/ocelotgui-1.0.8-1.x86_64.rpm
sudo rpm -i ocelotgui-1.0.8-1.x86_64.rpm</PRE>
For 32-bit, RPM-like, Qt5<PRE>
wget https://github.com/ocelot-inc/ocelotgui/releases/download/1.0.7/ocelotgui-1.0.7-1.i686.rpm
sudo rpm -i ocelotgui-1.0.7-1.i686.rpm</PRE>
wget https://github.com/ocelot-inc/ocelotgui/releases/download/1.0.8/ocelotgui-1.0.8-1.i686.rpm
sudo rpm -i ocelotgui-1.0.8-1.i686.rpm</PRE>
For 64-bit, any Linux, Qt5<PRE>
wget https://github.com/ocelot-inc/ocelotgui/releases/download/1.0.8/ocelotgui-1.0.8.tar.gz
tar zxvf ocelotgui-1.0.8.tar.gz
ocelotgui/ocelotgui-qt5</PRE>
For 64-bit, any Linux, Qt4<PRE>
wget https://github.com/ocelot-inc/ocelotgui/releases/download/1.0.8/ocelotgui-1.0.8.tar.gz
tar zxvf ocelotgui-1.0.8.tar.gz
ocelotgui/ocelotgui-qt4</PRE>
</P>

<H3 id="starting-the-program">Starting the program</H3><HR>
Expand Down Expand Up @@ -167,9 +166,9 @@ <H2 ID="some-screenshots">Some screenshots</H2><HR>

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

<P>Version 1.0.7, August 29 2018</P>
<P>Version 1.0.8, January 8 2019</P>

<P>Copyright (c) 2014-2018 by Ocelot Computer Services Inc. All rights reserved.</P>
<P>Copyright (c) 2014-2019 by Ocelot Computer Services Inc. All rights reserved.</P>

<P>This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Expand Down Expand Up @@ -588,7 +587,7 @@ <H3 id="special-effects">Special Effects</H3><HR>
incompatible behavior change in version 5.7, which affects the
debugger. The originally recommended workaround was to say
"set global show_compatibility_56=on;". We believe we have made a
more permanent fix for this problem in ocelotgui version 1.0.7.</P>
more permanent fix for this problem in ocelotgui version 1.0.8.</P>

<P>RE: CONNECTION DIALOG. As stated earlier, if a password is necessary
to connect, it is sufficient to start ocelotgui with "--password=<i>password</i>"
Expand Down Expand Up @@ -1740,7 +1739,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.07 version is okay,
The Release 1.0.8 version is okay at the time of release,
but some things might not be up to date.
It is better to build it from source.
Download from github.com/ocelot-inc/ocelotgui.</P>
Expand Down Expand Up @@ -1910,11 +1909,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.0.7/ocelotgui-1.0.7-1.ocelotgui.zip<br>
https://github.com/ocelot-inc/ocelotgui/releases/download/1.0.8/ocelotgui-1.0.8-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.0.7-1.ocelotgui.zip c:\ocelotgui<br>
PowerShell Expand-Archive ocelotgui-1.0.8-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 @@ -2166,7 +2165,7 @@ <H4>Building ocelotgui.exe from source</H4>
copy release\ocelotgui.exe ocelotgui.exe
"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

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


: (Dynamic linking)
Expand Down Expand Up @@ -2241,14 +2240,17 @@ <H3 id="getting-and-using-the-ocelotgui-source">Appendix 5 Getting and using the
Although the release does not have the "latest" source which is
in ocelot-inc/ocelotgui, it usually is more stable.
A release file is highlighted in green
by github and is named ocelotgui-[version].tar.gz. Thus release 1.0.7 is at
https://github.com/ocelot-inc/ocelotgui/releases/download/1.0.7/ocelotgui-1.0.7.tar.gz.
by github and is named ocelotgui-[version].tar.gz.
Since version 1.0.8, 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.0.8 is at
https://github.com/ocelot-inc/ocelotgui/releases/download/1.0.8/ocelotgui_1.0.8.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.0.7/ocelotgui-1.0.7.tar.gz
wget https://github.com/ocelot-inc/ocelotgui/releases/download/1.0.8/ocelotgui_1.0.8.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.0.7.tar.gz.</P>
and click ocelotgui_1.0.8.orig.tar.gz.</P>

<P>On Debian-like systems some packages must be installed first.
For example on Ubuntu:<PRE>
Expand All @@ -2272,7 +2274,7 @@ <H3 id="getting-and-using-the-ocelotgui-source">Appendix 5 Getting and using the
urpmi libqt5-devel</PRE></P>

<P>Unpack all the source files by saying:<PRE>
tar -zxvf ocelotgui-1.0.7.tar.gz
tar -zxvf ocelotgui_1.0.8.orig.tar.gz
cd ocelotgui</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
Expand All @@ -2297,14 +2299,14 @@ <H3 id="getting-and-using-the-ocelotgui-source">Appendix 5 Getting and using the
cmake . -DCPACK_GENERATOR="DEB"
make
cpack
sudo dpkg -i ocelotgui_1.0.7-1_i386.deb
#or sudo dpkg -i ocelotgui_1.0.7-1_amd64.deb</PRE>
sudo dpkg -i ocelotgui_1.0.8-1_i386.deb
#or sudo dpkg -i ocelotgui_1.0.8-1_amd64.deb</PRE>
For RPM-like platforms say:<PRE>
cmake . -DCPACK_GENERATOR="RPM"
make
cpack
sudo rpm -i ocelotgui-1.0.7-1.x86_64.rpm
#or sudo rpm -i ocelotgui-1.0.7-1.i686.rpm</PRE>
sudo rpm -i ocelotgui-1.0.8-1.x86_64.rpm
#or sudo rpm -i ocelotgui-1.0.8-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 c023354

Please sign in to comment.