Skip to content
GitLab
Commit 962caf27 authored by Michael Meskes's avatar Michael Meskes
Browse files

Merge commit 'upstream/2.1.0' 

Conflicts:
	debian/patches/00list
parents 83d72a3c af5f5d95
Expand all Hide whitespace changes
Inline Side-by-side
CMakeLists.txt
View file @ 962caf27
......@@ -32,12 +32,12 @@ INCLUDE(TestBigEndian)
SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules")
#Project Setup
PROJECT(tora)
PROJECT(TOra)
#Set our version values
#Final version is ${VERSION} = ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}${VERSION_SUFFIX}
#where VERSION_SUFFIX is of the form "", "cvs" or "Ncvs" (N being the minor patch level)
SET (VERSION_MAJOR "2")
SET (VERSION_MINOR "0")
SET (VERSION_MINOR "1")
SET (VERSION_PATCH "0")
SET (VERSION_SUFFIX "")
SET (VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}${VERSION_SUFFIX})
......@@ -123,17 +123,26 @@ ELSE (MSVC)
ENDIF (MSVC)
#Based on our build type, setup our build options
IF(APPLE)
SET( ENV{MACOSX_DEPLOYMENT_TARGET} 10.3 )
SET( ENV{LD_PREBIND} 1 )
SET( ENV{LD_PREBIND_ALLOW_OVERLAP} 1 )
SET(CMAKE_CXX_FLAGS_DEBUG "-O2 -g3 -fno-inline-functions ${CXX_WARNINGS}")
SET(CMAKE_C_FLAGS_DEBUG "-O2 -g3 -fno-inline-functions ${CXX_WARNINGS}")
ELSE(APPLE)
SET(CMAKE_CXX_FLAGS_DEBUG "-O0 -g3 ${CXX_WARNINGS} -fstrict-aliasing")
SET(CMAKE_C_FLAGS_DEBUG "-O0 -g3 ${CXX_WARNINGS} -fstrict-aliasing")
ENDIF(APPLE)
# --- If we are on OS X copy all the embedded libraries to the app bundle
IF (APPLE AND WANT_BUNDLE)
# -------- Function to build OS X Stand Alone Bundles -----------------
function(MakeOSXBundleApp target binary_dir)
#-- Set some useful variables
SET (OSX_MAKE_STANDALONE_BUNDLE_CMAKE_SCRIPT "${binary_dir}/${target}_OSX_MakeStandAloneBundle.cmake")
SET (OSX_MAKE_STANDALONE_BUNDLE_BASH_SCRIPT "${binary_dir}/${target}_OSX_MakeStandAloneBundle.sh")
#-- Configure the cmake file and the shell script
CONFIGURE_FILE("${CMAKE_SOURCE_DIR}/osx_tools/CompleteBundle.cmake.in"
"${OSX_MAKE_STANDALONE_BUNDLE_CMAKE_SCRIPT}" @ONLY IMMEDIATE)
CONFIGURE_FILE("${CMAKE_SOURCE_DIR}/osx_tools/CreateBundle.sh.in"
"${OSX_MAKE_STANDALONE_BUNDLE_BASH_SCRIPT}" @ONLY IMMEDIATE)
#-- Create the installation code
install(SCRIPT "${OSX_MAKE_STANDALONE_BUNDLE_CMAKE_SCRIPT}")
endfunction(MakeOSXBundleApp)
MakeOSXBundleApp(TOra ${PROJECT_BINARY_DIR})
ENDIF (APPLE AND WANT_BUNDLE)
SET(CMAKE_CXX_FLAGS_RELEASE "-O2 ${CXX_WARNINGS}")
......@@ -270,6 +279,7 @@ ADD_CUSTOM_TARGET(uninstall
ADD_SUBDIRECTORY(src)
ADD_SUBDIRECTORY(doc)
IF (NOT WANT_BUNDLE)
#Install our READMEs etc.
INSTALL(FILES
AUTHORS
......@@ -291,6 +301,7 @@ INSTALL(FILES
TODO
DESTINATION ${TORA_DOC_DIR}
)
ENDIF (NOT WANT_BUNDLE)
# packaging related stuff
#SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Toolkit for Oracle")
......
INSTALL
View file @ 962caf27
......@@ -2,15 +2,15 @@ Installation Instructions
*************************
Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
2006, 2007 Free Software Foundation, Inc.
2006, 2007, 2008, 2009 Free Software Foundation, Inc.
This file is free documentation; the Free Software Foundation gives
This file is free documentation; the Free Software Foundation gives
unlimited permission to copy, distribute and modify it.
Basic Installation
==================
Briefly, the shell commands `./configure; make; make install' should
Briefly, the shell commands `./configure; make; make install' should
configure, build, and install this package. The following
more-detailed instructions are generic; see the `README' file for
instructions specific to this package.
......@@ -73,9 +73,9 @@ The simplest way to compile this package is:
Compilers and Options
=====================
Some systems require unusual options for compilation or linking that the
`configure' script does not know about. Run `./configure --help' for
details on some of the pertinent environment variables.
Some systems require unusual options for compilation or linking that
the `configure' script does not know about. Run `./configure --help'
for details on some of the pertinent environment variables.
You can give `configure' initial values for configuration parameters
by setting variables in the command line or in the environment. Here
......@@ -88,7 +88,7 @@ is an example:
Compiling For Multiple Architectures
====================================
You can compile the package for more than one kind of computer at the
You can compile the package for more than one kind of computer at the
same time, by placing the object files for each architecture in their
own directory. To do this, you can use GNU `make'. `cd' to the
directory where you want the object files and executables to go and run
......@@ -100,10 +100,24 @@ architecture at a time in the source code directory. After you have
installed the package for one architecture, use `make distclean' before
reconfiguring for another architecture.
On MacOS X 10.5 and later systems, you can create libraries and
executables that work on multiple system types--known as "fat" or
"universal" binaries--by specifying multiple `-arch' options to the
compiler but only a single `-arch' option to the preprocessor. Like
this:
./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
CPP="gcc -E" CXXCPP="g++ -E"
This is not guaranteed to produce working output in all cases, you
may have to build one architecture at a time and combine the results
using the `lipo' tool if you have problems.
Installation Names
==================
By default, `make install' installs the package's commands under
By default, `make install' installs the package's commands under
`/usr/local/bin', include files under `/usr/local/include', etc. You
can specify an installation prefix other than `/usr/local' by giving
`configure' the option `--prefix=PREFIX'.
......@@ -126,7 +140,7 @@ option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
Optional Features
=================
Some packages pay attention to `--enable-FEATURE' options to
Some packages pay attention to `--enable-FEATURE' options to
`configure', where FEATURE indicates an optional part of the package.
They may also pay attention to `--with-PACKAGE' options, where PACKAGE
is something like `gnu-as' or `x' (for the X Window System). The
......@@ -138,14 +152,46 @@ find the X include and library files automatically, but if it doesn't,
you can use the `configure' options `--x-includes=DIR' and
`--x-libraries=DIR' to specify their locations.
Particular systems
==================
On HP-UX, the default C compiler is not ANSI C compatible. If GNU
CC is not installed, it is recommended to use the following options in
order to use an ANSI C compiler:
./configure CC="cc -Ae -D_XOPEN_SOURCE=500"
and if that doesn't work, install pre-built binaries of GCC for HP-UX.
On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
parse its `<wchar.h>' header file. The option `-nodtk' can be used as
a workaround. If GNU CC is not installed, it is therefore recommended
to try
./configure CC="cc"
and if that doesn't work, try
./configure CC="cc -nodtk"
On Solaris, don't put `/usr/ucb' early in your `PATH'. This
directory contains several dysfunctional programs; working variants of
these programs are available in `/usr/bin'. So, if you need `/usr/ucb'
in your `PATH', put it _after_ `/usr/bin'.
On Haiku, software installed for all users goes in `/boot/common',
not `/usr/local'. It is recommended to use the following options:
./configure --prefix=/boot/common
Specifying the System Type
==========================
There may be some features `configure' cannot figure out automatically,
but needs to determine by the type of machine the package will run on.
Usually, assuming the package is built to be run on the _same_
architectures, `configure' can figure that out, but if it prints a
message saying it cannot guess the machine type, give it the
There may be some features `configure' cannot figure out
automatically, but needs to determine by the type of machine the package
will run on. Usually, assuming the package is built to be run on the
_same_ architectures, `configure' can figure that out, but if it prints
a message saying it cannot guess the machine type, give it the
`--build=TYPE' option. TYPE can either be a short name for the system
type, such as `sun4', or a canonical name which has the form:
......@@ -153,7 +199,8 @@ type, such as `sun4', or a canonical name which has the form:
where SYSTEM can have one of these forms:
OS KERNEL-OS
OS
KERNEL-OS
See the file `config.sub' for the possible values of each field. If
`config.sub' isn't included in this package, then this package doesn't
......@@ -171,9 +218,9 @@ eventually be run) with `--host=TYPE'.
Sharing Defaults
================
If you want to set default values for `configure' scripts to share, you
can create a site shell script called `config.site' that gives default
values for variables like `CC', `cache_file', and `prefix'.
If you want to set default values for `configure' scripts to share,
you can create a site shell script called `config.site' that gives
default values for variables like `CC', `cache_file', and `prefix'.
`configure' looks for `PREFIX/share/config.site' if it exists, then
`PREFIX/etc/config.site' if it exists. Or, you can set the
`CONFIG_SITE' environment variable to the location of the site script.
......@@ -182,7 +229,7 @@ A warning: not all `configure' scripts look for a site script.
Defining Variables
==================
Variables not defined in a site shell script can be set in the
Variables not defined in a site shell script can be set in the
environment passed to `configure'. However, some packages may run
configure again during the build, and the customized values of these
variables may be lost. In order to avoid this problem, you should set
......@@ -201,11 +248,19 @@ an Autoconf bug. Until the bug is fixed you can use this workaround:
`configure' Invocation
======================
`configure' recognizes the following options to control how it operates.
`configure' recognizes the following options to control how it
operates.
`--help'
`-h'
Print a summary of the options to `configure', and exit.
Print a summary of all of the options to `configure', and exit.
`--help=short'
`--help=recursive'
Print a summary of the options unique to this package's
`configure', and exit. The `short' variant lists options used
only in the top level, while the `recursive' variant lists options
also present in any nested packages.
`--version'
`-V'
......@@ -232,6 +287,16 @@ an Autoconf bug. Until the bug is fixed you can use this workaround:
Look for the package's source code in directory DIR. Usually
`configure' can determine that directory automatically.
`--prefix=DIR'
Use DIR as the installation prefix. *Note Installation Names::
for more details, including other options available for fine-tuning
the installation locations.
`--no-create'
`-n'
Run the configure checks, but stop before creating any output
files.
`configure' also accepts some other, not widely useful, options. Run
`configure --help' for more details.
Makefile.OSX deleted 100644 → 0
View file @ 83d72a3c
# BEGIN_COMMON_COPYRIGHT_HEADER
#
# TOra - An Oracle Toolkit for DBA's and developers
#
# Shared/mixed copyright is held throughout files in this product
#
# Portions Copyright (C) 2000-2001 Underscore AB
# Portions Copyright (C) 2003-2005 Quest Software, Inc.
# Portions Copyright (C) 2004-2008 Numerous Other Contributors
#
# 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 the Free Software Foundation; only version 2 of
# the License is valid for this program.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#
# As a special exception, you have permission to link this program
# with the Oracle Client libraries and distribute executables, as long
# as you follow the requirements of the GNU GPL in regard to all of the
# software in the executable aside from Oracle client libraries.
#
# Specifically you are not permitted to link this program with the
# Qt/UNIX, Qt/Windows or Qt Non Commercial products of TrollTech.
# And you are not permitted to distribute binaries compiled against
# these libraries.
#
# You may link this product with any GPL'd Qt library.
#
# All trademarks belong to their respective owners.
#
# END_COMMON_COPYRIGHT_HEADER
# Sample Makefile for static MacOS X builds
# Mac application directory
MAC_APP_DIR = tora.app
# Mac application contents directory
CONTENTS_DIR = $(MAC_APP_DIR)/Contents
# Mac binary location
DESTDIR = $(CONTENTS_DIR)/MacOS
# Mac resources location
RSCSDIR = $(CONTENTS_DIR)/Resources
# Directory for Qt-based help (as opposed to native MacOS help)
HELPDIR = $(RSCSDIR)/help
# Additional includes needed to compile program
INCLUDES="-I$(QTDIR)/mkspecs/macx-g++" "-I$(ORACLE_HOME)/rdbms/demo" "-I$(ORACLE_HOME)/plsql/public" "-I$(ORACLE_HOME)/rdbms/public" "-I$(ORACLE_HOME)/network/public" "-I$(QTDIR)/include"
# C++ Compiler to use
GCC="/usr/bin/g++3"
# Additional libraries to link with
LIBS_GLOB=-framework Carbon -framework QuickTime -lz -framework OpenGL -framework AGL
# Standard C++ library
STDCPP_SHARED=
# Static version of C++ library (Only needed when linking statically
STDCPP_STATIC=
# Qt library
QT_SHARED=
# Static Qt library
QT_STATIC= -lqt-mt
# Path to Qt meta compiler
MOC="$(QTDIR)/bin/moc"
# Path to Qt interface compiler
UIC="$(QTDIR)/bin/uic"
# Path to Qt translation compiler
LRELEASE="$(QTDIR)/bin/lrelease"
# Path to Qt translation update
LUPDATE="$(QTDIR)/bin/lupdate"
# Additional paths to find libraries
LFLAGS="-L$(ORACLE_HOME)/rdbms/lib" "-L$(QTDIR)/lib"
# Oracle library
ORACLE_SHARED=
# Static Oracle libraries
ORACLE_STATIC=-lclntst9
# Oracle home path
#ORACLE_HOME=
# What to compile, can be tora for plugin version, tora-mono for monolithic, tora-static for static version
TARGET=tora-static
MAC_TARGET = $(DESTDIR)/$(TARGET)
# MySQL found
MYSQL_FOUND=0
# MySQL library
MYSQL_SHARED=
# Static MySQL libraries
MYSQL_STATIC=
# Base directory of KDE installation
KDE_BASE=
# Additional defines to use while compiling, except for the normal these are available
# OTL_ORA9I - Compile for Oracle 9.x
# OTL_ORA8I - Compile for Oracle 8.1.x
# OTL_ORA8 - Compile for Oracle 8.0.x
# OTL_ORA_TIMESTAMP - Include support for timestamps
# TO_NEW_CHECK - Disable new version check globally
# TO_KDE - Compile as KDE application
DEFINES+=-DOTL_ORA9I -DOTL_ORA_TIMESTAMP -DOTL_ANSI_CPP
DEFINES+=-D_REENTRANT -DDEFAULT_PLUGIN_DIR=\"$(INSTALLLIB)/tora\"
DEFINES+=-DTOMONOLITHIC
DEFINES+=-DQT_THREAD_SUPPORT
DEFINES+=-DQT_NO_DEBUG
# Where to find perl on your system
PERL=/usr/bin/perl
# Comment out this line if you want more output from compile
.SILENT:
# Additional flags set when using only the precompiler.
CPPFLAGS_GLOB=
# Additional flags to set when linking.
LFLAGS_GLOB=-O3
# Additional flags set when compiling.
CFLAGS_GLOB=-g -O3 -W -Wall
############################################################################
#
# End of configuration part of Makefile
#
############################################################################
TITLE=TOra
API= \
tochangeconnection.h \
tobackground.h \
tobarchart.h \
toconf.h \
toconnection.h \
todefaultkeywords.h \
toeditwidget.h \
toextract.h \
tofilesize.h \
tohelp.h \
tohelpbrowser.h \
tohighlightedtext.h \
tohtml.h \
tolegendchart.h \
tolinechart.h \
tomain.h \
tomainwindow.kde.h \
tomarkedtext.2.h \
tomarkedtext.h \
tomemoeditor.h \
tonoblockquery.h \
toparamget.h \
topiechart.h \
toqvalue.h \
toreport.h \
toresult.h \
toresultbar.h \
toresultcols.h \
toresultcombo.h \
toresultconstraint.h \
toresultcontent.h \
toresultdepend.h \
toresultfield.h \
toresultindexes.h \
toresultitem.h \
toresultlabel.h \
toresultline.h \
toresultlong.h \
toresultpie.h \
toresultplan.h \
toresultreferences.h \
toresultresources.h \
toresultstats.h \
toresultview.h \
tosgastatement.h \
tosmtp.h \
tosql.h \
tosqlparse.h \
totabwidget.h \
totemplate.h \
totextview.h \
tothread.h \
totool.h \
tovisualize.h \
utils.h
SOURCES=\
toabout.cpp \
toaboutui.cpp \
toalert.cpp \
toanalyze.cpp \
tobackground.cpp \
tobackup.cpp \
tobarchart.cpp \
tobrowser.cpp \
tobrowserconstraintui.cpp \
tobrowserfilterui.cpp \
tobrowserindexui.cpp \
tobrowsertableui.cpp \
tochangeconnection.cpp \
tochartalarmui.cpp \
tochartmanager.cpp \
tochartsetupui.cpp \
toconnection.cpp \
tocurrent.cpp \
todatabasesettingui.cpp \
todebug.cpp \
todebugchangeui.cpp \
todebugtext.cpp \
todebugwatch.cpp \
toeditextensiongotoui.cpp \
toeditextensions.cpp \
toeditextensionsetupui.cpp \
toeditwidget.cpp \
toextract.cpp \
tofilesize.cpp \
toglobalsetting.cpp \
toglobalsettingui.cpp \
tohelp.cpp \
tohelpaddfileui.cpp \
tohelpsetupui.cpp \
tohighlightedtext.cpp \
tohtml.cpp \
toinvalid.cpp \
tolegendchart.cpp \
tolinechart.cpp \
tolinechartsetupui.cpp \
tomain.cpp \
tomarkedtext.cpp \
tomemoeditor.cpp \
tomessageui.cpp \
tonewconnection.cpp \
tonewconnectionui.cpp \
tonoblockquery.cpp \
tooracleconnection.cpp \
tooracleextract.cpp \
tooraclepreload.cpp \
tooraclesettingui.cpp \
tooutput.cpp \
toparamget.cpp \
topassword.cpp \
topiechart.cpp \
topreferences.cpp \
topreferencesui.cpp \
toprofiler.cpp \
toproject.cpp \
toqsqlconnection.cpp \
toreport.cpp \
toresult.cpp \
toresultbar.cpp \
toresultcols.cpp \
toresultcombo.cpp \
toresultconstraint.cpp \
toresultcontent.cpp \
toresultcontentfilterui.cpp \
toresultdepend.cpp \
toresultextract.cpp \
toresultfield.cpp \
toresultindexes.cpp \
toresultitem.cpp \
toresultlabel.cpp \
toresultline.cpp \
toresultlistformatui.cpp \
toresultlock.cpp \
toresultlong.cpp \
toresultparam.cpp \
toresultpie.cpp \
toresultplan.cpp \
toresultreferences.cpp \
toresultstats.cpp \
toresultstorage.cpp \
toresultview.cpp \
torollback.cpp \
torollbackdialogui.cpp \
toscript.cpp \
toscriptui.cpp \
tosearchreplace.cpp \
tosearchreplaceui.cpp \
tosecurity.cpp \
tosecurityquotaui.cpp \
tosecurityroleui.cpp \
tosecurityuserui.cpp \
tosession.cpp \
tosgastatement.cpp \
tosgatrace.cpp \
tosmtp.cpp \
tosql.cpp \
tosqledit.cpp \
tosqlparse.cpp \
tostorage.cpp \
tostoragedatafileui.cpp \
tostoragedefinition.cpp \
tostoragedefinitionui.cpp \
tostoragedialogui.cpp \
tostorageprefsui.cpp \
tostoragetablespaceui.cpp \
tosyntaxsetup.cpp \
tosyntaxsetupui.cpp \
totabwidget.cpp \
totemplate.cpp \
totemplateaddfileui.cpp \
totemplateeditui.cpp \
totemplateprovider.cpp \
totemplatesetupui.cpp \
totemporary.cpp \
totextview.cpp \
tothread.cpp \
totool.cpp \
totoolsettingui.cpp \
totuning.cpp \
totuningoverviewui.cpp \
totuningsettingui.cpp \
tovisualize.cpp \
towaitevents.cpp \
toworksheet.cpp \
toworksheetsetupui.cpp \
toworksheetstatistic.cpp \
utils.cpp
default: all
include $(ORACLE_HOME)/rdbms/lib/env_rdbms.mk
TRANSLATIONS=\
tora_se.ts\
tora_fr.ts\
tora_it.ts\
CPPFLAGS=$(CPPFLAGS_GLOB) $(DEFINES) $(INCLUDES)
CFLAGS=$(CFLAGS_GLOB) $(INCLUDES) $(DEFINES)
OBJECTS=$(filter %.o,$(SOURCES:%.cpp=objs/%.o))
TRANSOBJ=$(filter %.qm,$(TRANSLATIONS:%.ts=%.qm))
DEPENDS=$(filter %.d,$(SOURCES:%.cpp=.depends/%.d)) .depends/main.d
vpath %.h $(INCLUDE)
.PHONY: all clean fixmod install distclean
all: $(MAC_TARGET) lrelease
#$(OBJECTS): Makefile Makefile.common
.depends/%.d: %.cpp
@echo Making dependencies for $<
if [ ! -d .depends ] ; then mkdir -p .depends ; fi
$(GCC) -MM $(CPPFLAGS) $< > $@.tmp && \
( sed "s/^\(.*\.\)o\([ :]*\)/objs\/\1o \
$(subst /,\\/,$@)\2/g" < $@.tmp > $@ ; rm -f $@.tmp )
include $(DEPENDS)