- beautify Hartmut's changes from 2004-12-30 to make script code more

understandable after auto-replacement
- fix sed statement in Makefile



git-svn-id: https://svn.ibp.de/svn/capisuite/trunk/capisuite@389 4ebea2bb-67d4-0310-8558-a5799e421b66
This commit is contained in:
gernot 2005-01-06 22:56:20 +00:00
parent 57a9865dde
commit 91a1ab141c
4 changed files with 10 additions and 4 deletions

View File

@ -1,3 +1,8 @@
2005-01-06 Gernot Hillier <gernot@hillier.de>
* scripts/cs_helpers.pyin: beautify Hartmut's changes from 2004-12-30
to make script code more understandable after auto-replacement
* scripts/Makefile.in: fix sed statement
2005-01-02 Hartmut Goebel <h.goebel@crazy-compilers.com>
* SConstruct: enhanced for supporting SCons 0.96's 'toolpath'
feature

View File

@ -18,7 +18,7 @@ capisuitefax: capisuitefax.in
.pyin.py:
rm -f $@
sed 's,@sfftobmp_major_version@,$(sfftobmp_major_version),g' $< >$@
sed 's,@sfftobmp_major_version\@,$(sfftobmp_major_version),g' $< >$@
.confin.conf:
rm -f $@

View File

@ -552,12 +552,12 @@ uninstall-info: uninstall-info-recursive
capisuitefax: capisuitefax.in
rm -f $@
sed -e 's,@\PYTHON@,$(PYTHON),g' $< >$@
sed 's,@\PYTHON@,$(PYTHON),g' $< >$@
chmod 755 $@
.pyin.py:
rm -f $@
sed 's,@sfftobmp_major_version@,$(sfftobmp_major_version),g' $< >$@
sed 's,@sfftobmp_major_version\@,$(sfftobmp_major_version),g' $< >$@
.confin.conf:
rm -f $@

View File

@ -17,7 +17,8 @@ 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.
if @sfftobmp_major_version@ <= 2:
sfftobmp_major_version = @sfftobmp_major_version@
if sfftobmp_major_version <= 2:
def sff2tif(infile, outfile):
__call('sff to tif', "sfftobmp", "-tif", infile, outfile)
else: