Commit db603662 authored by jpd_at_sfl's avatar jpd_at_sfl

Source tree cleanup. No more autotools-generated files in CVS.

Makefile.am and m4 updates for warnings and paths, README updates.
parent f1d00fb4
SFLphoned (0.7.0) / 2006-..-..
* fix: click on flashing buttons
* fix: send ringing, hangup, busy message
* fix for using call command two times in a row
* add --disable-sflphoneqt 2006-05-01
* remove libexosip2 internally, it's in debian unstable 2005-01-01
* add iax support - in development
* add account support
* remove callid string/int
* add account SIP0 (default) in sflphone-cli
* add account SIP0 (default) in sflphone-qt
* fix nat handling (use the same port that it test)
* add register/unregister in qt
* add test audio driver button
* add hold/unhold/hangup to sflphone-cli
SFLphoned (0.6.2) / 2005-11-29
* integral mono support
* libsamplerate added for macosx
SFLphoned (0.6.1) / 2005-11-26
* add speex codec (experimental)
* fix for codec handling in sdp and audiortp
* new codec class
* add portaudio missing file
(thanks to Pierre POMES)
* add samplerate and inChannel/outChannel in AudioLayer
we could use microphone in mono and speaker in stereo
SFLphoned/SFLphone (0.6) / 2005-11-04
* improve sip protocol
* can now receive text message
* accept reinvite call
* cleaning headers
* improving bash launcher script
* select audio input and output device
* installation review
SFLphoned/SFLphone (0.5a) / 2005-10-17
* sflphoned
* bug fixes
* sflphone-qt
* client/server protocol
SFLphone (0.4.1-pre2) / 2005-09-30
* rearranged utilspp use
* Bug fix when trying to use more than 6 lines.
* Now, we send a final response to reINVITEs
(thanks to Mikael Magnusson)
* We can build in different build directories.
(thanks to Mikael Magnusson)
* We actualy check if portaudio and eXosip2 libs
are installed
* zeroconf integration start
SFLphone (0.4.1-pre1) / 2005-08-11
* Use libeXosip2
* Add blink notification for voice-message
* Add scrolling text
SFLphone (0.4) / 2005-07-06
* Cleanup code
* Add autotools support
* Handle CANCEL method
* PortAudio replace OSS and ALSA devices choice
* Add PortAudioCpp to make easy use of RingBuffer object for audio callback
* Add PortAudio library to make easy sound portability
* Fix a few memory leak
* Reorganisation of SFLphone architecture
* Handle error messages on screen
* Handle "refused call"
* Notification of remote RINGING event added
* Call management updated
SFLphone (0.3) / 2005-04-05
* ALSA driver support added
* GSM audio codec support added
* Ringtones support (just ulaw format) added
* Notification incoming call added
* Apply skin feature added
* Volume control added
* Registration manually added
* Config-file in home directory changed to ".sflphone"
SFLphone (0.2) / 2005-01-18
* Lines management updated
* Blocking bug fixed
* Configuration tree, made from a config file, added for setup
* Dial tone updated
* Timer call updated
* Apply feature updated
* Non-network or request failure cases updated
SFLphone (0.1a) / 2004-12-22
* First release
......@@ -175,3 +175,4 @@
2004-12-21 The SFLPhone Team
* Version 0.1 (initial release)
Common C++ 2 1.3.20: http://sourceforge.net/projects/cplusplus/
ccRTP 1.3.5: http://sourceforge.net/projects/cplusplus/
libosip 2.2.1: http://savannah.gnu.org/projects/osip/
if you want zeroconf:
mDNSResponder87: http://developer.apple.com/darwin/projects/bonjour/
See tools/config.sh for more details
This diff is collapsed.
# Makefile.am
ACLOCAL_FLAGS = -I m4
ACLOCAL_AMFLAGS = -I m4
SUBDIRS = libs src ringtones skins
EXTRA_DIST = m4/*.m4 tools/*.sh platform/* images/*
all:
@echo "This Makefile is only for the CVS repository"
@echo "This will be deleted before making the distribution"
@echo ""
@if test ! -d admin; then \
echo "Please recheckout this module!" ;\
echo "for cvs: use checkout once and after that update again" ;\
exit 1 ;\
fi
$(MAKE) -f admin/Makefile.common cvs
......@@ -4,23 +4,25 @@ SFLphoned (0.7.0) / 2006-..-..
* fix for using call command two times in a row
* add --disable-sflphoneqt 2006-05-01
* remove libexosip2 internally, it's in debian unstable 2005-01-01
* add iax support - in development
* add account support
* remove callid string/int
* add account SIP0 (default) in sflphone-cli
* add account SIP0 (default) in sflphone-qt
* fix nat handling (use the same port that it test)
* add register/unregister in qt
* add iax support - in development
* add account support
* remove callid string/int
* add account SIP0 (default) in sflphone-cli
* add account SIP0 (default) in sflphone-qt
* fix nat handling (use the same port that it test)
* add register/unregister in qt
* add test audio driver button
* add hold/unhold/hangup to sflphone-cli
SFLphoned (0.6.2) / 2005-11-29
* integral mono support
* libsamplerate added for macosx
* integral mono support
* libsamplerate added for macosx
SFLphoned (0.6.1) / 2005-11-26
* add speex codec (experimental)
* fix for codec handling in sdp and audiortp
* new codec class
* add portaudio missing file
* add portaudio missing file
(thanks to Pierre POMES)
* add samplerate and inChannel/outChannel in AudioLayer
we could use microphone in mono and speaker in stereo
......@@ -31,7 +33,7 @@ SFLphoned/SFLphone (0.6) / 2005-11-04
* accept reinvite call
* cleaning headers
* improving bash launcher script
* select audio input and output device
* select audio input and output device
* installation review
SFLphoned/SFLphone (0.5a) / 2005-10-17
......@@ -42,13 +44,13 @@ SFLphoned/SFLphone (0.5a) / 2005-10-17
SFLphone (0.4.1-pre2) / 2005-09-30
* rearranged utilspp use
* Bug fix when trying to use more than 6 lines.
* Bug fix when trying to use more than 6 lines.
* Now, we send a final response to reINVITEs
(thanks to Mikael Magnusson)
* We can build in different build directories.
(thanks to Mikael Magnusson)
* We can build in different build directories.
(thanks to Mikael Magnusson)
* We actualy check if portaudio and eXosip2 libs
are installed
are installed
* zeroconf integration start
SFLphone (0.4.1-pre1) / 2005-08-11
......
This is SFLPhoned, release 0.7pre0cvs.
This is SFLphone, release 0.7pre0cvs.
Copyright (c) Savoir-faire Linux, Inc 2004-2006
<sflphoneteam@savoirfairelinux.com>
......@@ -17,6 +17,8 @@ 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Introduction
------------
......@@ -38,6 +40,7 @@ More information is available on the project homepage:
http://www.sflphone.org/
Getting the dependencies
------------------------
......@@ -57,26 +60,27 @@ Optional libraries:
http://developer.apple.com/darwin/projects/bonjour/
- QT: required for the graphical user interface
usually available in distribution repositories
- speex : codec for sound
- speex: codec for sound
Some of the required libraries may be downloaded from
http://www.sflphone.org/#downloads
or
http://www.sflphone.org/dev/
See tools/config.sh for details
Dependencies build instructions:
--------------------------------
If you don't use development files of your distribution and you don't want
to go on dependencies web site, you can use a custom dependencies building
script in tools/ directory.
1. Go to tools/ (cd tools)
2. Change the default configuration in config.sh (~/sflphone) is the prefix
Building the dependencies
-------------------------
If you do not use either the development packages of your distribution or the source packages made by the upstream authors of dependencies, you may want to try our custom dependencies building script in tools/ directory:
1. cd tools/
2. edit config.sh to change the default prefix (/usr/local)
3. ./download.sh
4. ./install.sh
You can also compile each dependencies, one by one:
You can also compile each dependency, one by one:
1/ For commoncpp2
./configure [option]
......@@ -94,6 +98,7 @@ You can also compile each dependencies, one by one:
make install
Preparing a CVS checkout of SFLPhone to be built
------------------------------------------------
......@@ -104,20 +109,25 @@ of SFLPhone has been tested with Automake 1.9 and Autoconf 2.59.
To do so, you may run the following script from the top directory:
./tools/autotoolize.sh
Building SFLPhone
-----------------
./configure [option]
./configure
make
make install (as root)
Using SFLPhone
--------------
If you have the sflphone 0.3 or 0.4 release, copy the file sflphonerc to sflphonedrc
If you have the sflphone 0.3 or 0.4 release, copy the file sflphonerc
to sflphonedrc:
cp ~/.sflphone/sflphonerc ~/.sflphone/sflphonedrc
If you have an older version, remove your sflphonerc file located in $HOME/.sflphone
If you have an older version, remove your sflphonerc file located in
$HOME/.sflphone
1. Install a GUI like sflphone-qt
......@@ -132,8 +142,10 @@ A user's guide will be available on:
http://www.sflphone.org/doc/
What if it does not build?
-------------------------
--------------------------
- Try using the same versions of the libraries as we do.
See http://www.sflphone.org in section Downloads.
......@@ -179,27 +191,27 @@ Run-time troubleshooting
Short description of content of source tree:
Short description of content of source tree
-------------------------------------------
- ringtones/ contains the different ringtones.
- stund/ is an implementation of the protocol STUN used when there is a NAT.
- utilspp/ allows to implement a singleton.
- src/ is the core of SFLphone. It contains the main.cpp, managerimpl.cpp files,
audio and gui directories, and files about signalisation SIP.
Later, it should be better, when IAX will be implemented, that a directory
groups these protocols.
- src/ is the core of SFLphone. It contains the main.cpp, managerimpl.cpp
files, audio and gui directories, and files about signalisation SIP. Later,
it should be better, when IAX will be implemented, that a directory groups
these protocols.
The ManagerImpl class is the intermediaire between all the layer in the tree.
- src/audio/ is the audio layer. It contains all about tones, dtmf, audiodriver,
rtp layer, audio codec ulaw, alaw and gsm.
- src/audio/ is the audio layer. It contains all about tones, dtmf,
audiodriver, rtp layer, audio codec ulaw, alaw and gsm.
- src/audio/gsm/ contains the implementation of gsm audiocodec library.
- src/audio/pacpp/ implements PortAudioCpp, a native C++ binding of
PortAudio V19.
- src/gui/ is the old directory that contains all about different user interface.
- src/gui/server is the directory that talk (tcp socket on port 3999)
to sflphone client. The slfphone client can be a console program or a graphical interface
- src/gui/ is the old directory that contains all about different user
interface.
- src/gui/server is the directory that talk (tcp socket on port 3999) to
sflphone client. The slfphone client can be a console program or a graphical
interface.
......@@ -250,6 +262,8 @@ About Savoir-Faire Linux
------------------------
Savoir-Faire Linux is a consulting company based in Montreal, Quebec.
For more information, please check out our website:
http://www.savoirfairelinux.com/
......
Starting from CVS there are a few things that need to be done before
the normal build procedure. These require autoconf and automake to
be installed.
Then run the following;
make -f Makefile.cvs
After this the normal build procedure in the README file can be
followed.
\ No newline at end of file
......@@ -17,5 +17,3 @@ From FIXME:
- sflphoned don't return a 206 on getcallstatus when one call is ringing.
- unhold should not return an error if it's not holded
#! /bin/sh
# Wrapper for compilers which do not understand `-c -o'.
scriptversion=2005-05-14.22
# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
# Written by Tom Tromey <tromey@cygnus.com>.
#
# 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; either version 2, or (at your option)
# any later version.
#
# 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
# configuration script generated by Autoconf, you may include it under
# the same distribution terms that you use for the rest of that program.
# This file is maintained in Automake, please report
# bugs to <bug-automake@gnu.org> or send patches to
# <automake-patches@gnu.org>.
case $1 in
'')
echo "$0: No command. Try \`$0 --help' for more information." 1>&2
exit 1;
;;
-h | --h*)
cat <<\EOF
Usage: compile [--help] [--version] PROGRAM [ARGS]
Wrapper for compilers which do not understand `-c -o'.
Remove `-o dest.o' from ARGS, run PROGRAM with the remaining
arguments, and rename the output as expected.
If you are trying to build a whole package this is not the
right script to run: please start by reading the file `INSTALL'.
Report bugs to <bug-automake@gnu.org>.
EOF
exit $?
;;
-v | --v*)
echo "compile $scriptversion"
exit $?
;;
esac
ofile=
cfile=
eat=
for arg
do
if test -n "$eat"; then
eat=
else
case $1 in
-o)
# configure might choose to run compile as `compile cc -o foo foo.c'.
# So we strip `-o arg' only if arg is an object.
eat=1
case $2 in
*.o | *.obj)
ofile=$2
;;
*)
set x "$@" -o "$2"
shift
;;
esac
;;
*.c)
cfile=$1
set x "$@" "$1"
shift
;;
*)
set x "$@" "$1"
shift
;;
esac
fi
shift
done
if test -z "$ofile" || test -z "$cfile"; then
# If no `-o' option was seen then we might have been invoked from a
# pattern rule where we don't need one. That is ok -- this is a
# normal compilation that the losing compiler can handle. If no
# `.c' file was seen then we are probably linking. That is also
# ok.
exec "$@"
fi
# Name of file we expect compiler to create.
cofile=`echo "$cfile" | sed -e 's|^.*/||' -e 's/\.c$/.o/'`
# Create the lock directory.
# Note: use `[/.-]' here to ensure that we don't use the same name
# that we are using for the .o file. Also, base the name on the expected
# object file name, since that is what matters with a parallel build.
lockdir=`echo "$cofile" | sed -e 's|[/.-]|_|g'`.d
while true; do
if mkdir "$lockdir" >/dev/null 2>&1; then
break
fi
sleep 1
done
# FIXME: race condition here if user kills between mkdir and trap.
trap "rmdir '$lockdir'; exit 1" 1 2 15
# Run the compile.
"$@"
ret=$?
if test -f "$cofile"; then
mv "$cofile" "$ofile"
elif test -f "${cofile}bj"; then
mv "${cofile}bj" "$ofile"
fi
rmdir "$lockdir"
exit $ret
# Local Variables:
# mode: shell-script
# sh-indentation: 2
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
# time-stamp-end: "$"
# End:
/* config.h.in. Generated from configure.ac by autoheader. */
/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP
systems. This function is required for `alloca.c' support on those systems.
*/
#undef CRAY_STACKSEG_END
/* Define to 1 if using `alloca.c'. */
#undef C_ALLOCA
/* Define to 1 if you have `alloca', as a function or macro. */
#undef HAVE_ALLOCA
/* Define to 1 if you have <alloca.h> and it should be used (not on Ultrix).
*/
#undef HAVE_ALLOCA_H
/* Define to 1 if you have the <arpa/inet.h> header file. */
#undef HAVE_ARPA_INET_H
/* Define to 1 if you have the `bzero' function. */
#undef HAVE_BZERO
/* Define to 1 if your system has a working `chown' function. */
#undef HAVE_CHOWN
/* Define to 1 if you have the <dlfcn.h> header file. */
#undef HAVE_DLFCN_H
/* Define if dns-sd is available */
#undef HAVE_DNSSD
/* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */
#undef HAVE_DOPRNT
/* Define to 1 if you have the <fcntl.h> header file. */
#undef HAVE_FCNTL_H
/* Define to 1 if you have the `floor' function. */
#undef HAVE_FLOOR
/* Define to 1 if you have the `fork' function. */
#undef HAVE_FORK
/* Define to 1 if you have the `gethostbyname' function. */
#undef HAVE_GETHOSTBYNAME
/* Define to 1 if you have the `gethrtime' function. */
#undef HAVE_GETHRTIME
/* Define to 1 if you have the `gettimeofday' function. */
#undef HAVE_GETTIMEOFDAY
/* Define to 1 if you have the `inet_ntoa' function. */
#undef HAVE_INET_NTOA
/* Define to 1 if you have the <inttypes.h> header file. */
#undef HAVE_INTTYPES_H
/* Define to 1 if you have the `eXosip2' library (-leXosip2). */
#undef HAVE_LIBEXOSIP2
/* Define to 1 if you have the <libintl.h> header file. */
#undef HAVE_LIBINTL_H
/* Define to 1 if you have the `osipparser2' library (-losipparser2). */
#undef HAVE_LIBOSIPPARSER2
/* Define to 1 if you have the `pthread' library (-lpthread). */
#undef HAVE_LIBPTHREAD
/* Define to 1 if you have a fully functional readline library. */
#undef HAVE_LIBREADLINE
/* Define to 1 if you have the <limits.h> header file. */
#undef HAVE_LIMITS_H
/* Define to 1 if your system has a GNU libc compatible `malloc' function, and
to 0 otherwise. */
#undef HAVE_MALLOC
/* Define to 1 if you have the <malloc.h> header file. */
#undef HAVE_MALLOC_H
/* Define to 1 if you have the <memory.h> header file. */
#undef HAVE_MEMORY_H
/* Define to 1 if you have the `memset' function. */
#undef HAVE_MEMSET
/* Define to 1 if you have the `mkdir' function. */
#undef HAVE_MKDIR
/* Define to 1 if you have the <netdb.h> header file. */
#undef HAVE_NETDB_H
/* Define to 1 if you have the <netinet/in.h> header file. */
#undef HAVE_NETINET_IN_H
/* Define to 1 if you have the `pathconf' function. */
#undef HAVE_PATHCONF
/* Define to 1 if you have the `pow' function. */
#undef HAVE_POW
/* Define if you have POSIX threads libraries and header files. */
#undef HAVE_PTHREAD
/* Define to 1 if the system has the type `ptrdiff_t'. */
#undef HAVE_PTRDIFF_T
/* Define to 1 if your system has a GNU libc compatible `realloc' function,
and to 0 otherwise. */
#undef HAVE_REALLOC
/* Define to 1 if you have the `regcomp' function. */
#undef HAVE_REGCOMP
/* Define to 1 if you have the `select' function. */
#undef HAVE_SELECT
/* Define to 1 if you have the `setlocale' function. */
#undef HAVE_SETLOCALE
/* Define to 1 if you have the `socket' function. */
#undef HAVE_SOCKET
/* Define to 1 if `stat' has the bug that it succeeds when given the
zero-length file name argument. */
#undef HAVE_STAT_EMPTY_STRING_BUG
/* Define to 1 if stdbool.h conforms to C99. */
#undef HAVE_STDBOOL_H
/* 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 `strchr' function. */
#undef HAVE_STRCHR
/* Define to 1 if you have the `strdup' function. */
#undef HAVE_STRDUP
/* Define to 1 if you have the `strerror' function. */
#undef HAVE_STRERROR
/* 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 to 1 if you have the `strrchr' function. */
#undef HAVE_STRRCHR
/* Define to 1 if you have the `strstr' function. */
#undef HAVE_STRSTR
/* Define to 1 if you have the `strtol' function. */
#undef HAVE_STRTOL
/* Define to 1 if you have the <sys/ioctl.h> header file. */
#undef HAVE_SYS_IOCTL_H
/* Define to 1 if you have the <sys/select.h> header file. */
#undef HAVE_SYS_SELECT_H
/* Define to 1 if you have the <sys/socket.h> header file. */
#undef HAVE_SYS_SOCKET_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/time.h> header file. */
#undef HAVE_SYS_TIME_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 `utime' function. */
#undef HAVE_UTIME
/* Define to 1 if you have the <utime.h> header file. */
#undef HAVE_UTIME_H
/* Define to 1 if `utime(file, NULL)' sets file's timestamp to the present. */
#undef HAVE_UTIME_NULL
/* Define to 1 if you have the `vfork' function. */
#undef HAVE_VFORK
/* Define to 1 if you have the <vfork.h> header file. */
#undef HAVE_VFORK_H
/* Define to 1 if you have the `vprintf' function. */
#undef HAVE_VPRINTF
/* Define to 1 if `fork' works. */
#undef HAVE_WORKING_FORK
/* Define to 1 if `vfork' works. */
#undef HAVE_WORKING_VFORK
/* Define to 1 if the system has the type `_Bool'. */
#undef HAVE__BOOL
/* Define to 1 if `lstat' dereferences a symlink specified with a trailing
slash. */
#undef LSTAT_FOLLOWS_SLASHED_SYMLINK
/* 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
/* Define to the necessary symbol if this constant uses a non-standard name on
your system. */
#undef PTHREAD_CREATE_JOINABLE
/* Define as the return type of signal handlers (`int' or `void'). */
#undef RETSIGTYPE
/* Define to the type of arg 1 for `select'. */
#undef SELECT_TYPE_ARG1
/* Define to the type of args 2, 3 and 4 for `select'. */
#undef SELECT_TYPE_ARG234
/* Define to the type of arg 5 for `select'. */
#undef SELECT_TYPE_ARG5
/* The size of `int', as computed by sizeof. */
#undef SIZEOF_INT
/* The size of `long', as computed by sizeof. */
#undef SIZEOF_LONG
/* The size of `short', as computed by sizeof. */
#undef SIZEOF_SHORT
/* If using the C implementation of alloca, define if you know the
direction of stack growth for your system; otherwise it will be
automatically deduced at runtime.
STACK_DIRECTION > 0 => grows toward higher addresses
STACK_DIRECTION < 0 => grows toward lower addresses
STACK_DIRECTION = 0 => direction of growth unknown */
#undef STACK_DIRECTION
/* Define to 1 if the `S_IS*' macros in <sys/stat.h> do not work properly. */
#undef STAT_MACROS_BROKEN
/* Define to 1 if you have the ANSI C header files. */
#undef STDC_HEADERS
/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
#undef TIME_WITH_SYS_TIME