Permalink
Browse files

psycollider: remove psycollider

psycollider is history, sced/windows the presence, the new qt ide the future

Signed-off-by: Tim Blechmann <tim@klingt.org>
  • Loading branch information...
1 parent 488a190 commit b31b1b6dc45145117d5dc9bee5028b4181c02d0a @timblechmann timblechmann committed Apr 1, 2012
Showing with 0 additions and 20,793 deletions.
  1. +0 −1 CMakeLists.txt
  2. +0 −3 bindings/CMakeLists.txt
  3. +0 −52 bindings/PySCLang/CMakeLists.txt
  4. +0 −4 bindings/PySCLang/PySCLang.cpp
  5. +0 −3 bindings/PySCLang/PySCLang.def
  6. +0 −1,118 bindings/PySCLang/PySCLang.xcodeproj/project.pbxproj
  7. +0 −264 bindings/PySCLang/PySCLang_Module.cpp
  8. +0 −67 bindings/PySCLang/PySCLang_Module.h
  9. +0 −124 bindings/PySCLang/PySCLang_Module_GUIStuff.cpp
  10. +0 −37 bindings/PySCLang/PySCLang_VM.h
  11. +0 −178 bindings/PySCLang/PySCLang_vpost_stuff.cpp
  12. +0 −73 bindings/PySCLang/ReadMe.txt
  13. +0 −162 bindings/PySCLang/setup.py
  14. +0 −8 bindings/PySCLang/stdafx.cpp
  15. +0 −16 bindings/PySCLang/stdafx.h
  16. +0 −3 editors/CMakeLists.txt
  17. +0 −16 editors/Psycollider/CMakeLists.txt
  18. BIN editors/Psycollider/Psycollider.ico
  19. +0 −1,570 editors/Psycollider/Psycollider.py
  20. +0 −1 editors/Psycollider/keywords.list
  21. +0 −34 editors/Psycollider/setup.py
  22. +0 −56 external_libraries/pycxx-6.2.2/COPYRIGHT
  23. +0 −43 external_libraries/pycxx-6.2.2/CXX/Config.hxx
  24. +0 −43 external_libraries/pycxx-6.2.2/CXX/Exception.hxx
  25. +0 −43 external_libraries/pycxx-6.2.2/CXX/Extensions.hxx
  26. +0 −7 external_libraries/pycxx-6.2.2/CXX/IndirectPythonInterface.hxx
  27. +0 −43 external_libraries/pycxx-6.2.2/CXX/Objects.hxx
  28. +0 −118 external_libraries/pycxx-6.2.2/CXX/Python2/Config.hxx
  29. +0 −17 external_libraries/pycxx-6.2.2/CXX/Python2/CxxDebug.hxx
  30. +0 −259 external_libraries/pycxx-6.2.2/CXX/Python2/Exception.hxx
  31. +0 −208 external_libraries/pycxx-6.2.2/CXX/Python2/ExtensionModule.hxx
  32. +0 −397 external_libraries/pycxx-6.2.2/CXX/Python2/ExtensionOldType.hxx
  33. +0 −403 external_libraries/pycxx-6.2.2/CXX/Python2/ExtensionType.hxx
  34. +0 −177 external_libraries/pycxx-6.2.2/CXX/Python2/ExtensionTypeBase.hxx
  35. +0 −189 external_libraries/pycxx-6.2.2/CXX/Python2/Extensions.hxx
  36. +0 −198 external_libraries/pycxx-6.2.2/CXX/Python2/IndirectPythonInterface.hxx
  37. +0 −3,466 external_libraries/pycxx-6.2.2/CXX/Python2/Objects.hxx
  38. +0 −117 external_libraries/pycxx-6.2.2/CXX/Python2/PythonType.hxx
  39. +0 −110 external_libraries/pycxx-6.2.2/CXX/Python3/Config.hxx
  40. +0 −17 external_libraries/pycxx-6.2.2/CXX/Python3/CxxDebug.hxx
  41. +0 −260 external_libraries/pycxx-6.2.2/CXX/Python3/Exception.hxx
  42. +0 −206 external_libraries/pycxx-6.2.2/CXX/Python3/ExtensionModule.hxx
  43. +0 −398 external_libraries/pycxx-6.2.2/CXX/Python3/ExtensionOldType.hxx
  44. +0 −403 external_libraries/pycxx-6.2.2/CXX/Python3/ExtensionType.hxx
  45. +0 −169 external_libraries/pycxx-6.2.2/CXX/Python3/ExtensionTypeBase.hxx
  46. +0 −189 external_libraries/pycxx-6.2.2/CXX/Python3/Extensions.hxx
  47. +0 −186 external_libraries/pycxx-6.2.2/CXX/Python3/IndirectPythonInterface.hxx
  48. +0 −3,427 external_libraries/pycxx-6.2.2/CXX/Python3/Objects.hxx
  49. +0 −114 external_libraries/pycxx-6.2.2/CXX/Python3/PythonType.hxx
  50. +0 −46 external_libraries/pycxx-6.2.2/CXX/Version.hxx
  51. +0 −60 external_libraries/pycxx-6.2.2/CXX/WrapPython.h
  52. +0 −96 external_libraries/pycxx-6.2.2/README.html
  53. +0 −43 external_libraries/pycxx-6.2.2/Src/IndirectPythonInterface.cxx
  54. +0 −597 external_libraries/pycxx-6.2.2/Src/Python2/IndirectPythonInterface.cxx
  55. +0 −1,848 external_libraries/pycxx-6.2.2/Src/Python2/cxx_extensions.cxx
  56. +0 −49 external_libraries/pycxx-6.2.2/Src/Python2/cxxextensions.c
  57. +0 −174 external_libraries/pycxx-6.2.2/Src/Python2/cxxsupport.cxx
  58. +0 −523 external_libraries/pycxx-6.2.2/Src/Python3/IndirectPythonInterface.cxx
  59. +0 −1,949 external_libraries/pycxx-6.2.2/Src/Python3/cxx_extensions.cxx
  60. +0 −54 external_libraries/pycxx-6.2.2/Src/Python3/cxxextensions.c
  61. +0 −228 external_libraries/pycxx-6.2.2/Src/Python3/cxxsupport.cxx
  62. +0 −43 external_libraries/pycxx-6.2.2/Src/cxx_extensions.cxx
  63. +0 −43 external_libraries/pycxx-6.2.2/Src/cxxextensions.c
  64. +0 −43 external_libraries/pycxx-6.2.2/Src/cxxsupport.cxx
View
@@ -273,7 +273,6 @@ endif()
add_subdirectory(external_libraries)
add_subdirectory(server)
add_subdirectory(lang)
-add_subdirectory(bindings)
add_subdirectory(editors)
add_subdirectory(platform)
View
@@ -1,3 +0,0 @@
-if (SC_PSYCOLLIDER)
- add_subdirectory(PySCLang)
-endif()
@@ -1,52 +0,0 @@
-find_package(PythonLibs)
-
-set(pycxxdir ${CMAKE_SOURCE_DIR}/external_libraries/pycxx-6.2.2)
-
-set(PySCLangSource
- ${pycxxdir}/Src/cxx_extensions.cxx
- ${pycxxdir}/Src/cxxextensions.c
- ${pycxxdir}/Src/cxxsupport.cxx
- ${pycxxdir}/Src/IndirectPythonInterface.cxx
-
- PySCLang_Module.cpp
- PySCLang_Module_GUIStuff.cpp
- PySCLang_vpost_stuff.cpp
-)
-
-if(WIN32)
- list(APPEND PySCLangSource PySCLang.cpp)
-endif()
-
-include_directories(${PYTHON_INCLUDE_PATH})
-include_directories(${pycxxdir})
-
-include_directories(${CMAKE_SOURCE_DIR}/include/common
- ${CMAKE_SOURCE_DIR}/include/lang
- ${CMAKE_SOURCE_DIR}/include/plugin_interface
- ${CMAKE_SOURCE_DIR}/editors/scapp/include
- )
-
-add_library(PySCLang MODULE ${PySCLangSource})
-set_target_properties(PySCLang
- PROPERTIES LINKER_LANGUAGE C
- PREFIX ""
- SUFFIX .pyd)
-
-target_link_libraries(PySCLang ${PYTHON_LIBRARY})
-target_link_libraries(PySCLang libsclang)
-
-if (WIN32)
- install(TARGETS PySCLang
- DESTINATION "SuperCollider")
-
- install(FILES ${PYTHON_LIBRARY}
- DESTINATION "SuperCollider")
-
-elseif (CMAKE_SYSTEM_NAME MATCHES "Linux")
- find_package(PythonInterp)
-
- execute_process ( COMMAND ${PYTHON_EXECUTABLE} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()"
- OUTPUT_VARIABLE PYTHON_SITE_PACKAGES OUTPUT_STRIP_TRAILING_WHITESPACE)
-
- install(TARGETS PySCLang DESTINATION ${PYTHON_SITE_PACKAGES})
-endif()
@@ -1,4 +0,0 @@
-// PySCLang.cpp : Defines the entry point for the DLL application.
-//
-
-#include "stdafx.h"
@@ -1,3 +0,0 @@
-EXPORTS
- initPySCLang_d
- initPySCLang

Large diffs are not rendered by default.

Oops, something went wrong.
@@ -1,264 +0,0 @@
-/*
- * File: PYSCLang_Module.cpp
- * Project : Psycollider
- *
- * by:
- * Benjamin Golinvaux
- * benjamin.golinvaux@euresys.com
- * messenger: bgolinvaux@hotmail.com
- *
- * currently maintained by:
- * Christopher Frauenberger
- * frauenberger@iem.at
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
- * USA
- *
- */
-
-#ifndef SC_WIN32
-#include "CXX/Objects.hxx"
-#include "CXX/Extensions.hxx"
-#else
-#include "stdafx.h"
-#endif
-
-#include "PySCLang_Module.h"
-
-extern "C" {
- void initPySCLang()
- {
-#if defined(PY_WIN32_DELAYLOAD_PYTHON_DLL)
- Py::InitialisePythonIndirectInterface();
-#endif
- static PySCLang_Module* thePySCLang_Module = new PySCLang_Module;
- }
-}
-
-ChangeCounter gUIChangeCounter;
-
-extern bool compiledOK;
-extern pthread_mutex_t gLangMutex;
-extern PyrSymbol *s_tick;
-
-PyrString* newPyrStringN(class PyrGC *gc, long length, long flags, bool collect);
-void dumpByteCodes(PyrBlock *theBlock);
-
-void flushPostBuf();
-// void SetupHomeDirectory();
-double elapsedTime();
-
-extern char *gHomePath;
-
-#ifdef SC_WIN32
-void PySCLang_InitNetwork( )
-{
-#ifdef SC_WIN32_STATIC_PTHREADS
- // initialize statically linked pthreads library
- pthread_win32_process_attach_np();
-#endif
-
- // initialize winsock
- WSAData wsaData;
- int nCode;
-
- if ((nCode = WSAStartup(MAKEWORD(1, 1), &wsaData)) != 0) {
- char msg[1024];
- sprintf(msg, "WSAStartup() failed with error code %d.\n", nCode );
- ::MessageBox(NULL,msg,"Error",MB_OK);
- }
-}
-#endif
-
-// triggered for app clock ticks
-extern "C" void *appClockTimer(void * pymod) {
- ((PySCLang_Module *)pymod)->appClock();
- return NULL;
-}
-
-void PySCLang_Module::appClock() {
- while(true) {
- pthread_mutex_lock(&gLangMutex);
- if (compiledOK) runLibrary(getsym("tick"));
- pthread_mutex_unlock(&gLangMutex);
-
-#ifdef SC_WIN32
- Sleep(20); // Sleep (windows) takes a time in milliseconds
-#else
- usleep(20000); // usleep (posix) takes a time in microseconds
-#endif
- }
-}
-
- PySCLang_Module::PySCLang_Module() : ExtensionModule<PySCLang_Module>( "PySCLang" )
- {
-#ifdef SC_WIN32
- PySCLang_InitNetwork( );
-#endif
- add_varargs_method("sendMain", &PySCLang_Module::sendMain, "sendMain");
- add_varargs_method("compileLibrary", &PySCLang_Module::compileLibrary, "compileLibrary");
- add_varargs_method("setCmdLine", &PySCLang_Module::setCmdLine, "setCmdLine");
- add_varargs_method("start", &PySCLang_Module::start, "start");
- add_varargs_method("setSCLogSink", &PySCLang_Module::setSCLogSink, "setSCLogSink");
- add_varargs_method("compiledOK", &PySCLang_Module::compiledOK__, "compiledOK");
- add_varargs_method("setPyPrOpenWinTextFile", &PySCLang_Module::setPyPrOpenWinTextFile, "setPyPrOpenWinTextFile callable with (path,startRange,rangeSize)");
-
- initialize( "<documentation for the PySCLang_Module forthcoming>" );
- }
-
-
-
-// symbol required for the debug version
-extern "C" {
- void initPySCLang_d() {
- initPySCLang();
- }
-}
-
-Py::Object PySCLang_Module::sendMain(const Py::Tuple &a)
-{
- if(a.size() != 1) {
- PyErr_SetString(PyExc_IndexError,"requires 1 string argument");
- return Py::Object(Py::Null());
- }
- if (!compiledOK) {
- PyErr_SetString(PyExc_RuntimeError,"PySCLang: The library has not been compiled successfully");
- return Py::Object(Py::Null());
- }
- Py::String pystr(a[0]);
- std::string str = pystr;
- const char* methodName = str.c_str();
- pthread_mutex_lock(&gLangMutex);
- runLibrary(getsym(methodName));
- pthread_mutex_unlock(&gLangMutex);
- if (PyErr_Occurred( ) != NULL) // there might be python calls from within sclang
- return Py::Object(Py::Null());
- return Py::Nothing();
-}
-
-Py::Object PySCLang_Module::compileLibrary(const Py::Tuple &a)
-{
- if(a.size() != 0) {
- PyErr_SetString(PyExc_IndexError,"requires 0 args");
- return Py::Object(Py::Null());
- }
- ::compileLibrary( );
- return Py::Nothing();
-}
-
-Py::Object PySCLang_Module::setCmdLine(const Py::Tuple &a)
-{
- if(a.size() != 1) {
- PyErr_SetString(PyExc_IndexError,"requires 1 string argument");
- return Py::Object(Py::Null());
- }
- Py::String pystr(a[0]);
- const char* text = ::PyString_AsString(pystr.ptr());
- int length = strlen(text);
-
- if (!compiledOK) {
- PyErr_SetString(PyExc_RuntimeError,"PySCLang: The library has not been compiled successfully");
- return Py::Object(Py::Null());
- }
- pthread_mutex_lock(&gLangMutex);
-
- if (compiledOK) {
- VMGlobals *g = gMainVMGlobals;
-
- int textlen = length;
- PyrString* strobj = newPyrStringN(g->gc, textlen, 0, true);
- memcpy(strobj->s, (char*)text, textlen);
-
- SetObject(&slotRawInterpreter(&g->process->interpreter)->cmdLine, strobj);
- g->gc->GCWrite(slotRawObject(&g->process->interpreter), strobj);
- }
- pthread_mutex_unlock(&gLangMutex);
- return Py::Nothing();
-}
-
-Py::Object PySCLang_Module::compiledOK__(const Py::Tuple &a)
-{
- if(a.size() != 0) {
- PyErr_SetString(PyExc_IndexError,"requires 0 args");
- return Py::Object(Py::Null());
- }
- if( compiledOK )
- return Py::Int(1);
- else
- return Py::Int(0);
-}
-
-Py::Object PySCLang_Module::start(const Py::Tuple &a)
-{
- if(a.size() != 0) {
- PyErr_SetString(PyExc_IndexError,"requires 0 args");
- return Py::Object(Py::Null());
- }
- pyr_init_mem_pools( 2*1024*1024, 256*1024 );
- init_OSC(57120);
- schedInit();
- ::compileLibrary();
-
- // appClock timer
- pthread_t t;
- pthread_create(&t, NULL, &appClockTimer, (void *)this);
-
- // deferred task timer still missing... (cf, 16 May 2006)
-
-//!!!
-// Rendezvous is broken in a way that makes SC become unusable
-// // CR ADDED
-// [[RendezvousClient sharedClient] findOSCServices];
-//!!!
- return Py::Nothing();
-}
-
-PyObject* PySCLang_Module::scLogSink_s = NULL;
-PyObject* PySCLang_Module::PyPrOpenWinTextFile_s = NULL;
-
-Py::Object PySCLang_Module::setPyPrOpenWinTextFile(const Py::Tuple &a)
-{
- if(a.size() != 1) {
- PyErr_SetString(PyExc_IndexError,"requires 1 callable argument");
- return Py::Object(Py::Null());
- }
- PyObject* openTextFile = a[0].ptr();
- if( PyCallable_Check( openTextFile ) == 0)
- PyErr_SetString(PyExc_TypeError,"object must be callable");
- else {
- PyPrOpenWinTextFile_s = openTextFile;
- Py_INCREF(openTextFile);
- }
- return Py::Nothing();
-}
-
-
-Py::Object PySCLang_Module::setSCLogSink(const Py::Tuple &a)
-{
- if(a.size() != 1) {
- PyErr_SetString(PyExc_IndexError,"requires 1 callable argument");
- return Py::Object(Py::Null());
- }
- PyObject* logSink = a[0].ptr();
- if( PyCallable_Check( logSink ) == 0)
- PyErr_SetString(PyExc_TypeError,"object must be callable");
- else {
- scLogSink_s = logSink;
- Py_INCREF(logSink);
- }
- return Py::Nothing();
-}
-
-
Oops, something went wrong.

0 comments on commit b31b1b6

Please sign in to comment.