support for Python threads, at last

output single atoms instead of 1-element lists
small changes for release
using flext build system

svn path=/trunk/; revision=2398

13 files changed, 77 insertions, 130 deletions

diff --git a/externals/grill/py/build-pd-msvc.bat b/externals/grill/py/build-pd-msvc.bat
deleted file mode 100644
index d6187f08..00000000
--- a/externals/grill/py/build-pd-msvc.bat
+++ /dev/null
@@ -1,4 +0,0 @@
-@echo --- Building with MS Visual C++ ---
-
-nmake -f makefile.pd-msvc clean
-nmake -f makefile.pd-msvc
diff --git a/externals/grill/py/build-win-max-msvc.bat b/externals/grill/py/build-win-max-msvc.bat
new file mode 100644
index 00000000..436f6a8e
--- /dev/null
+++ b/externals/grill/py/build-win-max-msvc.bat
@@ -0,0 +1,4 @@
+@echo --- Building with MS Visual C++ ---

+

+nmake -f ..\flext\build\make-win-max-msvc.txt clean 

+nmake -f ..\flext\build\make-win-max-msvc.txt

diff --git a/externals/grill/py/build-win-pd-msvc.bat b/externals/grill/py/build-win-pd-msvc.bat
new file mode 100644
index 00000000..942ee174
--- /dev/null
+++ b/externals/grill/py/build-win-pd-msvc.bat
@@ -0,0 +1,4 @@
+@echo --- Building with MS Visual C++ ---
+
+nmake -f ..\flext\build\make-win-pd-msvc.txt clean 
+nmake -f ..\flext\build\make-win-pd-msvc.txt
diff --git a/externals/grill/py/config-pd-msvc.txt b/externals/grill/py/config-pd-msvc.txt
deleted file mode 100644
index 1d145e62..00000000
--- a/externals/grill/py/config-pd-msvc.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-# py/pyext - python script objects for PD and Max/MSP
-# Copyright (c)2002-04 Thomas Grill (xovo@gmx.net)
-#
-
-# where is PD?
-PDPATH=c:\programme\audio\pd		
-
-# where do the flext libraries reside?
-FLEXTPATH=$(PDPATH)\flext
-
-# where is MS VC++?
-# (not necessary if the build is run with the compiler environment)
-# MSVCPATH=C:\Programme\Microsoft Visual Studio .NET 2003\Vc7
-
-# which version of Python?
-PYTHONVER=python23
-
-# where are the python header files?
-PYTHONINCLUDE=c:\programme\prog\$(PYTHONVER)\include
-
-# what is the python library file?
-PYTHONLIB=c:\programme\prog\$(PYTHONVER)\libs\$(PYTHONVER).lib
-
-# where should the external be built?
-OUTPATH=pd-msvc
-
-# where should the external be installed?
-# (leave blank to omit installation)
-INSTPATH=$(PDPATH)\extra
-
-# user defined compiler flags
-# (check if they match your system!)
-UFLAGS=/G6 /Ox
diff --git a/externals/grill/py/config-win-max-msvc.txt b/externals/grill/py/config-win-max-msvc.txt
new file mode 100644
index 00000000..6ea09abd
--- /dev/null
+++ b/externals/grill/py/config-win-max-msvc.txt
@@ -0,0 +1,11 @@
+# py/pyext - python script objects for PD and Max/MSP

+# Copyright (c)2002-04 Thomas Grill (gr@grrrr.org)

+#

+#

+# Your settings are defined in the file

+# ..\flext\build\config-win-max-msvc.txt

+#

+# You can override them here.

+

+# where is the Python installation?

+PYTHONPATH=c:\programme\prog\python24

