Skip to content

Commit

Permalink
Version 1.0.2
Browse files Browse the repository at this point in the history
  • Loading branch information
@pgulutzan
pgulutzan committed Aug 15, 2016
1 parent 0151d0b commit 68afabb
Show file tree
Hide file tree
Showing 10 changed files with 174 additions and 168 deletions.
28 changes: 14 additions & 14 deletions CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,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.1qt4-1_amd64.deb or
# ocelotgui-1.0.1qt4-1.x86_64.rpm. Ordinarily it should not be specified.
# so the final package name will look like ocelotgui-1.0.2qt4-1_amd64.deb or
# ocelotgui-1.0.2qt4-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 @@ -105,24 +105,24 @@
# cmake . -DCPACK_GENERATOR="DEB"
# make
# cpack
# lintian ocelotgui-1.0.1-1_amd64.deb
# sudo dpkg -i ocelotgui-1.0.1-1_amd64.deb
# lintian ocelotgui-1.0.2-1_amd64.deb
# sudo dpkg -i ocelotgui-1.0.2-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.

# e.g. to generate .rpm file and install with rpm:
# cmake . -DCPACK_GENERATOR="RPM"
# make
# cpack
# rpmlint ocelotgui-1.0.1-1.x86_64.rpm
# rpm -i ocelotgui-1.0.1-1.x86_64.rpm
# rpmlint ocelotgui-1.0.2-1.x86_64.rpm
# rpm -i ocelotgui-1.0.2-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.

# Todo: allow user to pass -DCMAKE_INSTALL_RPATH

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

Expand Down Expand Up @@ -295,7 +295,7 @@ endif (CPACK_GENERATOR MATCHES "RPM")
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.1 and someone posts an ITP bug
#which we cannot fix until version >= 1.0.2 and someone posts an ITP bug
execute_process(COMMAND cp changelog changelog.bak)
execute_process(COMMAND gzip -9 -f -n changelog)
execute_process(COMMAND mv changelog.bak changelog)
Expand All @@ -322,21 +322,21 @@ if (CPACK_GENERATOR MATCHES "RPM")
install(FILES ocelotgui.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1)
endif (CPACK_GENERATOR MATCHES "RPM")

