Changeset 77494e7


Ignore:
Timestamp:
Dec 12, 2004, 1:25:19 AM (19 years ago)
Author:
Paul Brossier <piem@altern.org>
Branches:
feature/autosink, feature/cnn, feature/cnn_org, feature/constantq, feature/crepe, feature/crepe_org, feature/pitchshift, feature/pydocstrings, feature/timestretch, fix/ffmpeg5, master, pitchshift, sampler, timestretch, yinfft+
Children:
e6d4ccb
Parents:
205da86
Message:

bumping to 0.1.8

Files:
14 edited

Legend:

Unmodified
Added
Removed
  • ChangeLog

    r205da86 r77494e7  
     12004-12-11  Paul Brossier <piem@altern,org>
     2        * swig/Makefile.am: instructions moved to python/aubio and cleaned
     3        * python/aubiocut: corrected slicing on multichannel files
     4        * VERSION: bumped to 0.1.8
     5
    162004-12-06  Paul Brossier <piem@altern.org>
    27        * examples/{midi*,testforclam}.c: removed
     8        * src/{sndfile,midi*,jackio}.[ch]: moved to ext
    39
    4102004-12-03  Paul Brossier <piem@altern.org>
     
    17232004-10-28  Paul Brossier <piem@altern.org>
    1824        * src/Makefile.am: added config.h installation
     25        * VERSION: 0.1.7.1
    1926
    20272004-10-26  Paul Brossier <piem@altern.org>:
  • VERSION

    r205da86 r77494e7  
    11AUBIO_MAJOR_VERSION=0
    22AUBIO_MINOR_VERSION=1
    3 AUBIO_PATCH_VERSION=7
    4 AUBIO_VERSION_STATUS=.2
     3AUBIO_PATCH_VERSION=8
     4AUBIO_VERSION_STATUS=
    55
  • doc/Makefile.am

    r205da86 r77494e7  
    66
    77man_MANS = aubionotes.1 aubioonset.1
     8CLEANFILES = $(man_MANS)
    89#docbook_docs = aubio-devdoc.xml
    910#DOCBOOK_STYLESHEET ?= http://docbook.sourceforge.net/release/xsl/current/html/chunk.xsl
  • doc/Makefile.in

    r205da86 r77494e7  
    161161
    162162man_MANS = aubionotes.1 aubioonset.1
     163CLEANFILES = $(man_MANS)
    163164subdir = doc
    164165ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
     
    297298
    298299clean-generic:
     300        -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
    299301
    300302distclean-generic:
  • ext/Makefile.am

    r205da86 r77494e7  
    1 EXTRA_DIST = aubio_priv.h
    2 
    31pkginclude_HEADERS = aubioext.h \
    42        jackio.h \
  • ext/Makefile.in

    r205da86 r77494e7  
    152152sysconfdir = @sysconfdir@
    153153target_alias = @target_alias@
    154 EXTRA_DIST = aubio_priv.h
    155 
    156154pkginclude_HEADERS = aubioext.h \
    157155        jackio.h \
  • plugins/puredata/Makefile.am

    r205da86 r77494e7  
    99
    1010## Make and install the shared library.
    11 pdinstalldir = $(pddir)/extra/aubio
     11pdinstalldir = $(pddir)/extra
    1212
    1313# Automake won't accept something ending in ".pd_linux" as a library
     
    3838noinst_SCRIPTS = libtoolkludge
    3939
    40 ## version.h is there for the Windows platform (no autoconf)
    41 EXTRA_DIST = $(pdinstall_DATA) $(noinst_SCRIPTS) version.h
     40EXTRA_DIST = $(pdinstall_DATA) $(noinst_SCRIPTS)
  • plugins/puredata/Makefile.in

    r205da86 r77494e7  
    162162
    163163#SUBDIRS = ladspa vst win
    164 pdinstalldir = $(pddir)/extra/aubio
     164pdinstalldir = $(pddir)/extra
    165165
    166166# Automake won't accept something ending in ".pd_linux" as a library
     
    188188noinst_SCRIPTS = libtoolkludge
    189189
    190 EXTRA_DIST = $(pdinstall_DATA) $(noinst_SCRIPTS) version.h
     190EXTRA_DIST = $(pdinstall_DATA) $(noinst_SCRIPTS)
    191191subdir = plugins/puredata
    192192ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
  • plugins/puredata/libtoolkludge

    r205da86 r77494e7  
    11#! /bin/sh
    22
     3# added --mode=link
    34if test \( $# -gt 1 \) -a \( $1 = "--mode=link" \); then
     5  shift;
     6  echo " libtoolkludge running \"$*\""
     7  $*
     8  exit 0
     9elif test \( $# -gt 1 \) -a \( $1 = "--mode=install" \); then
    410  shift;
    511  echo " libtoolkludge running \"$*\""
  • python/aubio/Makefile.am

    r205da86 r77494e7  
    1 EXTRA_DIST = __init__.py onsetcompare.py aubioclass.py gnuplot.py\
    2         median.py txtfile.py
    3 
    41pkgpython_PYTHON = __init__.py onsetcompare.py\
    52        gnuplot.py median.py txtfile.py aubioclass.py
     3       
     4nodist_pkgpython_PYTHON = aubiowrapper.py _aubiowrapper.so
    65
    7 clean:
    8         rm -f *.pyc
     6CLEANFILES = *.pyc *.so *.o aubio_wrap.c aubiowrapper.py
    97
    10 distclean: clean
     8all: _aubiowrapper.so
     9
     10SWIG = swig
     11# removed -Wall -Wmissing-prototypes -Wmissing-declarations
     12SWCFLAGS = -DJACK_SUPPORT -Werror -Wno-char-subscripts -Wno-unknown-pragmas -I/usr/include/python2.3 -I../../src -I../../ext -I/usr/include
     13SWLDFLAGS = -shared -L../../ext/.libs -laubioext -L../../src/.libs -laubio
     14
     15aubio_wrap.c:
     16        $(SWIG) -outdir . -o aubio_wrap.c -python ../../swig/aubio.i
     17
     18_aubiowrapper.so: aubio_wrap.c
     19        $(CC)   $(SWCFLAGS) -c aubio_wrap.c
     20        $(CC)   $(SWLDFLAGS) aubio_wrap.o -o _aubiowrapper.so
  • python/aubio/Makefile.in

    r205da86 r77494e7  
    152152sysconfdir = @sysconfdir@
    153153target_alias = @target_alias@
    154 EXTRA_DIST = __init__.py onsetcompare.py aubioclass.py gnuplot.py\
    155         median.py txtfile.py
    156 
    157 
    158154pkgpython_PYTHON = __init__.py onsetcompare.py\
    159155        gnuplot.py median.py txtfile.py aubioclass.py
    160156
     157
     158nodist_pkgpython_PYTHON = aubiowrapper.py _aubiowrapper.so
     159
     160CLEANFILES = *.pyc *.so *.o aubio_wrap.c aubiowrapper.py
     161
     162SWIG = swig
     163# removed -Wall -Wmissing-prototypes -Wmissing-declarations
     164SWCFLAGS = -DJACK_SUPPORT -Werror -Wno-char-subscripts -Wno-unknown-pragmas -I/usr/include/python2.3 -I../../src -I../../ext -I/usr/include
     165SWLDFLAGS = -shared -L../../ext/.libs -laubioext -L../../src/.libs -laubio
    161166subdir = python/aubio
    162167ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
     
    185190        -rm -f libtool
    186191uninstall-info-am:
     192nodist_pkgpythonPYTHON_INSTALL = $(INSTALL_DATA)
     193install-nodist_pkgpythonPYTHON: $(nodist_pkgpython_PYTHON)
     194        @$(NORMAL_INSTALL)
     195        $(mkinstalldirs) $(DESTDIR)$(pkgpythondir)
     196        @list='$(nodist_pkgpython_PYTHON)'; dlist=''; for p in $$list; do\
     197          if test -f "$$p"; then b=; else b="$(srcdir)/"; fi; \
     198          if test -f $$b$$p; then \
     199            d=`echo "$$p" | sed -e 's,^.*/,,'`; \
     200            dlist="$$dlist $$d"; \
     201            echo " $(nodist_pkgpythonPYTHON_INSTALL) $$b$$p $(DESTDIR)$(pkgpythondir)/$$d"; \
     202            $(nodist_pkgpythonPYTHON_INSTALL) $$b$$p $(DESTDIR)$(pkgpythondir)/$$d; \
     203          else :; fi; \
     204        done; \
     205        PYTHON=$(PYTHON) $(py_compile) --basedir $(DESTDIR)$(pkgpythondir) $$dlist
     206
     207uninstall-nodist_pkgpythonPYTHON:
     208        @$(NORMAL_UNINSTALL)
     209        list='$(nodist_pkgpython_PYTHON)'; for p in $$list; do \
     210          d=`echo "$$p" | sed -e 's,^.*/,,'`; \
     211          rm -f $(DESTDIR)$(pkgpythondir)/$$d; \
     212          rm -f $(DESTDIR)$(pkgpythondir)/$${d}c; \
     213          rm -f $(DESTDIR)$(pkgpythondir)/$${d}o; \
     214        done
    187215pkgpythonPYTHON_INSTALL = $(INSTALL_DATA)
    188216install-pkgpythonPYTHON: $(pkgpython_PYTHON)
     
    251279
    252280installdirs:
    253         $(mkinstalldirs) $(DESTDIR)$(pkgpythondir)
     281        $(mkinstalldirs) $(DESTDIR)$(pkgpythondir) $(DESTDIR)$(pkgpythondir)
    254282install: install-am
    255283install-exec: install-exec-am
     
    269297
    270298clean-generic:
     299        -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
    271300
    272301distclean-generic:
     
    292321info-am:
    293322
    294 install-data-am: install-pkgpythonPYTHON
     323install-data-am: install-nodist_pkgpythonPYTHON install-pkgpythonPYTHON
    295324
    296325install-exec-am:
     
    318347ps-am:
    319348
    320 uninstall-am: uninstall-info-am uninstall-pkgpythonPYTHON
     349uninstall-am: uninstall-info-am uninstall-nodist_pkgpythonPYTHON \
     350        uninstall-pkgpythonPYTHON
    321351
    322352.PHONY: all all-am check check-am clean clean-generic clean-libtool \
     
    324354        dvi-am info info-am install install-am install-data \
    325355        install-data-am install-exec install-exec-am install-info \
    326         install-info-am install-man install-pkgpythonPYTHON \
    327         install-strip installcheck installcheck-am installdirs \
    328         maintainer-clean maintainer-clean-generic mostlyclean \
    329         mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
    330         uninstall uninstall-am uninstall-info-am \
     356        install-info-am install-man install-nodist_pkgpythonPYTHON \
     357        install-pkgpythonPYTHON install-strip installcheck \
     358        installcheck-am installdirs maintainer-clean \
     359        maintainer-clean-generic mostlyclean mostlyclean-generic \
     360        mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
     361        uninstall-info-am uninstall-nodist_pkgpythonPYTHON \
    331362        uninstall-pkgpythonPYTHON
    332363
    333364
    334 clean:
    335         rm -f *.pyc
    336 
    337 distclean: clean
     365all: _aubiowrapper.so
     366
     367aubio_wrap.c:
     368        $(SWIG) -outdir . -o aubio_wrap.c -python ../../swig/aubio.i
     369
     370_aubiowrapper.so: aubio_wrap.c
     371        $(CC)   $(SWCFLAGS) -c aubio_wrap.c
     372        $(CC)   $(SWLDFLAGS) aubio_wrap.o -o _aubiowrapper.so
    338373# Tell versions [3.59,3.63) of GNU make to not export all variables.
    339374# Otherwise a system limit (for SysV at least) may be exceeded.
  • python/aubiocut

    r205da86 r77494e7  
    6161                    fromcross = 0
    6262                    while (zerocross < readsize):
    63                         mycopy.set(myvec.get(zerocross,0),fromcross,0)
     63                        for i in range(channels):
     64                                mycopy.set(myvec.get(zerocross,i),fromcross,i)
    6465                        fromcross += 1
    6566                        zerocross += 1
  • swig/Makefile.am

    r205da86 r77494e7  
     1# see ../python/Makefile.am
    12EXTRA_DIST = aubio.i
    2 
    3 PYTHON_DIR = ../python/aubio
    4 SWIG = swig
    5 #SW_FLAGS = -c++
    6 # removed -Wall -Wmissing-prototypes -Wmissing-declarations
    7 SW_CFLAGS = -DJACK_SUPPORT -shared -Werror -Wno-char-subscripts -Wno-unknown-pragmas
    8 #SW_CFLAGS = -Wno-missing-prototypes -Wno-missing-declarations
    9 SWINCLUDE = -I/usr/include/python2.3 -I../src -I../ext -I/usr/include
    10 SWLDFLAGS = -L../ext/.libs -laubioext -L../src/.libs -laubio
    11 
    12 all:
    13         $(SWIG) $(SW_FLAGS) -outdir $(PYTHON_DIR) -python aubio.i
    14         $(CC) $(SW_CFLAGS) -c aubio_wrap.c $(SWINCLUDE)
    15         $(CC) $(SW_CFLAGS) aubio_wrap.o -o $(PYTHON_DIR)/_aubiowrapper.so $(SWLDFLAGS)
    16 
    17 install:
    18         $(mkinstalldirs) $(DESTDIR)$(pkgpythondir)
    19         $(INSTALL) $(PYTHON_DIR)/_aubiowrapper.so $(DESTDIR)$(pkgpythondir)
    20         $(INSTALL) -m644 $(PYTHON_DIR)/aubiowrapper.py $(DESTDIR)$(pkgpythondir)
    21 
    22 clean:
    23         rm -f aubio_wrap.{c,o} $(PYTHON_DIR)/{_aubiowrapper.so,aubiowrapper.py,aubiowrapper.pyc}
    24 
    25 distclean: clean
  • swig/Makefile.in

    r205da86 r77494e7  
    152152sysconfdir = @sysconfdir@
    153153target_alias = @target_alias@
     154
     155# see ../python/Makefile.am
    154156EXTRA_DIST = aubio.i
    155 
    156 PYTHON_DIR = ../python/aubio
    157 SWIG = swig
    158 #SW_FLAGS = -c++
    159 # removed -Wall -Wmissing-prototypes -Wmissing-declarations
    160 SW_CFLAGS = -DJACK_SUPPORT -shared -Werror -Wno-char-subscripts -Wno-unknown-pragmas
    161 #SW_CFLAGS = -Wno-missing-prototypes -Wno-missing-declarations
    162 SWINCLUDE = -I/usr/include/python2.3 -I../src -I../ext -I/usr/include
    163 SWLDFLAGS = -L../ext/.libs -laubioext -L../src/.libs -laubio
    164157subdir = swig
    165158ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
     
    230223
    231224installdirs:
     225install: install-am
    232226install-exec: install-exec-am
    233227install-data: install-data-am
     
    307301        uninstall-info-am
    308302
    309 
    310 all:
    311         $(SWIG) $(SW_FLAGS) -outdir $(PYTHON_DIR) -python aubio.i
    312         $(CC) $(SW_CFLAGS) -c aubio_wrap.c $(SWINCLUDE)
    313         $(CC) $(SW_CFLAGS) aubio_wrap.o -o $(PYTHON_DIR)/_aubiowrapper.so $(SWLDFLAGS)
    314 
    315 install:
    316         $(mkinstalldirs) $(DESTDIR)$(pkgpythondir)
    317         $(INSTALL) $(PYTHON_DIR)/_aubiowrapper.so $(DESTDIR)$(pkgpythondir)
    318         $(INSTALL) -m644 $(PYTHON_DIR)/aubiowrapper.py $(DESTDIR)$(pkgpythondir)
    319 
    320 clean:
    321         rm -f aubio_wrap.{c,o} $(PYTHON_DIR)/{_aubiowrapper.so,aubiowrapper.py,aubiowrapper.pyc}
    322 
    323 distclean: clean
    324303# Tell versions [3.59,3.63) of GNU make to not export all variables.
    325304# Otherwise a system limit (for SysV at least) may be exceeded.
Note: See TracChangeset for help on using the changeset viewer.