Update of /cvsroot/pure-data/externals/grill/py In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9143
Modified Files: py.vcproj readme.txt Added Files: build-win-max-msvc.bat build-win-pd-msvc.bat config-win-max-msvc.txt config-win-pd-msvc.txt makefile-win-msvc.txt Removed Files: build-pd-msvc.bat config-pd-msvc.txt makefile.pd-msvc Log Message: support for Python threads, at last output single atoms instead of 1-element lists small changes for release using flext build system
Index: py.vcproj =================================================================== RCS file: /cvsroot/pure-data/externals/grill/py/py.vcproj,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** py.vcproj 2 Nov 2004 04:59:31 -0000 1.12 --- py.vcproj 17 Dec 2004 05:04:29 -0000 1.13 *************** *** 86,90 **** Name="VCCLCompilerTool" Optimization="0" ! AdditionalIncludeDirectories="c:\programme\audio\pd\src;f:\prog\max\flext\source;C:\Programme\prog\Python23\include" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FLEXT_SYS=2;FLEXT_THREADS" BasicRuntimeChecks="3" --- 86,90 ---- Name="VCCLCompilerTool" Optimization="0" ! AdditionalIncludeDirectories="c:\programme\audio\pd\src;c:\data\prog\max\flext\source;"C:\data\prog\packs\Python-2.4\include";"C:\data\prog\packs\Python-2.4\PC"" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FLEXT_SYS=2;FLEXT_THREADS" BasicRuntimeChecks="3" *************** *** 92,99 **** RuntimeTypeInfo="TRUE" UsePrecompiledHeader="2" ! BrowseInformation="1" WarningLevel="3" SuppressStartupBanner="TRUE" ! DebugInformationFormat="4" CompileAs="0"/> <Tool --- 92,100 ---- RuntimeTypeInfo="TRUE" UsePrecompiledHeader="2" ! PrecompiledHeaderThrough="" ! BrowseInformation="0" WarningLevel="3" SuppressStartupBanner="TRUE" ! DebugInformationFormat="3" CompileAs="0"/> <Tool *************** *** 105,112 **** LinkIncremental="1" SuppressStartupBanner="TRUE" ! AdditionalLibraryDirectories="c:/programme/audio/pd/bin;"..\flext\pd-msvc";"f:\prog\packs\Python-2.3.4\PCbuild"" GenerateDebugInformation="TRUE" ! ProgramDatabaseFile=".\pd-msvc\td/py.pdb" ! ImportLibrary=".\pd-msvc\td/py.lib" TargetMachine="1"/> <Tool --- 106,114 ---- LinkIncremental="1" SuppressStartupBanner="TRUE" ! AdditionalLibraryDirectories="c:/programme/audio/pd/bin;"c:\data\prog\packs\Python-2.4\PCbuild"" GenerateDebugInformation="TRUE" ! ProgramDatabaseFile="$(outdir)/py.pdb" ! SubSystem="2" ! ImportLibrary="$(outdir)/py.lib" TargetMachine="1"/> <Tool *************** *** 149,155 **** <Tool Name="VCCLCompilerTool" ! Optimization="2" ! InlineFunctionExpansion="1" ! AdditionalIncludeDirectories="c:\programme\audio\pd\src,f:\prog\max\flext\source,C:\Programme\prog\Python23\include" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FLEXT_SYS=2;FLEXT_THREADS" StringPooling="TRUE" --- 151,156 ---- <Tool Name="VCCLCompilerTool" ! 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" *************** *** 160,163 **** --- 161,165 ---- WarningLevel="3" SuppressStartupBanner="TRUE" + DebugInformationFormat="3" CompileAs="0"/> <Tool *************** *** 169,175 **** LinkIncremental="1" SuppressStartupBanner="TRUE" ! AdditionalLibraryDirectories="c:/programme/audio/pd/bin;"..\flext\pd-msvc";C:\Programme\prog\Python23\libs" ! ProgramDatabaseFile=".\pd-msvc\tr/py.pdb" ! ImportLibrary=".\pd-msvc\tr/py.lib" TargetMachine="1"/> <Tool --- 171,178 ---- LinkIncremental="1" SuppressStartupBanner="TRUE" ! AdditionalLibraryDirectories="c:/programme/audio/pd/bin;"..\flext\pd-msvc";C:\Programme\prog\Python24\libs" ! GenerateDebugInformation="TRUE" ! ProgramDatabaseFile="$(outdir)/py.pdb" ! ImportLibrary="$(outdir)/py.lib" TargetMachine="1"/> <Tool *************** *** 275,279 **** Name="VCCLCompilerTool" Optimization="0" ! AdditionalIncludeDirectories=""f:\prog\pd\pd-cvs\src";f:\prog\packs\pthreads;f:\prog\max\flext\source;C:\Programme\prog\Python23\include" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FLEXT_SYS=2;FLEXT_SHARED" BasicRuntimeChecks="3" --- 278,282 ---- Name="VCCLCompilerTool" Optimization="0" ! AdditionalIncludeDirectories=""c:\data\prog\pd\pd-cvs\src";c:\data\prog\packs\pthreads;c:\data\prog\max\flext\source;"C:\data\prog\packs\Python-2.4\include"" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FLEXT_SYS=2;FLEXT_SHARED" BasicRuntimeChecks="3" *************** *** 343,347 **** OmitFramePointers="TRUE" OptimizeForProcessor="3" ! AdditionalIncludeDirectories=""f:\prog\pd\pd-cvs\src";f:\prog\packs\pthreads;f:\prog\max\flext\source;C:\Programme\prog\Python23\include" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FLEXT_SYS=2;FLEXT_SHARED" StringPooling="TRUE" --- 346,350 ---- OmitFramePointers="TRUE" OptimizeForProcessor="3" ! AdditionalIncludeDirectories=""c:\data\prog\pd\pd-cvs\src";c:\data\prog\packs\pthreads;..\flext\source;C:\Programme\prog\Python24\include" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FLEXT_SYS=2;FLEXT_SHARED" StringPooling="TRUE" *************** *** 361,365 **** LinkIncremental="1" SuppressStartupBanner="TRUE" ! AdditionalLibraryDirectories="f:\prog\max\flext\pd-msvc;"f:\prog\pd\pd-cvs/bin";f:\prog\packs\pthreads;C:\Programme\prog\Python23\libs" ProgramDatabaseFile=".\pd-msvc\tr/py.pdb" ImportLibrary="$(outdir)/py.lib" --- 364,368 ---- LinkIncremental="1" SuppressStartupBanner="TRUE" ! AdditionalLibraryDirectories=""..\flext\pd-msvc";"c:\data\prog\pd\pd-cvs/bin";c:\data\prog\packs\pthreads;C:\Programme\prog\Python24\libs" ProgramDatabaseFile=".\pd-msvc\tr/py.pdb" ImportLibrary="$(outdir)/py.lib" *************** *** 470,474 **** Name="VCCLCompilerTool" Optimization="0" ! AdditionalIncludeDirectories=""F:\prog\audio\MaxWinSDK\c74support\msp-includes";"F:\prog\audio\MaxWinSDK\c74support\max-includes";f:\prog\packs\pthreads;f:\prog\max\flext\source;C:\Programme\prog\Python23\include" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FLEXT_SYS=1;FLEXT_THREADS" BasicRuntimeChecks="3" --- 473,477 ---- Name="VCCLCompilerTool" Optimization="0" ! AdditionalIncludeDirectories=""C:\data\prog\audio\maxmspsdk_win\4.5 headers\c74support\msp-includes";"C:\data\prog\audio\maxmspsdk_win\4.5 headers\c74support\max-includes";..\flext\source;C:\Programme\prog\Python24\include" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FLEXT_SYS=1;FLEXT_THREADS" BasicRuntimeChecks="3" *************** *** 486,494 **** <Tool Name="VCLinkerTool" ! AdditionalDependencies="maxapi.lib maxext.lib maxaudio.lib pthreadVC.lib" OutputFile="$(outdir)/py.mxe" LinkIncremental="1" SuppressStartupBanner="TRUE" ! AdditionalLibraryDirectories=""F:\prog\audio\MaxWinSDK\c74support\msp-includes\win-includes\debug";"F:\prog\audio\MaxWinSDK\c74support\max-includes\win-includes\debug";f:\prog\packs\pthreads;"f:\prog\packs\Python-2.3.2\PCbuild"" GenerateDebugInformation="TRUE" ProgramDatabaseFile="$(intdir)/py.pdb" --- 489,497 ---- <Tool Name="VCLinkerTool" ! AdditionalDependencies="maxapi.lib maxaudio.lib pthreadVC.lib" OutputFile="$(outdir)/py.mxe" LinkIncremental="1" SuppressStartupBanner="TRUE" ! AdditionalLibraryDirectories=""C:\data\prog\audio\maxmspsdk_win\4.5 headers\c74support\msp-includes";"C:\data\prog\audio\maxmspsdk_win\4.5 headers\c74support\max-includes";"c:\data\prog\packs\Python-2.4\PCbuild"" GenerateDebugInformation="TRUE" ProgramDatabaseFile="$(intdir)/py.pdb" *************** *** 539,543 **** GlobalOptimizations="FALSE" FavorSizeOrSpeed="1" ! AdditionalIncludeDirectories=""F:\prog\audio\MaxWinSDK\c74support\msp-includes";"F:\prog\audio\MaxWinSDK\c74support\max-includes";f:\prog\packs\pthreads;f:\prog\max\flext\source;C:\Programme\prog\Python23\include" PreprocessorDefinitions="WIN32;_WINDOWS;_USRDLL;FLEXT_SYS=1;FLEXT_THREADS" BasicRuntimeChecks="3" --- 542,546 ---- GlobalOptimizations="FALSE" FavorSizeOrSpeed="1" ! AdditionalIncludeDirectories=""C:\data\prog\audio\maxmspsdk_win\4.5 headers\c74support\msp-includes";"C:\data\prog\audio\maxmspsdk_win\4.5 headers\c74support\max-includes";..\flext\source;C:\Programme\prog\Python24\include" PreprocessorDefinitions="WIN32;_WINDOWS;_USRDLL;FLEXT_SYS=1;FLEXT_THREADS" BasicRuntimeChecks="3" *************** *** 556,564 **** <Tool Name="VCLinkerTool" ! AdditionalDependencies="maxapi.lib maxext.lib maxaudio.lib pthreadVC.lib" OutputFile="./max-msvc/py.mxe" LinkIncremental="1" SuppressStartupBanner="TRUE" ! AdditionalLibraryDirectories=""F:\prog\audio\MaxWinSDK\c74support\msp-includes\win-includes\release";"F:\prog\audio\MaxWinSDK\c74support\max-includes\win-includes\release";f:\prog\packs\pthreads;C:\Programme\prog\Python23\libs" GenerateDebugInformation="FALSE" ProgramDatabaseFile="$(intdir)/py.pdb" --- 559,567 ---- <Tool Name="VCLinkerTool" ! AdditionalDependencies="maxapi.lib maxaudio.lib pthreadVC.lib" OutputFile="./max-msvc/py.mxe" LinkIncremental="1" SuppressStartupBanner="TRUE" ! AdditionalLibraryDirectories=""C:\data\prog\audio\maxmspsdk_win\4.5 headers\c74support\msp-includes";"C:\data\prog\audio\maxmspsdk_win\4.5 headers\c74support\max-includes";C:\Programme\prog\Python24\libs" GenerateDebugInformation="FALSE" ProgramDatabaseFile="$(intdir)/py.pdb"
--- NEW FILE: config-win-pd-msvc.txt --- # 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
Index: readme.txt =================================================================== RCS file: /cvsroot/pure-data/externals/grill/py/readme.txt,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** readme.txt 10 Nov 2004 03:31:34 -0000 1.23 --- readme.txt 17 Dec 2004 05:04:29 -0000 1.24 *************** *** 83,88 **** Version history:
! 0.1.5: - ADD: handling of Python threads
0.1.4: --- 83,89 ---- Version history:
! 0.2.0: - ADD: handling of Python threads + - FIX: output of single atoms instead of 1-element lists
0.1.4:
--- NEW FILE: build-win-pd-msvc.bat --- @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
--- NEW FILE: build-win-max-msvc.bat --- @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
--- build-pd-msvc.bat DELETED ---
--- config-pd-msvc.txt DELETED ---
--- NEW FILE: makefile-win-msvc.txt --- # 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
--- makefile.pd-msvc DELETED ---
--- NEW FILE: config-win-max-msvc.txt --- # 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