diff --git a/externals/grill/py/config-win-pd-msvc.txt b/externals/grill/py/config-win-pd-msvc.txt
new file mode 100644
index 00000000..828b469c
--- /dev/null
+++ b/externals/grill/py/config-win-pd-msvc.txt
@@ -0,0 +1,12 @@
+# py/pyext - python script objects for PD and Max/MSP
+# Copyright (c)2002-04 Thomas Grill (gr@grrrr.org)
+#
+#
+# Your settings are defined in the file
+# ..\flext\build\config-win-pd-msvc.txt
+#
+# You can override them here.
+
+
+# where is the Python installation?
+PYTHONPATH=c:\programme\prog\python24
diff --git a/externals/grill/py/makefile-win-msvc.txt b/externals/grill/py/makefile-win-msvc.txt
new file mode 100644
index 00000000..9d923235
--- /dev/null
+++ b/externals/grill/py/makefile-win-msvc.txt
@@ -0,0 +1,15 @@
+# py/pyext - python script object for PD and Max/MSP

+# Copyright (C)2002-04 Thomas Grill (gr@grrrr.org)

+#

+# Makefile for MSVC++ 6 and 7

+#

+# usage:

+# to build run "build-max-msvc.bat" or "build-pd-msvc.bat"

+#

+

+# includes

+INCPATH=/I$(PYTHONPATH)\include

+LIBPATH=/LIBPATH:$(PYTHONPATH)\libs

+

+# multithreaded build

+FLEXT_THREADED=1

diff --git a/externals/grill/py/makefile.pd-msvc b/externals/grill/py/makefile.pd-msvc
deleted file mode 100644
index e78b60d4..00000000
--- a/externals/grill/py/makefile.pd-msvc
+++ /dev/null
@@ -1,66 +0,0 @@
-# py/pyext - python script object for PD and Max/MSP
-# Copyright (C)2002-04 Thomas Grill (xovo@gmx.net)
-#
-# Makefile for MSVC++ 6 and 7
-#
-# usage:
-# to build run "make -f makefile.pd-msvc"
-#
-
-!include config-pd-msvc.txt
-
-# includes
-INCPATH=/I"$(MSVCPATH)\include" /I"$(PYTHONINCLUDE)" /I"$(PDPATH)\src" /I"$(FLEXTPATH)"
-LIBPATH=/LIBPATH:"$(MSVCPATH)\lib" /LIBPATH:"$(PDPATH)\bin" /LIBPATH:"$(FLEXTPATH)"
-
-# compiler definitions and flags
-DEFS=/DFLEXT_SYS=2 /DFLEXT_THREADS
-CFLAGS=/MT $(UFLAGS)
-
-# for VC7
-CFLAGS=$(CFLAGS) /EHsc 
-
-
-LIBS=pd.lib pthreadVC.lib $(PYTHONLIB)
-
-!ifdef FLEXT_SHARED
-LIBS=$(LIBS) flext.lib
-DEFS=$(DEFS) /DFLEXT_SHARED
-!else
-LIBS=$(LIBS) flext_t-pdwin.lib
-!endif
-
-
-# the rest can stay untouched
-# ----------------------------------------------
-
-NAME=py
-
-# all the source files from the package
-!include make-files.txt
-
-all: $(OUTPATH) $(OUTPATH)\$(NAME).dll
-
-# remove build
-clean:
-	-del /q $(OUTPATH) > nul
-	-rmdir $(OUTPATH) > nul
-
-OBJS= $(SRCS:.cpp=.obj)
-
-$(OUTPATH):
-	-mkdir $(OUTPATH) > nul
-
-{$(SRCDIR)}.cpp{}.obj:
-	cl /c /LD $(CFLAGS) $(DEFS) $(INCPATH) $** /Fo$(OUTPATH)\$@
-
-$(OUTPATH)\$(NAME).dll: $(OBJS)
-	cd $(OUTPATH)
-	link /DLL /out:$(NAME).dll /INCREMENTAL:NO $** $(LIBS) $(LIBPATH)
-	@-del *.exp
-	@-del *.lib
-	cd ..
-!ifdef INSTPATH
-	@-if not exist $(INSTPATH) mkdir $(INSTPATH)
-	copy $@ $(INSTPATH) > nul
-!endif
diff --git a/externals/grill/py/maxmsp/thread-1.mxb b/externals/grill/py/maxmsp/thread-1.mxb
index efdce293..a6bb6f27 100644
--- a/externals/grill/py/maxmsp/thread-1.mxb
+++ b/externals/grill/py/maxmsp/thread-1.mxb
diff --git a/externals/grill/py/py.vcproj b/externals/grill/py/py.vcproj
index cac17abd..e658e3e3 100644
--- a/externals/grill/py/py.vcproj
+++ b/externals/grill/py/py.vcproj
@@ -85,16 +85,17 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="c:\programme\audio\pd\src;f:\prog\max\flext\source;C:\Programme\prog\Python23\include"
+				AdditionalIncludeDirectories="c:\programme\audio\pd\src;c:\data\prog\max\flext\source;&quot;C:\data\prog\packs\Python-2.4\include&quot;;&quot;C:\data\prog\packs\Python-2.4\PC&quot;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FLEXT_SYS=2;FLEXT_THREADS"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
 				RuntimeTypeInfo="TRUE"
 				UsePrecompiledHeader="2"
