Drop automake build support.

Add basic cmake build instructions.
Rework of the README and help files.
Delete the NEWS file.
Some cosmetics.

Signed-off-by: gregory guy <gregory-tde@laposte.net>
pull/2/head
gregory guy 4 years ago
parent 4743905f46
commit 9b0f1edee5
No known key found for this signature in database
GPG Key ID: 3BCCA0F7AB4536F4

3
.gitmodules vendored

@ -1,6 +1,3 @@
[submodule "admin"]
path = admin
url = https://system@scm.trinitydesktop.org/scm/git/tde-common-admin
[submodule "cmake"]
path = cmake
url = https://system@scm.trinitydesktop.org/scm/git/tde-common-cmake

@ -41,15 +41,15 @@ tde_setup_paths( )
##### optional stuff
option( WITH_ALL_OPTIONS "Enable all optional support" OFF )
option( WITH_ALL_OPTIONS "Enable all optional support" OFF )
option( WITH_GCC_VISIBILITY "Enable fvisibility and fvisibility-inlines-hidden" ${WITH_ALL_OPTIONS} )
##### user requested modules
option( BUILD_ALL "Build all" ON )
option( BUILD_DOC "Build documentation" ${BUILD_ALL} )
option( BUILD_TRANSLATIONS "Build translations" ${BUILD_ALL} )
option( BUILD_ALL "Build all" ON )
option( BUILD_DOC "Build documentation" ${BUILD_ALL} )
option( BUILD_TRANSLATIONS "Build translations" ${BUILD_ALL} )
##### configure checks
@ -69,7 +69,7 @@ set( CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--no-undefined"
##### directories
add_subdirectory( src )
tde_conditional_add_subdirectory( BUILD_DOC doc )
tde_conditional_add_subdirectory( BUILD_DOC doc )
tde_conditional_add_subdirectory( BUILD_TRANSLATIONS po )

@ -1,215 +1,22 @@
Kio-Sword installation
======================
In brief
========
./configure --prefix=`tde-config --prefix` && make && sudo make install
(but see note about version compatibility below)
Details
=======
To compile, you will need header files for the following
libraries, as well as the libraries themselves:
- tdelibs >= 3
- sword >= 1.5.7
After unpacking the source, change to the base directory of the
tdeio-sword distribution. You will then need to find you KDE directory
using this command if you don't know it already:
tde-config --prefix
Then type:
export TDEDIR=<your KDE dir>
./configure --prefix=<your KDE DIR>
make
Then as root (using su or sudo)
make install
Version Compatibility
=====================
If you have sword 1.5.8 or later, you will need to patch the source
due to a change in an API. The patch is provided, so you just have
to run this command before running configure etc.
patch -p0 < sword_1_5_8_fix.patch
Below are the generic installation instructions:
Basic Installation
==================
These are generic installation instructions.
The `configure' shell script attempts to guess correct values for
various system-dependent variables used during compilation. It uses
those values to create a `Makefile' in each directory of the package.
It may also create one or more `.h' files containing system-dependent
definitions. Finally, it creates a shell script `config.status' that
you can run in the future to recreate the current configuration, a file
`config.cache' that saves the results of its tests to speed up
reconfiguring, and a file `config.log' containing compiler output
(useful mainly for debugging `configure').
If you need to do unusual things to compile the package, please try
to figure out how `configure' could check whether to do them, and mail
diffs or instructions to the address given in the `README' so they can
be considered for the next release. If at some point `config.cache'
contains results you don't want to keep, you may remove or edit it.
The file `configure.in' is used to create `configure' by a program
called `autoconf'. You only need `configure.in' if you want to change
it or regenerate `configure' using a newer version of `autoconf'.
The simplest way to compile this package is:
1. `cd' to the directory containing the package's source code and type
`./configure' to configure the package for your system. If you're
using `csh' on an old version of System V, you might need to type
`sh ./configure' instead to prevent `csh' from trying to execute
`configure' itself.
Running `configure' takes a while. While running, it prints some
messages telling which features it is checking for.
2. Type `make' to compile the package.
3. Type `make install' to install the programs and any data files and
documentation.
4. You can remove the program binaries and object files from the
source code directory by typing `make clean'.
Compilers and Options
=====================
Some systems require unusual options for compilation or linking that
the `configure' script does not know about. You can give `configure'
initial values for variables by setting them in the environment. Using
a Bourne-compatible shell, you can do that on the command line like
this:
CC=c89 CFLAGS=-O2 LIBS=-lposix ./configure
Or on systems that have the `env' program, you can do it like this:
env CPPFLAGS=-I/usr/local/include LDFLAGS=-s ./configure
Compiling For Multiple Architectures
====================================
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 must use a version of `make' that
supports the `VPATH' variable, such as GNU `make'. `cd' to the
directory where you want the object files and executables to go and run
the `configure' script. `configure' automatically checks for the
source code in the directory that `configure' is in and in `..'.
If you have to use a `make' that does not supports the `VPATH'
variable, you have to compile the package for one 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.
Installation Names
==================
By default, `make install' will install the package's files in
`/usr/local/bin', `/usr/local/man', etc. You can specify an
installation prefix other than `/usr/local' by giving `configure' the
option `--prefix=PATH'.
You can specify separate installation prefixes for
architecture-specific files and architecture-independent files. If you
give `configure' the option `--exec-prefix=PATH', the package will use
PATH as the prefix for installing programs and libraries.
Documentation and other data files will still use the regular prefix.
If the package supports it, you can cause programs to be installed
with an extra prefix or suffix on their names by giving `configure' the
option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
Optional Features
=================
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
`README' should mention any `--enable-' and `--with-' options that the
package recognizes.
For packages that use the X Window System, `configure' can usually
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.
Specifying the System Type
==========================
There may be some features `configure' can not figure out
automatically, but needs to determine by the type of host the package
will run on. Usually `configure' can figure that out, but if it prints
a message saying it can not guess the host type, give it the
`--host=TYPE' option. TYPE can either be a short name for the system
type, such as `sun4', or a canonical name with three fields:
CPU-COMPANY-SYSTEM
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
need to know the host type.
If you are building compiler tools for cross-compiling, you can also
use the `--target=TYPE' option to select the type of system they will
produce code for and the `--build=TYPE' option to select the type of
system on which you are compiling the package.
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'.
`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.
A warning: not all `configure' scripts look for a site script.
Operation Controls
==================
`configure' recognizes the following options to control how it
operates.
`--cache-file=FILE'
Use and save the results of the tests in FILE instead of
`./config.cache'. Set FILE to `/dev/null' to disable caching, for
debugging `configure'.
`--help'
Print a summary of the options to `configure', and exit.
`--quiet'
`--silent'
`-q'
Do not print messages saying which checks are being made.
tdeio-sword relies on cmake to build.
`--srcdir=DIR'
Look for the package's source code in directory DIR. Usually
`configure' can determine that directory automatically.
Here are suggested default options:
`--version'
Print the version of Autoconf used to generate the `configure'
script, and exit.
-DCMAKE_INSTALL_PREFIX="/opt/trinity" \
-DCONFIG_INSTALL_DIR="/etc/trinity" \
-DSYSCONF_INSTALL_DIR="/etc/trinity" \
-DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DCMAKE_VERBOSE_MAKEFILE="ON" \
-DCMAKE_SKIP_RPATH="OFF" \
-DBUILD_ALL="ON" \
-DWITH_ALL_OPTIONS="ON"
`configure' also accepts some other, not widely useful, options.
Requirements
============
o TDE libraries (tdelibs)
o Sword >= 1.5.8

@ -1,24 +0,0 @@
SUBDIRS = $(TOPSUBDIRS)
$(top_srcdir)/configure.in: configure.in.in $(top_srcdir)/subdirs
cd $(top_srcdir) && $(MAKE) -f admin/Makefile.common configure.in ;
$(top_srcdir)/subdirs:
cd $(top_srcdir) && $(MAKE) -f admin/Makefile.common subdirs
$(top_srcdir)/acinclude.m4: $(top_srcdir)/admin/acinclude.m4.in $(top_srcdir)/admin/libtool.m4.in $(top_srcdir)/sword.m4
@cd $(top_srcdir) && cat admin/acinclude.m4.in admin/libtool.m4.in sword.m4 > acinclude.m4
MAINTAINERCLEANFILES = subdirs configure.in acinclude.m4 configure.files
package-messages:
cd $(top_srcdir) && $(MAKE) -f admin/Makefile.common package-messages
$(MAKE) -C po merge
EXTRA_DIST = admin COPYING configure.in.in debian sword_1_5_8_fix.patch
dist-hook:
cd $(top_distdir) && perl admin/am_edit -padmin
cd $(top_distdir) && $(MAKE) -f admin/Makefile.common subdirs
-rm -rf `find $(top_distdir)/admin -name .svn`
-rm -rf `find $(top_distdir)/debian -name .svn`

@ -1,10 +0,0 @@
all:
@echo "This Makefile is only for the CVS repository"
@echo "This will be deleted before making the distribution"
@echo ""
$(MAKE) -f admin/Makefile.common cvs
dist:
$(MAKE) -f admin/Makefile.common dist
.SILENT:

@ -1 +0,0 @@

@ -1,46 +1,24 @@
Kio-Sword - a lightweight frontend for the
Sword Bible project for KDE
Copyright (C) 2004-2006 Luke Plant <L.Plant.98@cantab.net>
Installation
============
See file INSTALL.
Using tdeio-sword
===============
Type 'sword:/' in a Konqueror window location bar, and
browse. Help files can be found at sword:/?help (currently
quite incomplete).
Requirements
============
o KDE 3
o Sword 1.5.7
o for compiling from source, the header files for the above
libraries are also needed.
o Sword modules installed (tdeio-sword isn't very useful
without them)
License
=======
GNU General Public License v2 or later. See file COPYING
for details.
Feedback
========
Comments, feature requests, bug reports are all welcome - please
e-mail the author (e-mail above). For bug reports,
please include:
o version of KDE
o version of Sword
o operating system
o locale information (the output of 'locale' if
available, or the contents of LANG, LC_ALL etc)
o the full error message if one was printed.
Website
=======
http://lukeplant.me.uk/kio-sword/
tdeio-Sword - a frontend for the Sword Bible project for TDE
Tdeio-Sword is a lightweight Bible study program for the TDE environment.
It allows you to view and browse Bibles and commentaries from a familiar
application - konqueror.
Tdeio-sword makes use of the ioslave protocol within TDE.
Type 'sword:/' in a Konqueror window location bar and browse.
Help files can be found at sword:/?help.
CONTRIBUTING
==============
If you wish to contribute tdeio-sword, you might do so:
- TDE Gitea Workspace (TGW) collaboration tool.
https://mirror.git.trinitydesktop.org/gitea
- TDE Weblate Translation Workspace (TWTW) collaboration tool.
https://mirror.git.trinitydesktop.org/weblate

File diff suppressed because it is too large Load Diff

12955
aclocal.m4 vendored

File diff suppressed because it is too large Load Diff

@ -1 +0,0 @@
Subproject commit 68f23556e638353e46b444d3a4863a64936bd36a

@ -1,9 +0,0 @@
#!/bin/sh
# First create all the .html files from our
# .docbook file. The KDE build process will
# then create makefiles that install these docs
cd doc/en
meinproc index.docbook
cd ../..
WANT_AUTOCONF_2_5="1" WANT_AUTOMAKE_1_6="1" make -f Makefile.cvs

@ -1,244 +0,0 @@
/* config.h.in. Generated from configure.in by autoheader. */
/* Define to 1 if you have the <Carbon/Carbon.h> header file. */
#undef HAVE_CARBON_CARBON_H
/* Define if you have the CoreAudio API */
#undef HAVE_COREAUDIO
/* Define to 1 if you have the <crt_externs.h> header file. */
#undef HAVE_CRT_EXTERNS_H
/* Defines if your system has the crypt function */
#undef HAVE_CRYPT
/* Define to 1 if you have the <dlfcn.h> header file. */
#undef HAVE_DLFCN_H
/* Define to 1 if you have the <inttypes.h> header file. */
#undef HAVE_INTTYPES_H
/* Define if you have libjpeg */
#undef HAVE_LIBJPEG
/* Define if you have libpng */
#undef HAVE_LIBPNG
/* Define if you have a working libpthread (will enable threaded code) */
#undef HAVE_LIBPTHREAD
/* Define if you have libz */
#undef HAVE_LIBZ
/* Define to 1 if you have the <memory.h> header file. */
#undef HAVE_MEMORY_H
/* Define if your system needs _NSGetEnviron to set up the environment */
#undef HAVE_NSGETENVIRON
/* Define if you have res_init */
#undef HAVE_RES_INIT
/* Define if you have the res_init prototype */
#undef HAVE_RES_INIT_PROTO
/* Define if you have a STL implementation by SGI */
#undef HAVE_SGI_STL
/* Define to 1 if you have the `snprintf' function. */
#undef HAVE_SNPRINTF
/* Define to 1 if you have the <stdint.h> header file. */
#undef HAVE_STDINT_H
/* Define to 1 if you have the <stdlib.h> header file. */
#undef HAVE_STDLIB_H
/* Define to 1 if you have the <strings.h> header file. */
#undef HAVE_STRINGS_H
/* Define to 1 if you have the <string.h> header file. */
#undef HAVE_STRING_H
/* Define if you have strlcat */
#undef HAVE_STRLCAT
/* Define if you have the strlcat prototype */
#undef HAVE_STRLCAT_PROTO
/* Define if you have strlcpy */
#undef HAVE_STRLCPY
/* Define if you have the strlcpy prototype */
#undef HAVE_STRLCPY_PROTO
/* Define to 1 if you have the <sys/bitypes.h> header file. */
#undef HAVE_SYS_BITYPES_H
/* Define to 1 if you have the <sys/stat.h> header file. */
#undef HAVE_SYS_STAT_H
/* Define to 1 if you have the <sys/types.h> header file. */
#undef HAVE_SYS_TYPES_H
/* Define to 1 if you have the <unistd.h> header file. */
#undef HAVE_UNISTD_H
/* Define to 1 if you have the `vsnprintf' function. */
#undef HAVE_VSNPRINTF
/* Suffix for lib directories */
#undef KDELIBSUFF
/* Define a safe value for MAXPATHLEN */
#undef KDEMAXPATHLEN
/* Name of package */
#undef PACKAGE
/* Define to the address where bug reports for this package should be sent. */
#undef PACKAGE_BUGREPORT
/* Define to the full name of this package. */
#undef PACKAGE_NAME
/* Define to the full name and version of this package. */
#undef PACKAGE_STRING
/* Define to the one symbol short name of this package. */
#undef PACKAGE_TARNAME
/* Define to the version of this package. */
#undef PACKAGE_VERSION
/* The size of a `char *', as computed by sizeof. */
#undef SIZEOF_CHAR_P
/* The size of a `int', as computed by sizeof. */
#undef SIZEOF_INT
/* The size of a `long', as computed by sizeof. */
#undef SIZEOF_LONG
/* The size of a `short', as computed by sizeof. */
#undef SIZEOF_SHORT
/* The size of a `size_t', as computed by sizeof. */
#undef SIZEOF_SIZE_T
/* The size of a `unsigned long', as computed by sizeof. */
#undef SIZEOF_UNSIGNED_LONG
/* Define to 1 if you have the ANSI C header files. */
#undef STDC_HEADERS
/* Version number of package */
#undef VERSION
/* Defined if compiling without arts */
#undef WITHOUT_ARTS
/* Define to 1 if your processor stores words with the most significant byte
first (like Motorola and SPARC, unlike Intel and VAX). */
#undef WORDS_BIGENDIAN
/*
* jpeg.h needs HAVE_BOOLEAN, when the system uses boolean in system
* headers and I'm too lazy to write a configure test as long as only
* unixware is related
*/
#ifdef _UNIXWARE
#define HAVE_BOOLEAN
#endif
/*
* AIX defines FD_SET in terms of bzero, but fails to include <strings.h>
* that defines bzero.
*/
#if defined(_AIX)
#include <strings.h>
#endif
#if defined(HAVE_NSGETENVIRON) && defined(HAVE_CRT_EXTERNS_H)
# include <sys/time.h>
# include <crt_externs.h>
# define environ (*_NSGetEnviron())
#endif
#if !defined(HAVE_RES_INIT_PROTO)
#ifdef __cplusplus
extern "C" {
#endif
int res_init(void);
#ifdef __cplusplus
}
#endif
#endif
#if !defined(HAVE_STRLCAT_PROTO)
#ifdef __cplusplus
extern "C" {
#endif
unsigned long strlcat(char*, const char*, unsigned long);
#ifdef __cplusplus
}
#endif
#endif
#if !defined(HAVE_STRLCPY_PROTO)
#ifdef __cplusplus
extern "C" {
#endif
unsigned long strlcpy(char*, const char*, unsigned long);
#ifdef __cplusplus
}
#endif
#endif
/*
* On HP-UX, the declaration of vsnprintf() is needed every time !
*/
#if !defined(HAVE_VSNPRINTF) || defined(hpux)
#if __STDC__
#include <stdarg.h>
#include <stdlib.h>
#else
#include <varargs.h>
#endif
#ifdef __cplusplus
extern "C"
#endif
int vsnprintf(char *str, size_t n, char const *fmt, va_list ap);
#ifdef __cplusplus
extern "C"
#endif
int snprintf(char *str, size_t n, char const *fmt, ...);
#endif
#if defined(__SVR4) && !defined(__svr4__)
#define __svr4__ 1
#endif
/* type to use in place of socklen_t if not defined */
#undef kde_socklen_t
/* type to use in place of socklen_t if not defined (deprecated, use
kde_socklen_t) */
#undef ksize_t

@ -1,2 +0,0 @@
./admin/configure.in.min
configure.in.in

@ -1,128 +0,0 @@
dnl =======================================================
dnl FILE: ./admin/configure.in.min
dnl =======================================================
dnl This file is part of the KDE libraries/packages
dnl Copyright (C) 2001 Stephan Kulow (coolo@kde.org)
dnl This file is free software; you can redistribute it and/or
dnl modify it under the terms of the GNU Library General Public
dnl License as published by the Free Software Foundation; either
dnl version 2 of the License, or (at your option) any later version.
dnl This library is distributed in the hope that it will be useful,
dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
dnl Library General Public License for more details.
dnl You should have received a copy of the GNU Library General Public License
dnl along with this library; see the file COPYING.LIB. If not, write to
dnl the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
dnl Boston, MA 02110-1301, USA.
# Original Author was Kalle@kde.org
# I lifted it in some mater. (Stephan Kulow)
# I used much code from Janos Farkas
dnl Process this file with autoconf to produce a configure script.
AC_INIT(acinclude.m4) dnl a source file from your sub dir
dnl This is so we can use kde-common
AC_CONFIG_AUX_DIR(admin)
dnl This ksh/zsh feature conflicts with `cd blah ; pwd`
unset CDPATH
dnl Checking host/target/build systems, for make, install etc.
AC_CANONICAL_SYSTEM
dnl Perform program name transformation
AC_ARG_PROGRAM
dnl Automake doc recommends to do this only here. (Janos)
AM_INIT_AUTOMAKE(tdeio_sword, 0.3) dnl searches for some needed programs
KDE_SET_PREFIX
dnl generate the config header
AM_CONFIG_HEADER(config.h) dnl at the distribution this done
dnl Checks for programs.
AC_CHECK_COMPILERS
AC_ENABLE_SHARED(yes)
AC_ENABLE_STATIC(no)
KDE_PROG_LIBTOOL
dnl for NLS support. Call them in this order!
dnl WITH_NLS is for the po files
AM_KDE_WITH_NLS
KDE_USE_TQT(3.0.0)
AC_PATH_KDE
dnl =======================================================
dnl FILE: configure.in.in
dnl =======================================================
#MIN_CONFIG(3.0.0)
dnl PACKAGE set before
AC_C_BIGENDIAN
AC_CHECK_KDEMAXPATHLEN
AC_CHECK_SWORD(1.5.7, [$ac_use_static])
AC_CONFIG_FILES([ src/data/tdeio_sword.css ])
KDE_CREATE_SUBDIRSLIST
AC_CONFIG_FILES([ Makefile ])
AC_CONFIG_FILES([ doc/Makefile ])
AC_CONFIG_FILES([ doc/en/Makefile ])
AC_CONFIG_FILES([ po/Makefile ])
AC_CONFIG_FILES([ src/Makefile ])
AC_CONFIG_FILES([ src/data/Makefile ])
AC_CONFIG_FILES([ src/pics/Makefile ])
AC_OUTPUT
# Check if KDE_SET_PREFIX was called, and --prefix was passed to configure
if test -n "$kde_libs_prefix" -a -n "$given_prefix"; then
# And if so, warn when they don't match
if test "$kde_libs_prefix" != "$given_prefix"; then
# And if kde doesn't know about the prefix yet
echo ":"`tde-config --path exe`":" | grep ":$given_prefix/bin/:" 2>&1 >/dev/null
if test $? -ne 0; then
echo ""
echo "Warning: you chose to install this package in $given_prefix,"
echo "but KDE was found in $kde_libs_prefix."
echo "For this to work, you will need to tell KDE about the new prefix, by ensuring"
echo "that TDEDIRS contains it, e.g. export TDEDIRS=$given_prefix:$kde_libs_prefix"
echo "Then restart KDE."
echo ""
fi
fi
fi
if test x$GXX = "xyes" -a x$kde_have_gcc_visibility = "xyes" -a x$kde_cv_val_qt_gcc_visibility_patched = "xno"; then
echo ""
echo "Your GCC supports symbol visibility, but the patch for Qt supporting visibility"
echo "was not included. Therefore, GCC symbol visibility support remains disabled."
echo ""
echo "For better performance, consider including the Qt visibility supporting patch"
echo "located at:"
echo ""
echo "http://bugs.kde.org/show_bug.cgi?id=109386"
echo ""
echo "and recompile all of Qt and KDE. Note, this is entirely optional and"
echo "everything will continue to work just fine without it."
echo ""
fi
if test "$all_tests" = "bad"; then
if test ! "$cache_file" = "/dev/null"; then
echo ""
echo "Please remove the file $cache_file after changing your setup"
echo "so that configure will find the changes next time."
echo ""
fi
else
echo ""
echo "Good - your configure finished. Start make now"
echo ""
fi

@ -1,9 +0,0 @@
#MIN_CONFIG(3.0.0)
AM_INIT_AUTOMAKE(tdeio_sword, 0.3)
AC_C_BIGENDIAN
AC_CHECK_KDEMAXPATHLEN
AC_CHECK_SWORD(1.5.8, [$ac_use_static])
AC_CONFIG_FILES([ src/data/tdeio_sword.css ])

@ -1,6 +0,0 @@
# the SUBDIRS is filled automatically by am_edit. If files are
# in this directory they are installed into the english dir
KDE_LANG = en
KDE_DOCS = tdeio_sword
SUBDIRS = $(AUTODIRS)

@ -1,2 +0,0 @@
KDE_DOCS = tdeio_sword
KDE_LANG = en

@ -56,7 +56,7 @@ Do NOT change these in the translation. -->
<abstract>
<para>
&tdeio_sword; is a Bible reading tool written for the &kde; environment. It is a
&tdeio_sword; is a Bible reading tool written for the TDE environment. It is a
front-end for the SWORD Bible system, and enables you to view, browse and search
your SWORD modules from the web browser (Konqueror).
</para>
@ -80,14 +80,14 @@ Do NOT change these in the translation. -->
<title>Introduction</title>
<para>
&tdeio_sword; is a Bible reading tool written for the &kde; environment. It is a
&tdeio_sword; is a Bible reading tool written for the TDE environment. It is a
front-end for the SWORD Bible system, and enables you to view, browse and search
your SWORD modules from the web browser (Konqueror). It is intended to
be a lightweight companion to programs like BibleTime (for the KDE environment)
be a lightweight companion to programs like BibleTime (for the TDE environment)
and other SWORD programs.
</para>
<para> Please report any problems or feature requests to the author.
<para> Please report any problems or feature requests to the Trinity Desktop dev team.
</para>
</chapter>
@ -197,7 +197,7 @@ Program and documentation copyright 2004-2006 Luke Plant <email>L&#46;Plant&#46;
<sect1 id="getting-tdeio_sword">
<title>How to obtain &tdeio_sword;</title>
<para>Download from <ulink url="http://lukeplant.me.uk/kio-sword/">The &tdeio_sword; home page</ulink> </para>
<para>Download from <ulink url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdeio-sword">The &tdeio_sword; home page</ulink> </para>
<!-- This first entity contains boiler plate for applications that are
part of KDE CVS. You should remove it if you are releasing your
application -->
@ -221,7 +221,7 @@ information here.
<para>The following libraries are required:</para>
<para>SWORD 1.5.8 or greater</para>
<para>KDE 3 or greater</para>
<para>TDE libraries</para>
<!-- FIXME link to getting SWORD -->
@ -229,7 +229,7 @@ information here.
or the ChangeLog file, or ... -->
<para>
You can find a list of changes at <ulink
url="http://apps.kde.org/kio_sword">http://apps.kde.org/kio_sword</ulink>.
url="https://mirror.git.trinitydesktop.org/gitea/TDE/tdeio-sword">https://mirror.git.trinitydesktop.org/gitea/TDE/tdeio-sword</ulink>.
</para>
</sect1>
@ -241,18 +241,20 @@ url="http://apps.kde.org/kio_sword">http://apps.kde.org/kio_sword</ulink>.
unpack the source code. Then type the following in the base directory
of the &kappname; distribution:</para>
<screen><prompt>%</prompt> <userinput><command>./configure</command></userinput>
<prompt>%</prompt> <userinput><command>make</command></userinput>
<prompt>%</prompt> <userinput><command>make</command> install</userinput>
<screen>
<prompt>%</prompt> <userinput><command>mkdir -p build</command></userinput>
<prompt>%</prompt> <userinput><command>cd build</command></userinput>
<prompt>%</prompt> <userinput><command>cmake ../</command></userinput>
<prompt>#</prompt> <userinput><command>make</command> install</userinput>
</screen>
<para>You will need the header files for tdelibs4 and SWORD installed on your system.</para>
<para>You will need the header files from the tdelibs library and SWORD installed on your system. Please take a look
at the INSTALL file for more cmake options.</para>
<para>You will need to be root before doing the 'make install' step.</para>
<para>Since &kappname; uses <command>autoconf</command> and
<command>automake</command> you should have no trouble compiling it. Should you
run into problems please report them to the author.</para>
<para>Since &kappname; uses <command>cmake</command> you should have no trouble compiling it. Should you
run into problems please report them to the TDE dev team.</para>
</sect1>
@ -280,4 +282,3 @@ End:
vim:tabstop=2:shiftwidth=2:expandtab
-->

@ -1 +0,0 @@
POFILES = AUTO

@ -1,23 +0,0 @@
SUBDIRS = data pics
INCLUDES = -I/usr/include/qt3 $(all_includes)
CXXFLAGS += $(USE_EXCEPTIONS)
kde_module_LTLIBRARIES = tdeio_sword.la
tdeio_sword_la_SOURCES = tdeio_sword.cpp renderer.cpp ks_osishtml.cpp ks_gbfhtml.cpp \
ks_thmlhtml.cpp utils.cpp swordutils.cpp swordoptions.cpp filter.cpp template.cpp plainhtml.cpp
tdeio_sword_la_LIBADD = $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEIO) $(LIB_SWORD)
tdeio_sword_la_LDFLAGS = -avoid-version -module $(all_libraries) $(KDE_PLUGIN)
protocol_DATA = sword.protocol
protocoldir = $(kde_servicesdir)
messages: rc.cpp
$(XGETTEXT) *.cpp -o $(podir)/tdeio_sword.pot
noinst_HEADERS = tdeio_sword.h renderer.h swordoptions.h ks_osishtml.h \
ks_gbfhtml.h ks_thmlhtml.h utils.h swordutils.h option.h filter.h template.h plainhtml.h

@ -1,4 +0,0 @@
kiosworddatadir = $(kde_datadir)/tdeio_sword
kiosworddata_DATA = tdeio_sword.css swordvertical.png
EXTRA_DIST = $(kiosworddata_DATA)

@ -1,11 +0,0 @@
KDE_ICON = tdeio_sword
EXTRA_DIST = tdeio_sword_everything.svg \
tdeio_sword_borders.xcf \
hisc-app-tdeio_sword.svgz \
hi128-app-tdeio_sword.png \
hi64-app-tdeio_sword.png \
hi48-app-tdeio_sword.png \
hi32-app-tdeio_sword.png \
hi22-app-tdeio_sword.png \
hi16-app-tdeio_sword.png

@ -1,3 +0,0 @@
doc
po
src

@ -1,228 +0,0 @@
## -*- autoconf -*-
dnl This file was created by Joachim Ansorg <joachim@ansorgs.de>
dnl It provides macros for the autoconf package to find the Sword library on your system.
dnl ----------------------------------------------------------------------
dnl Check wheter to use static linking
dnl first parameter is the required version
dnl second is whether to use static sword library
dnl ----------------------------------------------------------------------
AC_DEFUN(AC_CHECK_SWORD,
[
dnl AC_MSG_CHECKING([for a Sword installation])
dnl The option for the configure script
AC_ARG_WITH(sword-dir,
[ --with-sword-dir=DIR Path where Sword is being installed (default=/usr) ],
[
ac_sword_dir=$withval
],ac_sword_dir=/usr
)
AC_ARG_ENABLE(static-sword,
[ --enable-static-sword Link to the static Sword library],
ac_static_sword="YES",
[ ac_static_sword="$2" ]
)
dnl try to find Sword library files
AC_MSG_CHECKING([for Sword library files])
AC_REQUIRE([AC_FIND_ZLIB])
sword_multiarch="`gcc -print-multiarch 2>/dev/null`"
ac_sword_library_dirs="$ac_sword_dir/lib64 $ac_sword_dir/lib/$sword_multiarch $ac_sword_dir/lib $libdir/$sword_multiarch $libdir $libdir/sword /usr/lib64 /usr/lib/$sword_multiarch /usr/lib /usr/local/lib64 /usr/local/lib/$sword_multiarch /usr/local/lib /usr/local/lib/sword /usr/local/sword/lib"
if test "x$ac_static_sword" = "xYES"; then
SEARCH_LIBS="libsword.a";
else
SEARCH_LIBS="libsword.so libsword.so.3 libsword.so.4 libsword.a";
fi
AC_CACHE_VAL(ac_cv_sword_libdir, AC_FIND_FILE($SEARCH_LIBS, $ac_sword_library_dirs, ac_cv_sword_libdir))
if test "x$ac_cv_sword_libdir" = "xNO"; then
AC_MSG_ERROR(SWORD library not found. Try to use configure with --with-sword-dir=/your/SWORD/path!);
fi
if test "x$ac_static_sword" = "xYES"; then
LIB_SWORD="$ac_cv_sword_libdir/libsword.a";
else
LIB_SWORD="-lsword";
fi
AC_SUBST(SWORD_LIBRARY_PATH)
AC_SUBST(LIB_SWORD)
all_libraries="$all_libraries -L$ac_cv_sword_libdir"
if test "x$ac_static_sword" = "xYES"; then
MESSAGE="static library $ac_cv_sword_libdir/libsword.a";
else
MESSAGE="$ac_cv_sword_libdir";
fi
AC_MSG_RESULT([$MESSAGE])
dnl -- try to find Swords include files --
AC_MSG_CHECKING([for Sword include files])
ac_sword_include_dirs="$ac_sword_dir/include/sword $ac_sword_dir/include /usr/include/sword /usr/include /usr/local/include/sword /usr/local/include /usr/local/sword/include /usr/local/sword/include/sword"
AC_CACHE_VAL(ac_cv_sword_incdir, AC_FIND_FILE(swmgr.h, $ac_sword_include_dirs, ac_cv_sword_incdir))
if test "x$ac_cv_sword_incdir" = "xNO"; then
AC_MSG_ERROR([The Sword include file files were not found.
Please try to use configure with --with-sword-dir=/your/SWORD/path !
])
fi
SWORD_INCLUDES="-I$ac_cv_sword_incdir"
AC_SUBST(SWORD_INCLUDES)
all_includes="$all_includes -I$ac_cv_sword_incdir"
AC_MSG_RESULT([$ac_cv_sword_incdir])
dnl -- Sword version tests --
dnl First test for installed Sword version
dnl Then check if it's recent enough
AC_MSG_CHECKING([for installed Sword version])
AC_CACHE_VAL(ac_cv_installed_sword_version,
[
AC_LANG_SAVE
AC_LANG_CPLUSPLUS
ac_LD_LIBRARY_PATH_safe=$LD_LIBRARY_PATH
ac_LIBRARY_PATH="$LIBRARY_PATH"
ac_cxxflags_safe="$CXXFLAGS"
ac_ldflags_safe="$LDFLAGS"
ac_libs_safe="$LIBS"
CXXFLAGS="$CXXFLAGS -I$"
LDFLAGS="$LDFLAGS -L$ac_cv_sword_libdir"
LIBS="$LIB_SWORD -lz"
LD_LIBRARY_PATH="$ac_cv_sword_libdir"
export LD_LIBRARY_PATH
LIBRARY_PATH=
export LIBRARY_PATH
cat > conftest.$ac_ext <<EOF
#include <iostream>
#include <swversion.h>
#ifdef SWORD_NAMESPACE_START
using namespace sword;
#endif
int main(int argc, char* argv[]) {
std::cout << SWVersion::currentVersion << std::endl;
return 0;
}
EOF
ac_link='$LIBTOOL_SHELL --silent --mode=link --tag=ld ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
if AC_TRY_EVAL(ac_link) && test -s conftest; then
if test -x conftest; then
eval ac_cv_installed_sword_version=`./conftest 2>&5`
fi
else
echo "configure: failed program was:" >&AC_FD_CC
AC_MSG_ERROR([Failed to compile the test program to check the Sword version! Please have a look at config.log! Report this to the BibleTime developers!]);
cat conftest.$ac_ext >&AC_FD_CC
fi
rm -f conftest*
CXXFLAGS="$ac_cxxflags_safe"
LDFLAGS="$ac_ldflags_safe"
LIBS="$ac_libs_safe"
LD_LIBRARY_PATH="$ac_LD_LIBRARY_PATH_safe"
export LD_LIBRARY_PATH
LIBRARY_PATH="$ac_LIBRARY_PATH"
export LIBRARY_PATH
AC_LANG_RESTORE
])
AC_MSG_RESULT([$ac_cv_installed_sword_version])
dnl *** Now check if the installed version is recent enough
AC_MSG_CHECKING([whether your Sword installation is recent enough])
AC_CACHE_VAL(ac_cv_sword_recent_version,
[
AC_LANG_SAVE
AC_LANG_CPLUSPLUS
ac_LD_LIBRARY_PATH_safe=$LD_LIBRARY_PATH
ac_LIBRARY_PATH="$LIBRARY_PATH"
ac_cxxflags_safe="$CXXFLAGS"
ac_ldflags_safe="$LDFLAGS"
ac_libs_safe="$LIBS"
CXXFLAGS="$CXXFLAGS -I$"
LDFLAGS="$LDFLAGS -L$ac_cv_sword_libdir"
LIBS="$LIB_SWORD -lz"
LD_LIBRARY_PATH="$ac_cv_sword_libdir"
export LD_LIBRARY_PATH
LIBRARY_PATH=
export LIBRARY_PATH
cat > conftest.$ac_ext <<EOF
#include <iostream>
#include <swversion.h>
#ifdef SWORD_NAMESPACE_START
using namespace sword;
#endif
int main(int argc, char* argv[[]]) {
if (argc == 2) { //compare required with installed Sword version
const char* requiredVersion( argv[[1]] );
if ( (SWVersion( requiredVersion ) < SWVersion::currentVersion) || (SWVersion( requiredVersion ) == SWVersion::currentVersion) ) {
std::cout << "ok";
return -1;
}
else {
std::cout << "not-ok";
return -2; //version not recent enough
}
}
return 0;
}
EOF
ac_link='$LIBTOOL_SHELL --silent --mode=link --tag=ld ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
if AC_TRY_EVAL(ac_link) && test -s conftest; then
if test -x conftest; then
eval ac_cv_sword_recent_version=`./conftest $1 2>&5`
fi
else
echo "configure: failed program was:" >&AC_FD_CC
AC_MSG_ERROR([Failed to compile the test program to check the Sword version! Please have a look at config.log! Report this to the BibleTime developers!]);
cat conftest.$ac_ext >&AC_FD_CC
fi;
rm -f conftest*
CXXFLAGS="$ac_cxxflags_safe"
LDFLAGS="$ac_ldflags_safe"
LIBS="$ac_libs_safe"
LD_LIBRARY_PATH="$ac_LD_LIBRARY_PATH_safe"
export LD_LIBRARY_PATH
LIBRARY_PATH="$ac_LIBRARY_PATH"
export LIBRARY_PATH
AC_LANG_RESTORE
])
if test "x$ac_cv_sword_recent_version" = "xok"; then
AC_MSG_RESULT([yes]);
elif test "x$ac_cv_sword_recent_version" = "xnot-ok"; then
AC_MSG_RESULT([no]);
AC_MSG_ERROR([Your Sword installation is not recent enought! Please upgrade to version $1! Get the Sword library at www.crosswire.org.]);
else
AC_MSG_ERROR([Invalid return code of the internal Sword version test program. Please submit a bugreport!]);
fi;
])
Loading…
Cancel
Save