retronetworking
/
capisuite
13
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* scripts/cs_helpers.pyin: Changed sfftotiff to be defined 

depending on @sfftobmp_major_version@ during runtime. This
  switch is made based by a compiletime substitution of
  sfftobmp_major_version. This change avoids problems which the
  old substitution may have cause ('#3' is an extremly short
  replacement pattern).


git-svn-id: https://svn.ibp.de/svn/capisuite/trunk/capisuite@384 4ebea2bb-67d4-0310-8558-a5799e421b66
This commit is contained in:
htgoebel 2004-12-30 17:44:01 +00:00
parent 57689cd512
commit 0ec7378e77
3 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -1,3 +1,13 @@
2004-12-30 Hartmut Goebel <h.goebel@crazy-compilers.com>
* scripts/cs_helpers.pyin: Changed sfftotiff to be defined
depending on @sfftobmp_major_version@ during runtime. This
switch is made based by a compiletime substitution of
sfftobmp_major_version. This change avoids problems which the
old substitution may have cause ('#3' is an extremly short
replacement pattern).
* scripts/Makefile.am (.pyin.py): Likewise. Remove old
substitutions.
2004-11-28 Gernot Hillier <gernot@hillier.de>
* docs/manual.docbook: update to new features of 0.4.5, mention the
mISDN project, mention other binary packages besides SUSE/Debian,

10
scripts/Makefile.am
View File

@ -13,18 +13,12 @@ SUBDIRS = waves
capisuitefax: capisuitefax.in
rm -f $@
sed -e 's,@\PYTHON@,$(PYTHON),g' $< >$@
sed 's,@\PYTHON@,$(PYTHON),g' $< >$@
chmod 755 $@
.pyin.py:
rm -f $@
if test $(sfftobmp_major_version) = "2"; then \
sed -e 's,@\pkgsysconfdir@,$(pkgsysconfdir),g' \
-e 's,#2 ,,g' $< >$@ ;\
else \
sed -e 's,@\pkgsysconfdir@,$(pkgsysconfdir),g' \
-e 's,#3 ,,g' $< >$@ ;\
fi
sed 's,@sfftobmp_major_version@,$(sfftobmp_major_version),g' $< >$@
.confin.conf:
rm -f $@

16
scripts/cs_helpers.pyin
View File

@ -16,15 +16,13 @@ from capisuite.voice import sayNumber, getAudio
# Convert sff files to tiff files. This is placed in an extra function
# because the sfftobmp tool used for this conversion has changed its
# parameters recently. So this function can be changed to fit your needs.
# Normally, the make environment of CapiSuite should do this automatically
# but if you change your sfftobmp version after building CapiSuite you have
# to adapt this manually.
def sff2tif(infile, outfile):
# for sfftobmp 2.x: remove the "#2" characters of the following line
#2 __call('sff to tif', "sfftobmp", "-tif", infile, outfile)
# for sfftobmp 3.x: remove the "#3" characters of the following line
#3 __call('sff to tif', "sfftobmp", "-tif", infile, "-o", outfile)
# parameters recently.
if @sfftobmp_major_version@ <= 2:
def sff2tif(infile, outfile):
__call('sff to tif', "sfftobmp", "-tif", infile, outfile)
else:
def sff2tif(infile, outfile):
__call('sff to tif', "sfftobmp", "-tif", infile, "-o", outfile)
# Note: readConfig is now imported from capisuite.config