-				BrowseInformation="1"
+				PrecompiledHeaderThrough=""
+				BrowseInformation="0"
 				WarningLevel="3"
 				SuppressStartupBanner="TRUE"
-				DebugInformationFormat="4"
+				DebugInformationFormat="3"
 				CompileAs="0"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
@@ -104,10 +105,11 @@
 				OutputFile="$(outdir)/py.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="c:/programme/audio/pd/bin;&quot;..\flext\pd-msvc&quot;;&quot;f:\prog\packs\Python-2.3.4\PCbuild&quot;"
+				AdditionalLibraryDirectories="c:/programme/audio/pd/bin;&quot;c:\data\prog\packs\Python-2.4\PCbuild&quot;"
 				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile=".\pd-msvc\td/py.pdb"
-				ImportLibrary=".\pd-msvc\td/py.lib"
+				ProgramDatabaseFile="$(outdir)/py.pdb"
+				SubSystem="2"
+				ImportLibrary="$(outdir)/py.lib"
 				TargetMachine="1"/>
 			<Tool
 				Name="VCMIDLTool"
@@ -148,9 +150,8 @@
 			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="c:\programme\audio\pd\src,f:\prog\max\flext\source,C:\Programme\prog\Python23\include"
+				Optimization="0"
+				AdditionalIncludeDirectories="c:\programme\audio\pd\src;c:\data\prog\max\flext\source;C:\Programme\prog\Python24\include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FLEXT_SYS=2;FLEXT_THREADS"
 				StringPooling="TRUE"
 				RuntimeLibrary="0"
@@ -159,6 +160,7 @@
 				UsePrecompiledHeader="2"
 				WarningLevel="3"
 				SuppressStartupBanner="TRUE"
+				DebugInformationFormat="3"
 				CompileAs="0"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
@@ -168,9 +170,10 @@
 				OutputFile="pd-msvc\py.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="c:/programme/audio/pd/bin;&quot;..\flext\pd-msvc&quot;;C:\Programme\prog\Python23\libs"
-				ProgramDatabaseFile=".\pd-msvc\tr/py.pdb"
-				ImportLibrary=".\pd-msvc\tr/py.lib"
+				AdditionalLibraryDirectories="c:/programme/audio/pd/bin;&quot;..\flext\pd-msvc&quot;;C:\Programme\prog\Python24\libs"
+				GenerateDebugInformation="TRUE"
+				ProgramDatabaseFile="$(outdir)/py.pdb"
+				ImportLibrary="$(outdir)/py.lib"
 				TargetMachine="1"/>
 			<Tool
 				Name="VCMIDLTool"
