PR for SopiMlab fork

build/config-lnx.def

@@ -1,8 +1,13 @@
 # what is the base prefix of the Python installation?
+ifdef PY_CONDA_ROOT
+PYTHONPREFIX=$(PY_CONDA_ROOT)
+else
 PYTHONPREFIX=/usr
+endif
 
 # which Python version do you want to compile against?
-PYTHONVERSION=2.7
+PY_MAJOR_VERSION=3
+PY_MINOR_VERSION=7
 
 # uncomment if numpy/numarray/numeric support should be compiled in
 # for info see http://numeric.scipy.org
@@ -15,3 +20,6 @@ PY_USE_GIL=1
 
 # use inofficial (pure data) functionality
 # PY_USE_INOFFICIAL=1
+
+# use python with pymalloc (look for "pythonX.Ym" files) 
+PY_USE_PYMALLOC=1

build/config-mac.def

@@ -1,6 +1,9 @@
-# set PY_DEFAULT=0 if you manually installed Python on your system 
-# (overriding the one that came with OS X by default)
-PY_DEFAULT=1
+# which kind of Python installation to use
+#   system - macOS system default
+#   local - local installation
+#   conda - conda environment; specify the environment root dir using the
+#           PY_CONDA_ROOT environment variable
+PY_KIND=conda
 
 #########################################################################
 
@@ -10,16 +13,16 @@ PY_DEFAULT=1
 # Mac OSX 10.5 -> default Python version (major.minor) = 2.5
 # Mac OSX 10.6 -> default Python version (major.minor) = 2.6
 
-PY_MAJOR_VERSION=2
-PY_MINOR_VERSION=6
+PY_MAJOR_VERSION=3
+PY_MINOR_VERSION=7
 
 #########################################################################
 
 # uncomment if numpy/numarray/numeric support should be compiled in
 # for info see http://numeric.scipy.org
 # numarray and numeric are outdated
 
-# PY_NUMPY=1
+PY_NUMPY=1
 # PY_NUMARRAY=1
 # PY_NUMERIC=1
 
@@ -30,3 +33,6 @@ PY_USE_GIL=1
 
 # use inofficial (pure data) functionality
 # PY_USE_INOFFICIAL=1
+
+# use python with pymalloc (look for "pythonX.Ym" files)
+PY_USE_PYMALLOC=1

build/gnumake-lnx-gcc.inc

@@ -1,12 +1,27 @@
+ifdef PY_USE_PYMALLOC
+PYTHONVERSION=$(PY_MAJOR_VERSION).$(PY_MINOR_VERSION)m
+else
+PYTHONVERSION=$(PY_MAJOR_VERSION).$(PY_MINOR_VERSION)
+endif
+
 DEFS += -DPY_EXPORTS
+
 INCPATH += -I$(PYTHONPREFIX)/include/python$(PYTHONVERSION)
+
+ifdef PY_CONDA_ROOT
+LIBPATH += -L$(PY_CONDA_ROOT)/lib
+LDFLAGS += -Wl,-R$(PY_CONDA_ROOT)/lib
+DEFS += -DPY_INTERPRETER=$(PY_CONDA_ROOT)/bin/python
+endif
+
 LIBS += -lpython$(PYTHONVERSION)
 
 ifdef PY_NUMARRAY
 DEFS += -DPY_NUMARRAY
 endif
 ifdef PY_NUMPY
 DEFS += -DPY_NUMPY
+INCPATH += -I$(PYTHONPREFIX)/lib/python$(PY_MAJOR_VERSION).$(PY_MINOR_VERSION)/site-packages/numpy/core/include
 endif
 ifdef PY_NUMERIC
 DEFS += -DPY_NUMERIC

build/gnumake-mac-gcc.inc

@@ -1,42 +1,79 @@
+DEFS += -DPY_EXPORTS
+
+ifdef PY_NUMPY
+DEFS += -DPY_NUMPY
+endif
+
+ifdef PY_NUMARRAY
+DEFS += -DPY_NUMARRAY
+endif
+
+ifdef PY_NUMERIC
+DEFS += -DPY_NUMERIC
+endif
+
+ifdef PY_USE_GIL
+DEFS += -DPY_USE_GIL
+endif
+
+ifdef PY_USE_INOFFICIAL
+DEFS += -DPY_USE_INOFFICIAL
+endif
+
+ifeq ($(PY_KIND),conda)
+
+ifndef PY_CONDA_ROOT
+$(error PY_CONDA_ROOT is undefined)
+endif
+
+DEFS += -DPY_INTERPRETER=$(PY_CONDA_ROOT)/bin/python
+INCPATH += -I$(PY_CONDA_ROOT)/include
+ifdef PY_USE_PYMALLOC
+INCPATH += -I$(PY_CONDA_ROOT)/include/python$(PY_MAJOR_VERSION).$(PY_MINOR_VERSION)m
+LIBS += $(PY_CONDA_ROOT)/lib/libpython$(PY_MAJOR_VERSION).$(PY_MINOR_VERSION)m.dylib
+else
+INCPATH += -I$(PY_CONDA_ROOT)/include/python$(PY_MAJOR_VERSION).$(PY_MINOR_VERSION)
+LIBS += $(PY_CONDA_ROOT)/lib/libpython$(PY_MAJOR_VERSION).$(PY_MINOR_VERSION).dylib
+endif
+LDFLAGS += -rpath $(PY_CONDA_ROOT)/lib
+
+ifdef PY_NUMPY
+INCPATH += -I$(PY_CONDA_ROOT)/lib/python$(PY_MAJOR_VERSION).$(PY_MINOR_VERSION)/site-packages/numpy/core/include
+endif
+
+else
+
+DEFS += -DPY_USE_FRAMEWORK
+
 # don't use -framework Python, since this will stick to the default system version
 
 _LOCAL_FRAMEWORK := /Library/Frameworks/Python.framework/Versions/$(PY_MAJOR_VERSION).$(PY_MINOR_VERSION)
 _SYSTEM_FRAMEWORK := /System/Library/Frameworks/Python.framework/Versions/$(PY_MAJOR_VERSION).$(PY_MINOR_VERSION)
 _LOCAL_LIBRARY := /Library/Python/$(PY_MAJOR_VERSION).$(PY_MINOR_VERSION)
 _SYSTEM_LIBRARY := /System/Library/Python/$(PY_MAJOR_VERSION).$(PY_MINOR_VERSION)
 
