Changeset 1b2669a

Timestamp:

Dec 2, 2016, 3:07:16 AM (8 years ago)

Author:

Paul Brossier <piem@piem.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, sampler, yinfft+

Children:

7faef58

Parents:

0ec7113

Message:

Makefile: verbose, improve clean, build_ext only for --enable-double, less flags

File:

• Makefile (modified) (11 diffs)

Makefile

@@ -4 +4 @@
 #WAFOPTS:=
 # turn on verbose mode
-#WAFOPTS += --verbose
+WAFOPTS += --verbose
 # build wafopts
 WAFOPTS += --destdir $(DESTDIR)
@@ -12 +12 @@
 DESTDIR:=$(PWD)/build/dist
 PYDESTDIR:=$(PWD)/build/pydist
+
+BUILDID=$(shell mktemp -d -p $(PWD)/dist/)
 
 # default install locations
@@ -53 +55 @@
         # install
         $(WAFCMD) install $(WAFOPTS)
-        make list_installed
 
 list_installed:
-        find $(DESTDIR) -ls | sed 's|$(DESTDIR)|/«destdir»|'
+        find $(DESTDIR) -ls | \
+                sed 's|$(DESTDIR)|/«destdir»|'
+        tar --full-time --mtime=$(PWD)/src/aubio.h -jcvf $(BUILDID)/aubio-dist.tar.bz2 -C $(DESTDIR)/ .
 
 list_installed_python:
-        find $(PYDESTDIR) -ls | sed 's|$(PYDESTDIR)|/«pydestdir»|'
+        ( find $(PYDESTDIR) -ls || make list_installed_python_package ) | \
+                sed 's|$(PYDESTDIR)|/«pydestdir»|'
+        [ -d $(PYDESTDIR) ] && \
+                tar --full-time --mtime=$(PWD)/src/aubio.h -jcvf $(BUILDID)/python-aubio-dist.tar.bz2 -C $(PYDESTDIR)/ . || \
+                true
+
+list_installed_python_package:
+        pip show -f aubio
+        PACKAGE_LOCATION=$(shell pip show -f aubio | grep ^Location | cut -d \  -f 2) \
+                make list_installed_python_package_content
+
+list_installed_python_package_content:
+        ( [ -d $(PACKAGE_LOCATION) ] && find $(PACKAGE_LOCATION) -ls ) || \
+                unzip -l $(PACKAGE_LOCATION)
+        cp -prv $(PACKAGE_LOCATION) $(BUILDID)
+
+list_all_installed: list_installed list_installed_python
 
 uninstall:
@@ -70 +89 @@
 build_python:
         # build python-aubio, using locally built libaubio if found
-        python ./setup.py build $(ENABLE_DOUBLE)
+        python ./setup.py build_ext $(ENABLE_DOUBLE)
 
 build_python_extlib:
@@ -78 +97 @@
         [ -f $(DESTDIR)/$(LIBDIR)/pkgconfig/aubio.pc ]
         PKG_CONFIG_PATH=$(DESTDIR)/$(LIBDIR)/pkgconfig \
-        CFLAGS="-I$(DESTDIR)/$(INCLUDEDIR) $(CFLAGS)" \
-        LDFLAGS="-L$(DESTDIR)/$(LIBDIR) $(CFLAGS)" \
+        CFLAGS="-I$(DESTDIR)/$(INCLUDEDIR)" \
+        LDFLAGS="-L$(DESTDIR)/$(LIBDIR)" \
                 make build_python
-        make list_installed
-        cat $(DESTDIR)/$(LIBDIR)/pkgconfig/aubio.pc
 
 deps_python:
@@ -125 +142 @@
         # also run with nose, multiple processes
         nose2 -N 4
-        # list installed files
-        #find $(DESTDIR) -ls | sed 's|$(DESTDIR)||'
-        make list_installed_python
 
 clean_python:
@@ -140 +154 @@
         # optionnaly clean before build
         -$(WAFCMD) clean
+        # remove possible left overs
+        -rm -rf doc/_build
 
 check_clean:
@@ -171 +187 @@
 
 # build only libaubio, no python-aubio
-test_lib_only: clean distclean configure build install
+test_lib_only: clean distclean configure build install list_installed
 # additionally, clean after a fresh build
 test_lib_only_clean: test_lib_only uninstall check_clean check_distclean
@@ -180 +196 @@
         configure build build_python \
         install install_python \
-        test_python
+        test_python \
+        list_all_installed
 
 test_lib_python_clean: test_lib_python \
@@ -195 +212 @@
         build_python_extlib \
         install_python \
-        test_python
+        test_python \
+        list_all_installed
 
 test_lib_install_python_clean: test_lib_install_python \
@@ -208 +226 @@
         build_python \
         install_python \
-        test_python
+        test_python \
+        list_installed_python
 
 test_python_only_clean: test_python_only \