@@ -274,7 +277,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="&quot;f:\prog\pd\pd-cvs\src&quot;;f:\prog\packs\pthreads;f:\prog\max\flext\source;C:\Programme\prog\Python23\include"
+				AdditionalIncludeDirectories="&quot;c:\data\prog\pd\pd-cvs\src&quot;;c:\data\prog\packs\pthreads;c:\data\prog\max\flext\source;&quot;C:\data\prog\packs\Python-2.4\include&quot;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FLEXT_SYS=2;FLEXT_SHARED"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -342,7 +345,7 @@
 				InlineFunctionExpansion="2"
 				OmitFramePointers="TRUE"
 				OptimizeForProcessor="3"
-				AdditionalIncludeDirectories="&quot;f:\prog\pd\pd-cvs\src&quot;;f:\prog\packs\pthreads;f:\prog\max\flext\source;C:\Programme\prog\Python23\include"
+				AdditionalIncludeDirectories="&quot;c:\data\prog\pd\pd-cvs\src&quot;;c:\data\prog\packs\pthreads;..\flext\source;C:\Programme\prog\Python24\include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FLEXT_SYS=2;FLEXT_SHARED"
 				StringPooling="TRUE"
 				RuntimeLibrary="2"
@@ -360,7 +363,7 @@
 				OutputFile="$(outdir)\py.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="f:\prog\max\flext\pd-msvc;&quot;f:\prog\pd\pd-cvs/bin&quot;;f:\prog\packs\pthreads;C:\Programme\prog\Python23\libs"
+				AdditionalLibraryDirectories="&quot;..\flext\pd-msvc&quot;;&quot;c:\data\prog\pd\pd-cvs/bin&quot;;c:\data\prog\packs\pthreads;C:\Programme\prog\Python24\libs"
 				ProgramDatabaseFile=".\pd-msvc\tr/py.pdb"
 				ImportLibrary="$(outdir)/py.lib"
 				TargetMachine="1"/>
@@ -469,7 +472,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="&quot;F:\prog\audio\MaxWinSDK\c74support\msp-includes&quot;;&quot;F:\prog\audio\MaxWinSDK\c74support\max-includes&quot;;f:\prog\packs\pthreads;f:\prog\max\flext\source;C:\Programme\prog\Python23\include"
+				AdditionalIncludeDirectories="&quot;C:\data\prog\audio\maxmspsdk_win\4.5 headers\c74support\msp-includes&quot;;&quot;C:\data\prog\audio\maxmspsdk_win\4.5 headers\c74support\max-includes&quot;;..\flext\source;C:\Programme\prog\Python24\include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FLEXT_SYS=1;FLEXT_THREADS"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -485,11 +488,11 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="maxapi.lib maxext.lib maxaudio.lib pthreadVC.lib"
+				AdditionalDependencies="maxapi.lib maxaudio.lib pthreadVC.lib"
 				OutputFile="$(outdir)/py.mxe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;F:\prog\audio\MaxWinSDK\c74support\msp-includes\win-includes\debug&quot;;&quot;F:\prog\audio\MaxWinSDK\c74support\max-includes\win-includes\debug&quot;;f:\prog\packs\pthreads;&quot;f:\prog\packs\Python-2.3.2\PCbuild&quot;"
+				AdditionalLibraryDirectories="&quot;C:\data\prog\audio\maxmspsdk_win\4.5 headers\c74support\msp-includes&quot;;&quot;C:\data\prog\audio\maxmspsdk_win\4.5 headers\c74support\max-includes&quot;;&quot;c:\data\prog\packs\Python-2.4\PCbuild&quot;"
 				GenerateDebugInformation="TRUE"
 				ProgramDatabaseFile="$(intdir)/py.pdb"
 				ImportLibrary="$(intdir)/py.lib"
@@ -538,7 +541,7 @@
 				Optimization="3"
 				GlobalOptimizations="FALSE"
 				FavorSizeOrSpeed="1"