-DEFS += -DPY_EXPORTS
 INCPATH += -F/Library/Frameworks -framework Python
 
-ifeq ($(PY_DEFAULT),1)
+ifeq ($(PY_KIND),system)
 LIBS += $(_SYSTEM_FRAMEWORK)/Python
 INCPATH += -I$(_SYSTEM_FRAMEWORK)/Headers
 else
 LIBS += $(_LOCAL_FRAMEWORK)/Python
 INCPATH += -I$(_LOCAL_FRAMEWORK)/Headers
 endif
 
-ifdef PY_NUMARRAY
-DEFS += -DPY_NUMARRAY
-endif
 ifdef PY_NUMPY
-DEFS += -DPY_NUMPY
 INCPATH += -I$(_LOCAL_LIBRARY)/python$(PY_MAJOR_VERSION).$(PY_MINOR_VERSION)/site-packages/numpy/core/include
-ifeq ($(PY_DEFAULT),1)
+
+ifeq ($(PY_KIND),system)
 INCPATH += -I$(_SYSTEM_FRAMEWORK)/lib/python$(PY_MAJOR_VERSION).$(PY_MINOR_VERSION)/site-packages/numpy/core/include
 INCPATH += -I$(_SYSTEM_FRAMEWORK)/Extras/lib/python/numpy/core/include
 else
 INCPATH += -I$(_LOCAL_FRAMEWORK)/lib/python$(PY_MAJOR_VERSION).$(PY_MINOR_VERSION)/site-packages/numpy/core/include
 endif
 endif
-ifdef PY_NUMERIC
-DEFS += -DPY_NUMERIC
-endif
 
-ifdef PY_USE_GIL
-DEFS += -DPY_USE_GIL
 endif
 
-ifdef PY_USE_INOFFICIAL
-DEFS += -DPY_USE_INOFFICIAL
-endif
+#DEBUG = 1
+#DFLAGS += -DFLEXT_DEBUG

package.txt

@@ -11,6 +11,6 @@ SRCS= \
     py.cpp pyext.cpp modmeth.cpp clmeth.cpp \
     register.cpp bound.cpp pyargs.cpp \
     pysymbol.cpp pybuffer.cpp pybundle.cpp pydsp.cpp \
-    pyatom.cpp pybase.cpp pymeth.cpp
+    pyatom.cpp pybase.cpp pymeth.cpp pycompat.cpp
 
-HDRS= pyprefix.h main.h pyext.h pysymbol.h pybuffer.h pybundle.h pyatom.h pybase.h
+HDRS= pyprefix.h main.h pyext.h pysymbol.h pybuffer.h pybundle.h pyatom.h pybase.h pycompat.h

pd/methods-1.pd

@@ -1,24 +1,24 @@
-#N canvas 540 469 734 369 12;
-#X obj 16 13 cnv 15 650 40 empty empty py/pyext 10 22 0 24 -260818
--1 0;
-#X text 235 32 http://grrrr.org/ext;
-#X symbolatom 21 139 10 0 0 0 - - -;
-#X symbolatom 25 298 10 0 0 0 - - -;
-#X obj 22 179 py .str @py 1;
-#X text 145 170 convert the symbol to a Python string;
-#X text 35 216 pass it as a true Python object;
-#X symbolatom 364 295 10 0 0 0 - - -;
-#X text 462 269 use module function;
-#X text 23 119 enter some text;
-#X text 145 187 using the built-in str function;
-#X obj 25 252 pym swapcase;
-#X text 63 270 use swapcase method;
-#X obj 363 250 py string.swapcase;
-#X text 235 16 Python script objects \, (C)2003-2006 Thomas Grill;
-#X text 21 73 Py can act on Python objects in an object-oriented manner
-;
-#X connect 2 0 4 1;
-#X connect 4 0 11 1;
-#X connect 4 0 13 1;
-#X connect 11 0 3 0;
-#X connect 13 0 7 0;
+#N canvas 540 469 734 369 12;
+#X obj 16 13 cnv 15 650 40 empty empty py/pyext 10 22 0 24 -260818
+-1 0;
+#X text 235 32 http://grrrr.org/ext;
+#X symbolatom 21 139 10 0 0 0 - - -;
+#X symbolatom 25 298 10 0 0 0 - - -;
+#X obj 22 179 py .str @py 1;
+#X text 145 170 convert the symbol to a Python string;
+#X text 35 216 pass it as a true Python object;
+#X symbolatom 364 295 10 0 0 0 - - -;
+#X text 462 269 use module function;
+#X text 23 119 enter some text;
+#X text 145 187 using the built-in str function;
+#X obj 25 252 pym swapcase;
+#X text 63 270 use swapcase method;
+#X text 235 16 Python script objects \, (C)2003-2006 Thomas Grill;
+#X text 21 73 Py can act on Python objects in an object-oriented manner
+;
+#X obj 363 250 py string.capwords;
+#X connect 2 0 4 1;
+#X connect 4 0 11 1;
+#X connect 4 0 15 1;
+#X connect 11 0 3 0;
+#X connect 15 0 7 0;