# version = 1.0.1
# version = 1.0.2
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 "1")
set(CPACK_PACKAGE_VERSION_PATCH "2")
# 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.1-Linux.deb
# I assume nobody wants package names like ocelotgui-1.0.2-Linux.deb
# but that's what I get if CMAKE_SYSTEM_NAME = "Linux".
# I'd prefer ocelotgui-1.0.1-1_amd64.deb or ocelotgui-1.0.1.x86_64.rpm
# I'd prefer ocelotgui-1.0.2-1_amd64.deb or ocelotgui-1.0.2.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 @@ -376,7 +376,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.1
# CPACK_DEBIAN_PACKAGE_VERSION = default = CPACK_PACKAGE_VERSION = 1.0.2
# CPACK_DEBIAN_PACKAGE_DEPENDS = todo?
set(CPACK_DEBIAN_PACKAGE_MAINTAINER "Peter Gulutzan <[email protected]>")
set(CPACK_DEBIAN_PACKAGE_DESCRIPTION "Ocelot GUI (ocelotgui), a database client, allows users to connect to
Expand All @@ -397,7 +397,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.1
#CPACK_RPM_PACKAGE_VERSION = DEFAULT = CPACK_PACKAGE_VERSION = 1.0.2
set(CPACK_RPM_PACKAGE_RELEASE ${FILENAME_RELEASE})
set(CPACK_RPM_PACKAGE_LICENSE GPLv2)
set(CPACK_RPM_PACKAGE_GROUP "Databases")
Expand Down
90 changes: 44 additions & 46 deletions README.htm
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

Ocelot ocelotgui

<P>Version 1.0.1</P>
<P>Version 1.0.2</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.
Expand Down Expand Up @@ -104,26 +104,26 @@ <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, Qt4<PRE>
wget https://github.com/ocelot-inc/ocelotgui/releases/download/1.0.1/ocelotgui_1.0.1qt4-1_i386.deb
sudo dpkg -i ocelotgui_1.0.1qt4-1_i386.deb</PRE>
wget https://github.com/ocelot-inc/ocelotgui/releases/download/1.0.2/ocelotgui_1.0.2qt4-1_i386.deb
sudo dpkg -i ocelotgui_1.0.2qt4-1_i386.deb</PRE>
For 32-bit, Debian-like, Qt5<PRE>
wget https://github.com/ocelot-inc/ocelotgui/releases/download/1.0.1/ocelotgui_1.0.1-1_i386.deb
sudo dpkg -i ocelotgui_1.0.1-1_i386.deb</PRE>
wget https://github.com/ocelot-inc/ocelotgui/releases/download/1.0.2/ocelotgui_1.0.2-1_i386.deb
sudo dpkg -i ocelotgui_1.0.2-1_i386.deb</PRE>
For 64-bit, Debian-like, Qt4<PRE>
wget https://github.com/ocelot-inc/ocelotgui/releases/download/1.0.1/ocelotgui_1.0.1qt4-1_amd64.deb
sudo dpkg -i ocelotgui_1.0.1qt4-1_amd64.deb</PRE>
wget https://github.com/ocelot-inc/ocelotgui/releases/download/1.0.2/ocelotgui_1.0.2qt4-1_amd64.deb
sudo dpkg -i ocelotgui_1.0.2qt4-1_amd64.deb</PRE>
For 64-bit, Debian-like, Qt5<PRE>
wget https://github.com/ocelot-inc/ocelotgui/releases/download/1.0.1/ocelotgui_1.0.1-1_amd64.deb
sudo dpkg -i ocelotgui_1.0.1-1_amd64.deb</PRE>
wget https://github.com/ocelot-inc/ocelotgui/releases/download/1.0.2/ocelotgui_1.0.2-1_amd64.deb
sudo dpkg -i ocelotgui_1.0.2-1_amd64.deb</PRE>
For 64-bit, RPM-like, Qt4<PRE>
wget https://github.com/ocelot-inc/ocelotgui/releases/download/1.0.1/ocelotgui-1.0.1qt4-1.x86_64.rpm
sudo rpm -i ocelotgui-1.0.1qt4-1.x86_64.rpm</PRE>
wget https://github.com/ocelot-inc/ocelotgui/releases/download/1.0.2/ocelotgui-1.0.2qt4-1.x86_64.rpm
sudo rpm -i ocelotgui-1.0.2qt4-1.x86_64.rpm</PRE>
For 64-bit, RPM-like, Qt5<PRE>
wget https://github.com/ocelot-inc/ocelotgui/releases/download/1.0.1/ocelotgui-1.0.1-1.x86_64.rpm
sudo rpm -i ocelotgui-1.0.1-1.x86_64.rpm</PRE>
wget https://github.com/ocelot-inc/ocelotgui/releases/download/1.0.2/ocelotgui-1.0.2-1.x86_64.rpm
sudo rpm -i ocelotgui-1.0.2-1.x86_64.rpm</PRE>
For 32-bit, RPM-like, Qt4<PRE>
wget https://github.com/ocelot-inc/ocelotgui/releases/download/1.0.1/ocelotgui-1.0.1qt4-1.i686.rpm
sudo rpm -i ocelotgui-1.0.1qt4-1.i686.rpm</PRE>
wget https://github.com/ocelot-inc/ocelotgui/releases/download/1.0.2/ocelotgui-1.0.2qt4-1.i686.rpm
sudo rpm -i ocelotgui-1.0.2qt4-1.i686.rpm</PRE>
</P>

<H3 id="getting-and-using-the-ocelotgui-source">Getting and using the ocelotgui source</H3><HR>
Expand Down Expand Up @@ -151,14 +151,14 @@ <H3 id="getting-and-using-the-ocelotgui-source">Getting and using the ocelotgui
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.1 is at
https://github.com/ocelotgui/releases/download/1.0.1/ocelotgui-1.0.1.tar.gz.
by github and is named ocelotgui-[version].tar.gz. Thus release 1.0.2 is at
https://github.com/ocelotgui/releases/download/1.0.2/ocelotgui-1.0.2.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.1/ocelotgui-1.0.1.tar.gz
wget https://github.com/ocelot-inc/ocelotgui/releases/download/1.0.2/ocelotgui-1.0.2.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.1.tar.gz.</P>
and click ocelotgui-1.0.2.tar.gz.</P>

<P>A tip for SUSE 42.1: do the following install instructions in advance.
If the packages alread exist, then there will be harmless error messages.<BR>
Expand All @@ -173,7 +173,7 @@ <H3 id="getting-and-using-the-ocelotgui-source">Getting and using the ocelotgui
sudo apt-get install qt5-default qtbase5-dev qt5-qmake qtbase5-dev-tools</PRE></P>

<P>Unpack all the source files by saying:<PRE>
tar -zxvf ocelotgui-1.0.1.tar.gz
tar -zxvf ocelotgui-1.0.2.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 @@ -198,14 +198,14 @@ <H3 id="getting-and-using-the-ocelotgui-source">Getting and using the ocelotgui
cmake . -DCPACK_GENERATOR="DEB"
make
cpack
sudo dpkg -i ocelotgui_1.0.1-1_i386.deb
#or sudo dpkg -i ocelotgui_1.0.1-1_amd64.deb</PRE>
sudo dpkg -i ocelotgui_1.0.2-1_i386.deb
#or sudo dpkg -i ocelotgui_1.0.2-1_amd64.deb</PRE>
For RPM-like platforms say:<PRE>
cmake . -DCPACK_GENERATOR="RPM"
make
cpack
sudo rpm -i ocelotgui-1.0.1-1.x86_64.rpm
#or sudo rpm -i ocelotgui-1.0.1-1.i686.rpm</PRE>
sudo rpm -i ocelotgui-1.0.2-1.x86_64.rpm
#or sudo rpm -i ocelotgui-1.0.2-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.
For additional cmake options see the comments in CMakeLists.txt.
Expand Down Expand Up @@ -270,7 +270,7 @@ <H2 ID="some-screenshots">Some screenshots</H2><HR>

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

<P>Version 1.0.1, July 1 2016</P>
<P>Version 1.0.2, August 15 2016</P>

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

Expand Down Expand Up @@ -324,18 +324,9 @@ <H3 id="downloading-installing-and-building">Downloading, installing, and buildi
Instructions for installation will be in the README.md file.
This location may change, or alternate locations may appear.
If so there will either be an announcement on github or on ocelot.ca.</P>

<P>The package contains source code, and
two executable files, one for use with Qt version 4 and the
other for use with Qt version 5.
The executables are built dynamically.
They look for pre-installed copies of Qt libraries and of the
MySQL client library -- see the README.md file about these.
The executables were built with Ubuntu 12.04 and may not work
well on other Linux distros -- if that is the case, consult
the README.md and the source code to see how to build from
source.</P>


<P>The package contains source code and an executable file named ocelotgui.</P>

<H3 id="starting">Starting</H3><HR>

<P>
Expand Down Expand Up @@ -418,7 +409,7 @@ <H3 id="statement-widget">Statement widget</H3><HR>
and -- since the parsing method is predictive -- there will be
continuous hints about what word is expected next, and
optionally an error message explaining suspected syntax problems
before they to to the server.</P>
before they go to the server.</P>

<P>Once a statement has been entered and is ready to be executed,
the user can hit control-E, choose menu item Run|Execute, or
Expand Down Expand Up @@ -684,7 +675,7 @@ <H3 id="special-effects">Special Effects</H3><HR>
<P>RE: FONT. By default, ocelotgui uses whatever font was in use
at the time it started. This may be a bad choice. We strongly
recommend switching to a fixed-pitch (mono) font, especially for
the result-set displays, otherwise screen space is wasted.</P>
the Grid widget, otherwise screen space is wasted.</P>

<P>RE: PERMANENT CUSTOMIZING. Changes to settings can be done
with the Settings menu items, but such changes are not permanent.
Expand All @@ -695,10 +686,9 @@ <H3 id="special-effects">Special Effects</H3><HR>

<P>RE: DEBUGGING WITH MYSQL 5.7. Oracle has made a significant
incompatible behavior change in version 5.7, which affects the
debugger. The current workaround is to say
"set global show_compatibility_56=on;". We expect to have a
more permanent fix for this problem in a forthcoming ocelotgui
version.</P>
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.2.</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 All @@ -713,14 +703,22 @@ <H3 id="special-effects">Special Effects</H3><HR>
SELECT 'row_number() over ()' as r, table_name.* FROM table_name;<br>
To disable this feature, start ocelotgui with --ocelot_client_side_functions=0.</P>

<P>RE: HOVERING. Use the mouse to hover over a word in the
statement widget, and Ocelot will display what kind of word
it is, for example "table identifier".</P>

<H3 id="contact">Contact</H3><HR>

<P>We need feedback!</P>

<P>Send bug reports and feature requests to
<A HREF="https://github.com/ocelot-inc/ocelotgui/issues">https://github.com/ocelot-inc/ocelotgui/issues</A>.
<P>Registered github users can simply go to
<A HREF="https://github.com/ocelot-inc/ocelotgui">https://github.com/ocelot-inc/ocelotgui</A>
and click the "Star" button.</P>

<P>Send bug reports and feature requests to
<A HREF="https://github.com/ocelot-inc/ocelotgui/issues">https://github.com/ocelot-inc/ocelotgui/issues</A>.
Or send a private note to pgulutzan at ocelot.ca.</P>

<P>There may be announcements from time to time on Ocelot's
web page (ocelot.ca) or on the employee blog (<A HREF="http://ocelot.ca/blog">http://ocelot.ca/blog</A>).</P>

Expand Down
Loading

0 comments on commit 68afabb

Please sign in to comment.