-				AdditionalIncludeDirectories="&quot;F:\prog\audio\MaxWinSDK\c74support\msp-includes&quot;;&quot;F:\prog\audio\MaxWinSDK\c74support\max-includes&quot;;f:\prog\packs\pthreads;f:\prog\max\flext\source;C:\Programme\prog\Python23\include"
+				AdditionalIncludeDirectories="&quot;C:\data\prog\audio\maxmspsdk_win\4.5 headers\c74support\msp-includes&quot;;&quot;C:\data\prog\audio\maxmspsdk_win\4.5 headers\c74support\max-includes&quot;;..\flext\source;C:\Programme\prog\Python24\include"
 				PreprocessorDefinitions="WIN32;_WINDOWS;_USRDLL;FLEXT_SYS=1;FLEXT_THREADS"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="0"
@@ -555,11 +558,11 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="maxapi.lib maxext.lib maxaudio.lib pthreadVC.lib"
+				AdditionalDependencies="maxapi.lib maxaudio.lib pthreadVC.lib"
 				OutputFile="./max-msvc/py.mxe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="&quot;F:\prog\audio\MaxWinSDK\c74support\msp-includes\win-includes\release&quot;;&quot;F:\prog\audio\MaxWinSDK\c74support\max-includes\win-includes\release&quot;;f:\prog\packs\pthreads;C:\Programme\prog\Python23\libs"
+				AdditionalLibraryDirectories="&quot;C:\data\prog\audio\maxmspsdk_win\4.5 headers\c74support\msp-includes&quot;;&quot;C:\data\prog\audio\maxmspsdk_win\4.5 headers\c74support\max-includes&quot;;C:\Programme\prog\Python24\libs"
 				GenerateDebugInformation="FALSE"
 				ProgramDatabaseFile="$(intdir)/py.pdb"
 				ImportLibrary="$(intdir)/py.lib"
diff --git a/externals/grill/py/readme.txt b/externals/grill/py/readme.txt
index 637cd176..797a6b77 100644
--- a/externals/grill/py/readme.txt
+++ b/externals/grill/py/readme.txt
@@ -82,8 +82,9 @@ o GCC: edit "config-pd-darwin.txt" & run "sh build-pd-darwin.sh"
 
 Version history:
 
-0.1.5:
+0.2.0:
 - ADD: handling of Python threads
+- FIX: output of single atoms instead of 1-element lists
 
 0.1.4:
 - ADD: better (and independent) handling of inlet and outlet count (as class variables or dynamically initialized in __init__)
diff --git a/externals/grill/py/source/clmeth.cpp b/externals/grill/py/source/clmeth.cpp
index b1d1253a..d437f146 100644
--- a/externals/grill/py/source/clmeth.cpp
+++ b/externals/grill/py/source/clmeth.cpp
@@ -170,10 +170,10 @@ PyObject *pyext::pyext_outlet(PyObject *,PyObject *args)
 				// deadlock would occur if this was another py/pyext object!
 				if(lst->Count() && IsSymbol((*lst)[0]))
 					ext->ToQueueAnything(o-1,GetSymbol((*lst)[0]),lst->Count()-1,lst->Atoms()+1);
-//						ext->ToOutAnything(o-1,GetSymbol((*lst)[0]),lst->Count()-1,lst->Atoms()+1);
-				else
+				else if(lst->Count() > 1)
 					ext->ToQueueList(o-1,*lst);
-//						ext->ToOutList(o-1,*lst);
+                else
+                    ext->ToQueueAtom(o-1,*lst->Atoms());
 			}
 			else
 				post("pyext: outlet index out of range");
diff --git a/externals/grill/py/source/main.h b/externals/grill/py/source/main.h
index 3aed0f10..6dde3f54 100644
--- a/externals/grill/py/source/main.h
+++ b/externals/grill/py/source/main.h
@@ -24,8 +24,8 @@ WARRANTIES, see the file, "license.txt," in this distribution.
 #include <unistd.h>
 #endif
 
-#if !defined(FLEXT_VERSION) || (FLEXT_VERSION < 406)
-#error You need at least flext version 0.4.6
+#if !defined(FLEXT_VERSION) || (FLEXT_VERSION < 408)
+#error You need at least flext version 0.4.8
 #endif
 
 #define PY__VERSION "0.2.0pre"