From d4882688df6cbd2454f344da6a2a573e2575a7e0 Mon Sep 17 00:00:00 2001 From: David Anthoff Date: Fri, 11 Apr 2014 14:34:26 -0700 Subject: [PATCH 1/2] Move everything from pythonnet folder to root folder Main reason is that setup.py should be in root. --- ...me.dll.config => Python.Runtime.dll.config | 0 pythonnet/VS_README.txt => VS_README.txt | 0 {pythonnet/demo => demo}/helloform.py | 0 {pythonnet/demo => demo}/splitter.py | 0 {pythonnet/demo => demo}/wordpad.py | 0 .../doc => doc}/Python.Runtime.dll.config | 0 {pythonnet/doc => doc}/TODO.txt | 0 {pythonnet/doc => doc}/changes.txt | 0 {pythonnet/doc => doc}/mono_config.txt | 0 .../installer => installer}/installer.iss | 0 {pythonnet/installer => installer}/left.bmp | Bin .../installer => installer}/license.txt | 0 {pythonnet/installer => installer}/top.bmp | Bin .../monopythonnet.mds => monopythonnet.mds | 0 ...onnet.userprefs => monopythonnet.userprefs | 0 pythonnet/pythonnet.build => pythonnet.build | 0 pythonnet/pythonnet.sln => pythonnet.sln | 230 ++++----- pythonnet/pythonnet.snk => pythonnet.snk | Bin pythonnet/pythonnet_8.sln => pythonnet_8.sln | 172 +++---- pythonnet/pythonnet_9.sln => pythonnet_9.sln | 174 +++---- pythonnet/setup.py => setup.py | 0 {pythonnet/src => src}/clrmodule/ClrModule.cs | 230 ++++----- .../clrmodule/Properties/AssemblyInfo.cs | 72 +-- .../src => src}/clrmodule/clrmodule.csproj | 250 ++++----- .../src => src}/clrmodule/packages.config | 6 +- {pythonnet/src => src}/console/Console.csproj | 428 ++++++++-------- {pythonnet/src => src}/console/Console.mdp | 0 {pythonnet/src => src}/console/app.config | 6 +- .../src => src}/console/assemblyinfo.cs | 0 .../src => src}/console/python-clear.ico | Bin .../src => src}/console/pythonconsole.cs | 0 .../src => src}/console/sourceforge-logo.png | Bin .../embed_tests/Embeddingtest.VisualState.xml | 40 +- .../embed_tests/Embeddingtest.nunit | 12 +- .../embed_tests/Python.EmbeddingTest.csproj | 356 ++++++------- .../src => src}/embed_tests/packages.config | 0 .../src => src}/embed_tests/pyimport.cs | 0 {pythonnet/src => src}/embed_tests/pyiter.cs | 0 {pythonnet/src => src}/embed_tests/pylong.cs | 68 +-- .../src => src}/embed_tests/pyobject.cs | 0 .../embed_tests/pythonexception.cs | 0 {pythonnet/src => src}/monoclr/clrmod.c | 0 {pythonnet/src => src}/monoclr/clrpython.c | 0 {pythonnet/src => src}/monoclr/pynetclr.h | 0 {pythonnet/src => src}/monoclr/pynetinit.c | 0 {pythonnet/src => src}/monoclr/python.c | 0 .../src => src}/runtime/Python.Runtime.csproj | 380 +++++++------- .../src => src}/runtime/Python.Runtime.mdp | 0 {pythonnet/src => src}/runtime/arrayobject.cs | 0 .../src => src}/runtime/assemblyinfo.cs | 0 .../src => src}/runtime/assemblymanager.cs | 0 .../src => src}/runtime/buildclrmodule.bat | 72 +-- {pythonnet/src => src}/runtime/classbase.cs | 0 .../src => src}/runtime/classmanager.cs | 0 {pythonnet/src => src}/runtime/classobject.cs | 0 {pythonnet/src => src}/runtime/clrmodule.il | 0 .../src => src}/runtime/clrmodule.pp.il | 0 {pythonnet/src => src}/runtime/clrobject.cs | 0 .../src => src}/runtime/codegenerator.cs | 0 .../src => src}/runtime/constructorbinder.cs | 0 .../src => src}/runtime/constructorbinding.cs | 474 +++++++++--------- {pythonnet/src => src}/runtime/converter.cs | 0 {pythonnet/src => src}/runtime/debughelper.cs | 0 .../src => src}/runtime/delegatemanager.cs | 0 .../src => src}/runtime/delegateobject.cs | 0 .../src => src}/runtime/eventbinding.cs | 0 {pythonnet/src => src}/runtime/eventobject.cs | 0 {pythonnet/src => src}/runtime/exceptions.cs | 0 .../src => src}/runtime/extensiontype.cs | 0 {pythonnet/src => src}/runtime/fieldobject.cs | 0 {pythonnet/src => src}/runtime/generictype.cs | 0 {pythonnet/src => src}/runtime/genericutil.cs | 0 {pythonnet/src => src}/runtime/importhook.cs | 0 {pythonnet/src => src}/runtime/indexer.cs | 0 .../src => src}/runtime/interfaceobject.cs | 0 {pythonnet/src => src}/runtime/interfaces.cs | 0 {pythonnet/src => src}/runtime/interop.cs | 0 {pythonnet/src => src}/runtime/iterator.cs | 0 {pythonnet/src => src}/runtime/managedtype.cs | 0 {pythonnet/src => src}/runtime/metatype.cs | 0 .../src => src}/runtime/methodbinder.cs | 0 .../src => src}/runtime/methodbinding.cs | 0 .../src => src}/runtime/methodobject.cs | 0 .../src => src}/runtime/methodwrapper.cs | 0 .../runtime/modulefunctionobject.cs | 0 .../src => src}/runtime/moduleobject.cs | 0 .../runtime/modulepropertyobject.cs | 0 {pythonnet/src => src}/runtime/monosupport.cs | 0 {pythonnet/src => src}/runtime/nativecall.cs | 0 {pythonnet/src => src}/runtime/oldmodule.il | 0 {pythonnet/src => src}/runtime/overload.cs | 0 .../src => src}/runtime/propertyobject.cs | 0 .../src => src}/runtime/pyansistring.cs | 162 +++--- {pythonnet/src => src}/runtime/pydict.cs | 0 {pythonnet/src => src}/runtime/pyfloat.cs | 0 {pythonnet/src => src}/runtime/pyint.cs | 0 {pythonnet/src => src}/runtime/pyiter.cs | 0 {pythonnet/src => src}/runtime/pylist.cs | 0 {pythonnet/src => src}/runtime/pylong.cs | 0 {pythonnet/src => src}/runtime/pynumber.cs | 0 {pythonnet/src => src}/runtime/pyobject.cs | 0 {pythonnet/src => src}/runtime/pysequence.cs | 0 {pythonnet/src => src}/runtime/pystring.cs | 0 .../src => src}/runtime/pythonengine.cs | 0 .../src => src}/runtime/pythonexception.cs | 0 {pythonnet/src => src}/runtime/pytuple.cs | 0 {pythonnet/src => src}/runtime/runtime.cs | 0 {pythonnet/src => src}/runtime/typemanager.cs | 0 {pythonnet/src => src}/runtime/typemethod.cs | 0 .../runtime/x64/clrmodule-platform.il | 22 +- .../runtime/x86/clrmodule-platform.il | 22 +- .../src => src}/testing/Python.Test.csproj | 294 +++++------ .../src => src}/testing/Python.Test.mdp | 0 {pythonnet/src => src}/testing/arraytest.cs | 0 {pythonnet/src => src}/testing/classtest.cs | 0 .../src => src}/testing/constructortests.cs | 0 .../src => src}/testing/conversiontest.cs | 0 .../src => src}/testing/delegatetest.cs | 0 {pythonnet/src => src}/testing/doctest.cs | 0 {pythonnet/src => src}/testing/enumtest.cs | 0 {pythonnet/src => src}/testing/eventtest.cs | 0 .../src => src}/testing/exceptiontest.cs | 0 {pythonnet/src => src}/testing/fieldtest.cs | 0 {pythonnet/src => src}/testing/generictest.cs | 0 {pythonnet/src => src}/testing/globaltest.cs | 0 {pythonnet/src => src}/testing/indexertest.cs | 0 .../src => src}/testing/interfacetest.cs | 0 {pythonnet/src => src}/testing/methodtest.cs | 0 .../src => src}/testing/propertytest.cs | 0 {pythonnet/src => src}/testing/threadtest.cs | 0 .../tests/PyImportTest/__init__.py | 0 .../tests/PyImportTest/test/__init__.py | 0 .../tests/PyImportTest/test/one.py | 0 {pythonnet/src => src}/tests/leaktest.py | 0 {pythonnet/src => src}/tests/profile.py | 0 {pythonnet/src => src}/tests/runtests.py | 0 {pythonnet/src => src}/tests/stress.py | 0 {pythonnet/src => src}/tests/stresstest.py | 0 {pythonnet/src => src}/tests/test_array.py | 0 {pythonnet/src => src}/tests/test_class.py | 0 {pythonnet/src => src}/tests/test_compat.py | 0 .../src => src}/tests/test_constructors.py | 0 .../src => src}/tests/test_conversion.py | 0 {pythonnet/src => src}/tests/test_delegate.py | 0 .../src => src}/tests/test_docstring.py | 0 {pythonnet/src => src}/tests/test_engine.py | 0 {pythonnet/src => src}/tests/test_enum.py | 0 {pythonnet/src => src}/tests/test_event.py | 0 .../src => src}/tests/test_exceptions.py | 0 {pythonnet/src => src}/tests/test_field.py | 0 {pythonnet/src => src}/tests/test_generic.py | 0 {pythonnet/src => src}/tests/test_indexer.py | 0 .../src => src}/tests/test_interface.py | 0 {pythonnet/src => src}/tests/test_method.py | 0 {pythonnet/src => src}/tests/test_module.py | 0 {pythonnet/src => src}/tests/test_property.py | 0 {pythonnet/src => src}/tests/test_thread.py | 0 {pythonnet/src => src}/tests/warnfilter.py | 0 {pythonnet/tools => tools}/nuget/nuget.exe | Bin 159 files changed, 1735 insertions(+), 1735 deletions(-) rename pythonnet/Python.Runtime.dll.config => Python.Runtime.dll.config (100%) rename pythonnet/VS_README.txt => VS_README.txt (100%) rename {pythonnet/demo => demo}/helloform.py (100%) rename {pythonnet/demo => demo}/splitter.py (100%) rename {pythonnet/demo => demo}/wordpad.py (100%) rename {pythonnet/doc => doc}/Python.Runtime.dll.config (100%) rename {pythonnet/doc => doc}/TODO.txt (100%) rename {pythonnet/doc => doc}/changes.txt (100%) mode change 100755 => 100644 rename {pythonnet/doc => doc}/mono_config.txt (100%) rename {pythonnet/installer => installer}/installer.iss (100%) mode change 100755 => 100644 rename {pythonnet/installer => installer}/left.bmp (100%) mode change 100755 => 100644 rename {pythonnet/installer => installer}/license.txt (100%) mode change 100755 => 100644 rename {pythonnet/installer => installer}/top.bmp (100%) mode change 100755 => 100644 rename pythonnet/monopythonnet.mds => monopythonnet.mds (100%) rename pythonnet/monopythonnet.userprefs => monopythonnet.userprefs (100%) rename pythonnet/pythonnet.build => pythonnet.build (100%) mode change 100755 => 100644 rename pythonnet/pythonnet.sln => pythonnet.sln (98%) rename pythonnet/pythonnet.snk => pythonnet.snk (100%) rename pythonnet/pythonnet_8.sln => pythonnet_8.sln (98%) rename pythonnet/pythonnet_9.sln => pythonnet_9.sln (98%) rename pythonnet/setup.py => setup.py (100%) rename {pythonnet/src => src}/clrmodule/ClrModule.cs (97%) rename {pythonnet/src => src}/clrmodule/Properties/AssemblyInfo.cs (97%) rename {pythonnet/src => src}/clrmodule/clrmodule.csproj (98%) rename {pythonnet/src => src}/clrmodule/packages.config (97%) rename {pythonnet/src => src}/console/Console.csproj (97%) rename {pythonnet/src => src}/console/Console.mdp (100%) rename {pythonnet/src => src}/console/app.config (97%) rename {pythonnet/src => src}/console/assemblyinfo.cs (100%) rename {pythonnet/src => src}/console/python-clear.ico (100%) rename {pythonnet/src => src}/console/pythonconsole.cs (100%) rename {pythonnet/src => src}/console/sourceforge-logo.png (100%) rename {pythonnet/src => src}/embed_tests/Embeddingtest.VisualState.xml (98%) rename {pythonnet/src => src}/embed_tests/Embeddingtest.nunit (97%) rename {pythonnet/src => src}/embed_tests/Python.EmbeddingTest.csproj (97%) rename {pythonnet/src => src}/embed_tests/packages.config (100%) rename {pythonnet/src => src}/embed_tests/pyimport.cs (100%) rename {pythonnet/src => src}/embed_tests/pyiter.cs (100%) rename {pythonnet/src => src}/embed_tests/pylong.cs (95%) rename {pythonnet/src => src}/embed_tests/pyobject.cs (100%) rename {pythonnet/src => src}/embed_tests/pythonexception.cs (100%) rename {pythonnet/src => src}/monoclr/clrmod.c (100%) rename {pythonnet/src => src}/monoclr/clrpython.c (100%) rename {pythonnet/src => src}/monoclr/pynetclr.h (100%) rename {pythonnet/src => src}/monoclr/pynetinit.c (100%) rename {pythonnet/src => src}/monoclr/python.c (100%) rename {pythonnet/src => src}/runtime/Python.Runtime.csproj (97%) rename {pythonnet/src => src}/runtime/Python.Runtime.mdp (100%) rename {pythonnet/src => src}/runtime/arrayobject.cs (100%) rename {pythonnet/src => src}/runtime/assemblyinfo.cs (100%) rename {pythonnet/src => src}/runtime/assemblymanager.cs (100%) rename {pythonnet/src => src}/runtime/buildclrmodule.bat (96%) rename {pythonnet/src => src}/runtime/classbase.cs (100%) rename {pythonnet/src => src}/runtime/classmanager.cs (100%) rename {pythonnet/src => src}/runtime/classobject.cs (100%) rename {pythonnet/src => src}/runtime/clrmodule.il (100%) mode change 100755 => 100644 rename {pythonnet/src => src}/runtime/clrmodule.pp.il (100%) rename {pythonnet/src => src}/runtime/clrobject.cs (100%) rename {pythonnet/src => src}/runtime/codegenerator.cs (100%) rename {pythonnet/src => src}/runtime/constructorbinder.cs (100%) rename {pythonnet/src => src}/runtime/constructorbinding.cs (97%) rename {pythonnet/src => src}/runtime/converter.cs (100%) rename {pythonnet/src => src}/runtime/debughelper.cs (100%) rename {pythonnet/src => src}/runtime/delegatemanager.cs (100%) rename {pythonnet/src => src}/runtime/delegateobject.cs (100%) rename {pythonnet/src => src}/runtime/eventbinding.cs (100%) rename {pythonnet/src => src}/runtime/eventobject.cs (100%) rename {pythonnet/src => src}/runtime/exceptions.cs (100%) rename {pythonnet/src => src}/runtime/extensiontype.cs (100%) rename {pythonnet/src => src}/runtime/fieldobject.cs (100%) rename {pythonnet/src => src}/runtime/generictype.cs (100%) rename {pythonnet/src => src}/runtime/genericutil.cs (100%) rename {pythonnet/src => src}/runtime/importhook.cs (100%) rename {pythonnet/src => src}/runtime/indexer.cs (100%) rename {pythonnet/src => src}/runtime/interfaceobject.cs (100%) rename {pythonnet/src => src}/runtime/interfaces.cs (100%) rename {pythonnet/src => src}/runtime/interop.cs (100%) rename {pythonnet/src => src}/runtime/iterator.cs (100%) rename {pythonnet/src => src}/runtime/managedtype.cs (100%) rename {pythonnet/src => src}/runtime/metatype.cs (100%) rename {pythonnet/src => src}/runtime/methodbinder.cs (100%) rename {pythonnet/src => src}/runtime/methodbinding.cs (100%) rename {pythonnet/src => src}/runtime/methodobject.cs (100%) rename {pythonnet/src => src}/runtime/methodwrapper.cs (100%) rename {pythonnet/src => src}/runtime/modulefunctionobject.cs (100%) rename {pythonnet/src => src}/runtime/moduleobject.cs (100%) rename {pythonnet/src => src}/runtime/modulepropertyobject.cs (100%) rename {pythonnet/src => src}/runtime/monosupport.cs (100%) rename {pythonnet/src => src}/runtime/nativecall.cs (100%) rename {pythonnet/src => src}/runtime/oldmodule.il (100%) mode change 100755 => 100644 rename {pythonnet/src => src}/runtime/overload.cs (100%) rename {pythonnet/src => src}/runtime/propertyobject.cs (100%) rename {pythonnet/src => src}/runtime/pyansistring.cs (96%) rename {pythonnet/src => src}/runtime/pydict.cs (100%) rename {pythonnet/src => src}/runtime/pyfloat.cs (100%) rename {pythonnet/src => src}/runtime/pyint.cs (100%) rename {pythonnet/src => src}/runtime/pyiter.cs (100%) rename {pythonnet/src => src}/runtime/pylist.cs (100%) rename {pythonnet/src => src}/runtime/pylong.cs (100%) rename {pythonnet/src => src}/runtime/pynumber.cs (100%) rename {pythonnet/src => src}/runtime/pyobject.cs (100%) rename {pythonnet/src => src}/runtime/pysequence.cs (100%) rename {pythonnet/src => src}/runtime/pystring.cs (100%) rename {pythonnet/src => src}/runtime/pythonengine.cs (100%) rename {pythonnet/src => src}/runtime/pythonexception.cs (100%) rename {pythonnet/src => src}/runtime/pytuple.cs (100%) rename {pythonnet/src => src}/runtime/runtime.cs (100%) rename {pythonnet/src => src}/runtime/typemanager.cs (100%) rename {pythonnet/src => src}/runtime/typemethod.cs (100%) rename {pythonnet/src => src}/runtime/x64/clrmodule-platform.il (98%) rename {pythonnet/src => src}/runtime/x86/clrmodule-platform.il (98%) rename {pythonnet/src => src}/testing/Python.Test.csproj (98%) rename {pythonnet/src => src}/testing/Python.Test.mdp (100%) rename {pythonnet/src => src}/testing/arraytest.cs (100%) rename {pythonnet/src => src}/testing/classtest.cs (100%) rename {pythonnet/src => src}/testing/constructortests.cs (100%) rename {pythonnet/src => src}/testing/conversiontest.cs (100%) rename {pythonnet/src => src}/testing/delegatetest.cs (100%) rename {pythonnet/src => src}/testing/doctest.cs (100%) rename {pythonnet/src => src}/testing/enumtest.cs (100%) rename {pythonnet/src => src}/testing/eventtest.cs (100%) rename {pythonnet/src => src}/testing/exceptiontest.cs (100%) rename {pythonnet/src => src}/testing/fieldtest.cs (100%) rename {pythonnet/src => src}/testing/generictest.cs (100%) rename {pythonnet/src => src}/testing/globaltest.cs (100%) rename {pythonnet/src => src}/testing/indexertest.cs (100%) rename {pythonnet/src => src}/testing/interfacetest.cs (100%) rename {pythonnet/src => src}/testing/methodtest.cs (100%) rename {pythonnet/src => src}/testing/propertytest.cs (100%) rename {pythonnet/src => src}/testing/threadtest.cs (100%) rename {pythonnet/src => src}/tests/PyImportTest/__init__.py (100%) rename {pythonnet/src => src}/tests/PyImportTest/test/__init__.py (100%) rename {pythonnet/src => src}/tests/PyImportTest/test/one.py (100%) rename {pythonnet/src => src}/tests/leaktest.py (100%) mode change 100755 => 100644 rename {pythonnet/src => src}/tests/profile.py (100%) mode change 100755 => 100644 rename {pythonnet/src => src}/tests/runtests.py (100%) mode change 100755 => 100644 rename {pythonnet/src => src}/tests/stress.py (100%) mode change 100755 => 100644 rename {pythonnet/src => src}/tests/stresstest.py (100%) mode change 100755 => 100644 rename {pythonnet/src => src}/tests/test_array.py (100%) rename {pythonnet/src => src}/tests/test_class.py (100%) rename {pythonnet/src => src}/tests/test_compat.py (100%) rename {pythonnet/src => src}/tests/test_constructors.py (100%) rename {pythonnet/src => src}/tests/test_conversion.py (100%) rename {pythonnet/src => src}/tests/test_delegate.py (100%) rename {pythonnet/src => src}/tests/test_docstring.py (100%) rename {pythonnet/src => src}/tests/test_engine.py (100%) rename {pythonnet/src => src}/tests/test_enum.py (100%) rename {pythonnet/src => src}/tests/test_event.py (100%) rename {pythonnet/src => src}/tests/test_exceptions.py (100%) rename {pythonnet/src => src}/tests/test_field.py (100%) rename {pythonnet/src => src}/tests/test_generic.py (100%) rename {pythonnet/src => src}/tests/test_indexer.py (100%) rename {pythonnet/src => src}/tests/test_interface.py (100%) rename {pythonnet/src => src}/tests/test_method.py (100%) rename {pythonnet/src => src}/tests/test_module.py (100%) rename {pythonnet/src => src}/tests/test_property.py (100%) rename {pythonnet/src => src}/tests/test_thread.py (100%) rename {pythonnet/src => src}/tests/warnfilter.py (100%) rename {pythonnet/tools => tools}/nuget/nuget.exe (100%) diff --git a/pythonnet/Python.Runtime.dll.config b/Python.Runtime.dll.config similarity index 100% rename from pythonnet/Python.Runtime.dll.config rename to Python.Runtime.dll.config diff --git a/pythonnet/VS_README.txt b/VS_README.txt similarity index 100% rename from pythonnet/VS_README.txt rename to VS_README.txt diff --git a/pythonnet/demo/helloform.py b/demo/helloform.py similarity index 100% rename from pythonnet/demo/helloform.py rename to demo/helloform.py diff --git a/pythonnet/demo/splitter.py b/demo/splitter.py similarity index 100% rename from pythonnet/demo/splitter.py rename to demo/splitter.py diff --git a/pythonnet/demo/wordpad.py b/demo/wordpad.py similarity index 100% rename from pythonnet/demo/wordpad.py rename to demo/wordpad.py diff --git a/pythonnet/doc/Python.Runtime.dll.config b/doc/Python.Runtime.dll.config similarity index 100% rename from pythonnet/doc/Python.Runtime.dll.config rename to doc/Python.Runtime.dll.config diff --git a/pythonnet/doc/TODO.txt b/doc/TODO.txt similarity index 100% rename from pythonnet/doc/TODO.txt rename to doc/TODO.txt diff --git a/pythonnet/doc/changes.txt b/doc/changes.txt old mode 100755 new mode 100644 similarity index 100% rename from pythonnet/doc/changes.txt rename to doc/changes.txt diff --git a/pythonnet/doc/mono_config.txt b/doc/mono_config.txt similarity index 100% rename from pythonnet/doc/mono_config.txt rename to doc/mono_config.txt diff --git a/pythonnet/installer/installer.iss b/installer/installer.iss old mode 100755 new mode 100644 similarity index 100% rename from pythonnet/installer/installer.iss rename to installer/installer.iss diff --git a/pythonnet/installer/left.bmp b/installer/left.bmp old mode 100755 new mode 100644 similarity index 100% rename from pythonnet/installer/left.bmp rename to installer/left.bmp diff --git a/pythonnet/installer/license.txt b/installer/license.txt old mode 100755 new mode 100644 similarity index 100% rename from pythonnet/installer/license.txt rename to installer/license.txt diff --git a/pythonnet/installer/top.bmp b/installer/top.bmp old mode 100755 new mode 100644 similarity index 100% rename from pythonnet/installer/top.bmp rename to installer/top.bmp diff --git a/pythonnet/monopythonnet.mds b/monopythonnet.mds similarity index 100% rename from pythonnet/monopythonnet.mds rename to monopythonnet.mds diff --git a/pythonnet/monopythonnet.userprefs b/monopythonnet.userprefs similarity index 100% rename from pythonnet/monopythonnet.userprefs rename to monopythonnet.userprefs diff --git a/pythonnet/pythonnet.build b/pythonnet.build old mode 100755 new mode 100644 similarity index 100% rename from pythonnet/pythonnet.build rename to pythonnet.build diff --git a/pythonnet/pythonnet.sln b/pythonnet.sln similarity index 98% rename from pythonnet/pythonnet.sln rename to pythonnet.sln index 14c73d359..64bf45fa2 100644 --- a/pythonnet/pythonnet.sln +++ b/pythonnet.sln @@ -1,115 +1,115 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2013 -VisualStudioVersion = 12.0.30110.0 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Python.Runtime", "src\runtime\Python.Runtime.csproj", "{097B4AC0-74E9-4C58-BCF8-C69746EC8271}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Python.Test", "src\testing\Python.Test.csproj", "{6F401A34-273B-450F-9A4C-13550BE0767B}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Python.EmbeddingTest", "src\embed_tests\Python.EmbeddingTest.csproj", "{4165C59D-2822-499F-A6DB-EACA4C331EB5}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Console", "src\console\Console.csproj", "{E29DCF0A-5114-4A98-B1DD-71264B6EA349}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "clrmodule", "src\clrmodule\clrmodule.csproj", "{86E834DE-1139-4511-96CC-69636A56E7AC}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - DebugMono|x64 = DebugMono|x64 - DebugMono|x86 = DebugMono|x86 - DebugWin|x64 = DebugWin|x64 - DebugWin|x86 = DebugWin|x86 - ReleaseMono|x64 = ReleaseMono|x64 - ReleaseMono|x86 = ReleaseMono|x86 - ReleaseWin|x64 = ReleaseWin|x64 - ReleaseWin|x86 = ReleaseWin|x86 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {097B4AC0-74E9-4C58-BCF8-C69746EC8271}.DebugMono|x64.ActiveCfg = DebugMono|x64 - {097B4AC0-74E9-4C58-BCF8-C69746EC8271}.DebugMono|x64.Build.0 = DebugMono|x64 - {097B4AC0-74E9-4C58-BCF8-C69746EC8271}.DebugMono|x86.ActiveCfg = DebugMono|x86 - {097B4AC0-74E9-4C58-BCF8-C69746EC8271}.DebugMono|x86.Build.0 = DebugMono|x86 - {097B4AC0-74E9-4C58-BCF8-C69746EC8271}.DebugWin|x64.ActiveCfg = DebugWin|x64 - {097B4AC0-74E9-4C58-BCF8-C69746EC8271}.DebugWin|x64.Build.0 = DebugWin|x64 - {097B4AC0-74E9-4C58-BCF8-C69746EC8271}.DebugWin|x86.ActiveCfg = DebugWin|x86 - {097B4AC0-74E9-4C58-BCF8-C69746EC8271}.DebugWin|x86.Build.0 = DebugWin|x86 - {097B4AC0-74E9-4C58-BCF8-C69746EC8271}.ReleaseMono|x64.ActiveCfg = ReleaseMono|x64 - {097B4AC0-74E9-4C58-BCF8-C69746EC8271}.ReleaseMono|x64.Build.0 = ReleaseMono|x64 - {097B4AC0-74E9-4C58-BCF8-C69746EC8271}.ReleaseMono|x86.ActiveCfg = ReleaseMono|x86 - {097B4AC0-74E9-4C58-BCF8-C69746EC8271}.ReleaseMono|x86.Build.0 = ReleaseMono|x86 - {097B4AC0-74E9-4C58-BCF8-C69746EC8271}.ReleaseWin|x64.ActiveCfg = ReleaseWin|x64 - {097B4AC0-74E9-4C58-BCF8-C69746EC8271}.ReleaseWin|x64.Build.0 = ReleaseWin|x64 - {097B4AC0-74E9-4C58-BCF8-C69746EC8271}.ReleaseWin|x86.ActiveCfg = ReleaseWin|x86 - {097B4AC0-74E9-4C58-BCF8-C69746EC8271}.ReleaseWin|x86.Build.0 = ReleaseWin|x86 - {6F401A34-273B-450F-9A4C-13550BE0767B}.DebugMono|x64.ActiveCfg = DebugMono|x64 - {6F401A34-273B-450F-9A4C-13550BE0767B}.DebugMono|x64.Build.0 = DebugMono|x64 - {6F401A34-273B-450F-9A4C-13550BE0767B}.DebugMono|x86.ActiveCfg = DebugMono|x86 - {6F401A34-273B-450F-9A4C-13550BE0767B}.DebugMono|x86.Build.0 = DebugMono|x86 - {6F401A34-273B-450F-9A4C-13550BE0767B}.DebugWin|x64.ActiveCfg = DebugWin|x64 - {6F401A34-273B-450F-9A4C-13550BE0767B}.DebugWin|x64.Build.0 = DebugWin|x64 - {6F401A34-273B-450F-9A4C-13550BE0767B}.DebugWin|x86.ActiveCfg = DebugWin|x86 - {6F401A34-273B-450F-9A4C-13550BE0767B}.DebugWin|x86.Build.0 = DebugWin|x86 - {6F401A34-273B-450F-9A4C-13550BE0767B}.ReleaseMono|x64.ActiveCfg = ReleaseMono|x64 - {6F401A34-273B-450F-9A4C-13550BE0767B}.ReleaseMono|x64.Build.0 = ReleaseMono|x64 - {6F401A34-273B-450F-9A4C-13550BE0767B}.ReleaseMono|x86.ActiveCfg = ReleaseMono|x86 - {6F401A34-273B-450F-9A4C-13550BE0767B}.ReleaseMono|x86.Build.0 = ReleaseMono|x86 - {6F401A34-273B-450F-9A4C-13550BE0767B}.ReleaseWin|x64.ActiveCfg = ReleaseWin|x64 - {6F401A34-273B-450F-9A4C-13550BE0767B}.ReleaseWin|x64.Build.0 = ReleaseWin|x64 - {6F401A34-273B-450F-9A4C-13550BE0767B}.ReleaseWin|x86.ActiveCfg = ReleaseWin|x86 - {6F401A34-273B-450F-9A4C-13550BE0767B}.ReleaseWin|x86.Build.0 = ReleaseWin|x86 - {4165C59D-2822-499F-A6DB-EACA4C331EB5}.DebugMono|x64.ActiveCfg = DebugMono|x64 - {4165C59D-2822-499F-A6DB-EACA4C331EB5}.DebugMono|x64.Build.0 = DebugMono|x64 - {4165C59D-2822-499F-A6DB-EACA4C331EB5}.DebugMono|x86.ActiveCfg = DebugMono|x86 - {4165C59D-2822-499F-A6DB-EACA4C331EB5}.DebugMono|x86.Build.0 = DebugMono|x86 - {4165C59D-2822-499F-A6DB-EACA4C331EB5}.DebugWin|x64.ActiveCfg = DebugWin|x64 - {4165C59D-2822-499F-A6DB-EACA4C331EB5}.DebugWin|x64.Build.0 = DebugWin|x64 - {4165C59D-2822-499F-A6DB-EACA4C331EB5}.DebugWin|x86.ActiveCfg = DebugWin|x86 - {4165C59D-2822-499F-A6DB-EACA4C331EB5}.DebugWin|x86.Build.0 = DebugWin|x86 - {4165C59D-2822-499F-A6DB-EACA4C331EB5}.ReleaseMono|x64.ActiveCfg = ReleaseMono|x64 - {4165C59D-2822-499F-A6DB-EACA4C331EB5}.ReleaseMono|x64.Build.0 = ReleaseMono|x64 - {4165C59D-2822-499F-A6DB-EACA4C331EB5}.ReleaseMono|x86.ActiveCfg = ReleaseMono|x86 - {4165C59D-2822-499F-A6DB-EACA4C331EB5}.ReleaseMono|x86.Build.0 = ReleaseMono|x86 - {4165C59D-2822-499F-A6DB-EACA4C331EB5}.ReleaseWin|x64.ActiveCfg = ReleaseWin|x64 - {4165C59D-2822-499F-A6DB-EACA4C331EB5}.ReleaseWin|x64.Build.0 = ReleaseWin|x64 - {4165C59D-2822-499F-A6DB-EACA4C331EB5}.ReleaseWin|x86.ActiveCfg = ReleaseWin|x86 - {4165C59D-2822-499F-A6DB-EACA4C331EB5}.ReleaseWin|x86.Build.0 = ReleaseWin|x86 - {E29DCF0A-5114-4A98-B1DD-71264B6EA349}.DebugMono|x64.ActiveCfg = DebugMono_x86|x64 - {E29DCF0A-5114-4A98-B1DD-71264B6EA349}.DebugMono|x64.Build.0 = DebugMono_x86|x64 - {E29DCF0A-5114-4A98-B1DD-71264B6EA349}.DebugMono|x86.ActiveCfg = DebugMono_x86|x86 - {E29DCF0A-5114-4A98-B1DD-71264B6EA349}.DebugMono|x86.Build.0 = DebugMono_x86|x86 - {E29DCF0A-5114-4A98-B1DD-71264B6EA349}.DebugWin|x64.ActiveCfg = DebugMono_x86|x64 - {E29DCF0A-5114-4A98-B1DD-71264B6EA349}.DebugWin|x64.Build.0 = DebugMono_x86|x64 - {E29DCF0A-5114-4A98-B1DD-71264B6EA349}.DebugWin|x86.ActiveCfg = DebugMono_x86|x86 - {E29DCF0A-5114-4A98-B1DD-71264B6EA349}.DebugWin|x86.Build.0 = DebugMono_x86|x86 - {E29DCF0A-5114-4A98-B1DD-71264B6EA349}.ReleaseMono|x64.ActiveCfg = Release|x64 - {E29DCF0A-5114-4A98-B1DD-71264B6EA349}.ReleaseMono|x64.Build.0 = Release|x64 - {E29DCF0A-5114-4A98-B1DD-71264B6EA349}.ReleaseMono|x86.ActiveCfg = Release|x86 - {E29DCF0A-5114-4A98-B1DD-71264B6EA349}.ReleaseMono|x86.Build.0 = Release|x86 - {E29DCF0A-5114-4A98-B1DD-71264B6EA349}.ReleaseWin|x64.ActiveCfg = Release|x64 - {E29DCF0A-5114-4A98-B1DD-71264B6EA349}.ReleaseWin|x64.Build.0 = Release|x64 - {E29DCF0A-5114-4A98-B1DD-71264B6EA349}.ReleaseWin|x86.ActiveCfg = Release|x86 - {E29DCF0A-5114-4A98-B1DD-71264B6EA349}.ReleaseWin|x86.Build.0 = Release|x86 - {86E834DE-1139-4511-96CC-69636A56E7AC}.DebugWin|x64.ActiveCfg = DebugWin|x64 - {86E834DE-1139-4511-96CC-69636A56E7AC}.DebugWin|x64.Build.0 = DebugWin|x64 - {86E834DE-1139-4511-96CC-69636A56E7AC}.DebugWin|x86.ActiveCfg = DebugWin|x86 - {86E834DE-1139-4511-96CC-69636A56E7AC}.DebugWin|x86.Build.0 = DebugWin|x86 - {86E834DE-1139-4511-96CC-69636A56E7AC}.ReleaseWin|x64.ActiveCfg = ReleaseWin|x64 - {86E834DE-1139-4511-96CC-69636A56E7AC}.ReleaseWin|x64.Build.0 = ReleaseWin|x64 - {86E834DE-1139-4511-96CC-69636A56E7AC}.ReleaseWin|x86.ActiveCfg = ReleaseWin|x86 - {86E834DE-1139-4511-96CC-69636A56E7AC}.ReleaseWin|x86.Build.0 = ReleaseWin|x86 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(MonoDevelopProperties) = preSolution - StartupItem = src\console\Console.csproj - Policies = $0 - $0.VersionControlPolicy = $1 - $1.inheritsSet = Mono - $0.ChangeLogPolicy = $2 - $2.UpdateMode = None - $2.MessageStyle = $3 - $3.LineAlign = 0 - $2.inheritsSet = Mono - EndGlobalSection -EndGlobal + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2013 +VisualStudioVersion = 12.0.30110.0 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Python.Runtime", "src\runtime\Python.Runtime.csproj", "{097B4AC0-74E9-4C58-BCF8-C69746EC8271}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Python.Test", "src\testing\Python.Test.csproj", "{6F401A34-273B-450F-9A4C-13550BE0767B}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Python.EmbeddingTest", "src\embed_tests\Python.EmbeddingTest.csproj", "{4165C59D-2822-499F-A6DB-EACA4C331EB5}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Console", "src\console\Console.csproj", "{E29DCF0A-5114-4A98-B1DD-71264B6EA349}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "clrmodule", "src\clrmodule\clrmodule.csproj", "{86E834DE-1139-4511-96CC-69636A56E7AC}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + DebugMono|x64 = DebugMono|x64 + DebugMono|x86 = DebugMono|x86 + DebugWin|x64 = DebugWin|x64 + DebugWin|x86 = DebugWin|x86 + ReleaseMono|x64 = ReleaseMono|x64 + ReleaseMono|x86 = ReleaseMono|x86 + ReleaseWin|x64 = ReleaseWin|x64 + ReleaseWin|x86 = ReleaseWin|x86 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {097B4AC0-74E9-4C58-BCF8-C69746EC8271}.DebugMono|x64.ActiveCfg = DebugMono|x64 + {097B4AC0-74E9-4C58-BCF8-C69746EC8271}.DebugMono|x64.Build.0 = DebugMono|x64 + {097B4AC0-74E9-4C58-BCF8-C69746EC8271}.DebugMono|x86.ActiveCfg = DebugMono|x86 + {097B4AC0-74E9-4C58-BCF8-C69746EC8271}.DebugMono|x86.Build.0 = DebugMono|x86 + {097B4AC0-74E9-4C58-BCF8-C69746EC8271}.DebugWin|x64.ActiveCfg = DebugWin|x64 + {097B4AC0-74E9-4C58-BCF8-C69746EC8271}.DebugWin|x64.Build.0 = DebugWin|x64 + {097B4AC0-74E9-4C58-BCF8-C69746EC8271}.DebugWin|x86.ActiveCfg = DebugWin|x86 + {097B4AC0-74E9-4C58-BCF8-C69746EC8271}.DebugWin|x86.Build.0 = DebugWin|x86 + {097B4AC0-74E9-4C58-BCF8-C69746EC8271}.ReleaseMono|x64.ActiveCfg = ReleaseMono|x64 + {097B4AC0-74E9-4C58-BCF8-C69746EC8271}.ReleaseMono|x64.Build.0 = ReleaseMono|x64 + {097B4AC0-74E9-4C58-BCF8-C69746EC8271}.ReleaseMono|x86.ActiveCfg = ReleaseMono|x86 + {097B4AC0-74E9-4C58-BCF8-C69746EC8271}.ReleaseMono|x86.Build.0 = ReleaseMono|x86 + {097B4AC0-74E9-4C58-BCF8-C69746EC8271}.ReleaseWin|x64.ActiveCfg = ReleaseWin|x64 + {097B4AC0-74E9-4C58-BCF8-C69746EC8271}.ReleaseWin|x64.Build.0 = ReleaseWin|x64 + {097B4AC0-74E9-4C58-BCF8-C69746EC8271}.ReleaseWin|x86.ActiveCfg = ReleaseWin|x86 + {097B4AC0-74E9-4C58-BCF8-C69746EC8271}.ReleaseWin|x86.Build.0 = ReleaseWin|x86 + {6F401A34-273B-450F-9A4C-13550BE0767B}.DebugMono|x64.ActiveCfg = DebugMono|x64 + {6F401A34-273B-450F-9A4C-13550BE0767B}.DebugMono|x64.Build.0 = DebugMono|x64 + {6F401A34-273B-450F-9A4C-13550BE0767B}.DebugMono|x86.ActiveCfg = DebugMono|x86 + {6F401A34-273B-450F-9A4C-13550BE0767B}.DebugMono|x86.Build.0 = DebugMono|x86 + {6F401A34-273B-450F-9A4C-13550BE0767B}.DebugWin|x64.ActiveCfg = DebugWin|x64 + {6F401A34-273B-450F-9A4C-13550BE0767B}.DebugWin|x64.Build.0 = DebugWin|x64 + {6F401A34-273B-450F-9A4C-13550BE0767B}.DebugWin|x86.ActiveCfg = DebugWin|x86 + {6F401A34-273B-450F-9A4C-13550BE0767B}.DebugWin|x86.Build.0 = DebugWin|x86 + {6F401A34-273B-450F-9A4C-13550BE0767B}.ReleaseMono|x64.ActiveCfg = ReleaseMono|x64 + {6F401A34-273B-450F-9A4C-13550BE0767B}.ReleaseMono|x64.Build.0 = ReleaseMono|x64 + {6F401A34-273B-450F-9A4C-13550BE0767B}.ReleaseMono|x86.ActiveCfg = ReleaseMono|x86 + {6F401A34-273B-450F-9A4C-13550BE0767B}.ReleaseMono|x86.Build.0 = ReleaseMono|x86 + {6F401A34-273B-450F-9A4C-13550BE0767B}.ReleaseWin|x64.ActiveCfg = ReleaseWin|x64 + {6F401A34-273B-450F-9A4C-13550BE0767B}.ReleaseWin|x64.Build.0 = ReleaseWin|x64 + {6F401A34-273B-450F-9A4C-13550BE0767B}.ReleaseWin|x86.ActiveCfg = ReleaseWin|x86 + {6F401A34-273B-450F-9A4C-13550BE0767B}.ReleaseWin|x86.Build.0 = ReleaseWin|x86 + {4165C59D-2822-499F-A6DB-EACA4C331EB5}.DebugMono|x64.ActiveCfg = DebugMono|x64 + {4165C59D-2822-499F-A6DB-EACA4C331EB5}.DebugMono|x64.Build.0 = DebugMono|x64 + {4165C59D-2822-499F-A6DB-EACA4C331EB5}.DebugMono|x86.ActiveCfg = DebugMono|x86 + {4165C59D-2822-499F-A6DB-EACA4C331EB5}.DebugMono|x86.Build.0 = DebugMono|x86 + {4165C59D-2822-499F-A6DB-EACA4C331EB5}.DebugWin|x64.ActiveCfg = DebugWin|x64 + {4165C59D-2822-499F-A6DB-EACA4C331EB5}.DebugWin|x64.Build.0 = DebugWin|x64 + {4165C59D-2822-499F-A6DB-EACA4C331EB5}.DebugWin|x86.ActiveCfg = DebugWin|x86 + {4165C59D-2822-499F-A6DB-EACA4C331EB5}.DebugWin|x86.Build.0 = DebugWin|x86 + {4165C59D-2822-499F-A6DB-EACA4C331EB5}.ReleaseMono|x64.ActiveCfg = ReleaseMono|x64 + {4165C59D-2822-499F-A6DB-EACA4C331EB5}.ReleaseMono|x64.Build.0 = ReleaseMono|x64 + {4165C59D-2822-499F-A6DB-EACA4C331EB5}.ReleaseMono|x86.ActiveCfg = ReleaseMono|x86 + {4165C59D-2822-499F-A6DB-EACA4C331EB5}.ReleaseMono|x86.Build.0 = ReleaseMono|x86 + {4165C59D-2822-499F-A6DB-EACA4C331EB5}.ReleaseWin|x64.ActiveCfg = ReleaseWin|x64 + {4165C59D-2822-499F-A6DB-EACA4C331EB5}.ReleaseWin|x64.Build.0 = ReleaseWin|x64 + {4165C59D-2822-499F-A6DB-EACA4C331EB5}.ReleaseWin|x86.ActiveCfg = ReleaseWin|x86 + {4165C59D-2822-499F-A6DB-EACA4C331EB5}.ReleaseWin|x86.Build.0 = ReleaseWin|x86 + {E29DCF0A-5114-4A98-B1DD-71264B6EA349}.DebugMono|x64.ActiveCfg = DebugMono_x86|x64 + {E29DCF0A-5114-4A98-B1DD-71264B6EA349}.DebugMono|x64.Build.0 = DebugMono_x86|x64 + {E29DCF0A-5114-4A98-B1DD-71264B6EA349}.DebugMono|x86.ActiveCfg = DebugMono_x86|x86 + {E29DCF0A-5114-4A98-B1DD-71264B6EA349}.DebugMono|x86.Build.0 = DebugMono_x86|x86 + {E29DCF0A-5114-4A98-B1DD-71264B6EA349}.DebugWin|x64.ActiveCfg = DebugMono_x86|x64 + {E29DCF0A-5114-4A98-B1DD-71264B6EA349}.DebugWin|x64.Build.0 = DebugMono_x86|x64 + {E29DCF0A-5114-4A98-B1DD-71264B6EA349}.DebugWin|x86.ActiveCfg = DebugMono_x86|x86 + {E29DCF0A-5114-4A98-B1DD-71264B6EA349}.DebugWin|x86.Build.0 = DebugMono_x86|x86 + {E29DCF0A-5114-4A98-B1DD-71264B6EA349}.ReleaseMono|x64.ActiveCfg = Release|x64 + {E29DCF0A-5114-4A98-B1DD-71264B6EA349}.ReleaseMono|x64.Build.0 = Release|x64 + {E29DCF0A-5114-4A98-B1DD-71264B6EA349}.ReleaseMono|x86.ActiveCfg = Release|x86 + {E29DCF0A-5114-4A98-B1DD-71264B6EA349}.ReleaseMono|x86.Build.0 = Release|x86 + {E29DCF0A-5114-4A98-B1DD-71264B6EA349}.ReleaseWin|x64.ActiveCfg = Release|x64 + {E29DCF0A-5114-4A98-B1DD-71264B6EA349}.ReleaseWin|x64.Build.0 = Release|x64 + {E29DCF0A-5114-4A98-B1DD-71264B6EA349}.ReleaseWin|x86.ActiveCfg = Release|x86 + {E29DCF0A-5114-4A98-B1DD-71264B6EA349}.ReleaseWin|x86.Build.0 = Release|x86 + {86E834DE-1139-4511-96CC-69636A56E7AC}.DebugWin|x64.ActiveCfg = DebugWin|x64 + {86E834DE-1139-4511-96CC-69636A56E7AC}.DebugWin|x64.Build.0 = DebugWin|x64 + {86E834DE-1139-4511-96CC-69636A56E7AC}.DebugWin|x86.ActiveCfg = DebugWin|x86 + {86E834DE-1139-4511-96CC-69636A56E7AC}.DebugWin|x86.Build.0 = DebugWin|x86 + {86E834DE-1139-4511-96CC-69636A56E7AC}.ReleaseWin|x64.ActiveCfg = ReleaseWin|x64 + {86E834DE-1139-4511-96CC-69636A56E7AC}.ReleaseWin|x64.Build.0 = ReleaseWin|x64 + {86E834DE-1139-4511-96CC-69636A56E7AC}.ReleaseWin|x86.ActiveCfg = ReleaseWin|x86 + {86E834DE-1139-4511-96CC-69636A56E7AC}.ReleaseWin|x86.Build.0 = ReleaseWin|x86 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(MonoDevelopProperties) = preSolution + StartupItem = src\console\Console.csproj + Policies = $0 + $0.VersionControlPolicy = $1 + $1.inheritsSet = Mono + $0.ChangeLogPolicy = $2 + $2.UpdateMode = None + $2.MessageStyle = $3 + $3.LineAlign = 0 + $2.inheritsSet = Mono + EndGlobalSection +EndGlobal diff --git a/pythonnet/pythonnet.snk b/pythonnet.snk similarity index 100% rename from pythonnet/pythonnet.snk rename to pythonnet.snk diff --git a/pythonnet/pythonnet_8.sln b/pythonnet_8.sln similarity index 98% rename from pythonnet/pythonnet_8.sln rename to pythonnet_8.sln index 1def832ab..e30c01be0 100644 --- a/pythonnet/pythonnet_8.sln +++ b/pythonnet_8.sln @@ -1,86 +1,86 @@ - -Microsoft Visual Studio Solution File, Format Version 9.00 -# Visual Studio 2005 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Python.Runtime", "src\runtime\Python.Runtime.csproj", "{097B4AC0-74E9-4C58-BCF8-C69746EC8271}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Python.Test", "src\testing\Python.Test.csproj", "{6F401A34-273B-450F-9A4C-13550BE0767B}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Python.EmbeddingTest", "src\embed_tests\Python.EmbeddingTest.csproj", "{4165C59D-2822-499F-A6DB-EACA4C331EB5}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Console", "src\console\Console.csproj", "{E29DCF0A-5114-4A98-B1DD-71264B6EA349}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Debug|x64 = Debug|x64 - EmbeddingTest|Any CPU = EmbeddingTest|Any CPU - EmbeddingTest|x64 = EmbeddingTest|x64 - Release|Any CPU = Release|Any CPU - Release|x64 = Release|x64 - UnitTests|Any CPU = UnitTests|Any CPU - UnitTests|x64 = UnitTests|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {097B4AC0-74E9-4C58-BCF8-C69746EC8271}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {097B4AC0-74E9-4C58-BCF8-C69746EC8271}.Debug|Any CPU.Build.0 = Debug|Any CPU - {097B4AC0-74E9-4C58-BCF8-C69746EC8271}.Debug|x64.ActiveCfg = Debug|x64 - {097B4AC0-74E9-4C58-BCF8-C69746EC8271}.Debug|x64.Build.0 = Debug|x64 - {097B4AC0-74E9-4C58-BCF8-C69746EC8271}.EmbeddingTest|Any CPU.ActiveCfg = Debug|Any CPU - {097B4AC0-74E9-4C58-BCF8-C69746EC8271}.EmbeddingTest|Any CPU.Build.0 = Debug|Any CPU - {097B4AC0-74E9-4C58-BCF8-C69746EC8271}.EmbeddingTest|x64.ActiveCfg = Debug|x64 - {097B4AC0-74E9-4C58-BCF8-C69746EC8271}.EmbeddingTest|x64.Build.0 = Debug|x64 - {097B4AC0-74E9-4C58-BCF8-C69746EC8271}.Release|Any CPU.ActiveCfg = Release|Any CPU - {097B4AC0-74E9-4C58-BCF8-C69746EC8271}.Release|Any CPU.Build.0 = Release|Any CPU - {097B4AC0-74E9-4C58-BCF8-C69746EC8271}.Release|x64.ActiveCfg = Release|x64 - {097B4AC0-74E9-4C58-BCF8-C69746EC8271}.Release|x64.Build.0 = Release|x64 - {097B4AC0-74E9-4C58-BCF8-C69746EC8271}.UnitTests|Any CPU.ActiveCfg = Debug|Any CPU - {097B4AC0-74E9-4C58-BCF8-C69746EC8271}.UnitTests|Any CPU.Build.0 = Debug|Any CPU - {097B4AC0-74E9-4C58-BCF8-C69746EC8271}.UnitTests|x64.ActiveCfg = Debug|x64 - {097B4AC0-74E9-4C58-BCF8-C69746EC8271}.UnitTests|x64.Build.0 = Debug|x64 - {6F401A34-273B-450F-9A4C-13550BE0767B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6F401A34-273B-450F-9A4C-13550BE0767B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6F401A34-273B-450F-9A4C-13550BE0767B}.Debug|x64.ActiveCfg = Debug|Any CPU - {6F401A34-273B-450F-9A4C-13550BE0767B}.Debug|x64.Build.0 = Debug|Any CPU - {6F401A34-273B-450F-9A4C-13550BE0767B}.EmbeddingTest|Any CPU.ActiveCfg = Debug|Any CPU - {6F401A34-273B-450F-9A4C-13550BE0767B}.EmbeddingTest|Any CPU.Build.0 = Debug|Any CPU - {6F401A34-273B-450F-9A4C-13550BE0767B}.EmbeddingTest|x64.ActiveCfg = Debug|Any CPU - {6F401A34-273B-450F-9A4C-13550BE0767B}.EmbeddingTest|x64.Build.0 = Debug|Any CPU - {6F401A34-273B-450F-9A4C-13550BE0767B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6F401A34-273B-450F-9A4C-13550BE0767B}.Release|Any CPU.Build.0 = Release|Any CPU - {6F401A34-273B-450F-9A4C-13550BE0767B}.Release|x64.ActiveCfg = Release|Any CPU - {6F401A34-273B-450F-9A4C-13550BE0767B}.Release|x64.Build.0 = Release|Any CPU - {6F401A34-273B-450F-9A4C-13550BE0767B}.UnitTests|Any CPU.ActiveCfg = Debug|Any CPU - {6F401A34-273B-450F-9A4C-13550BE0767B}.UnitTests|Any CPU.Build.0 = Debug|Any CPU - {6F401A34-273B-450F-9A4C-13550BE0767B}.UnitTests|x64.ActiveCfg = Debug|Any CPU - {6F401A34-273B-450F-9A4C-13550BE0767B}.UnitTests|x64.Build.0 = Debug|Any CPU - {4165C59D-2822-499F-A6DB-EACA4C331EB5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4165C59D-2822-499F-A6DB-EACA4C331EB5}.Debug|x64.ActiveCfg = Debug|Any CPU - {4165C59D-2822-499F-A6DB-EACA4C331EB5}.EmbeddingTest|Any CPU.ActiveCfg = Release|Any CPU - {4165C59D-2822-499F-A6DB-EACA4C331EB5}.EmbeddingTest|Any CPU.Build.0 = Release|Any CPU - {4165C59D-2822-499F-A6DB-EACA4C331EB5}.EmbeddingTest|x64.ActiveCfg = Release|Any CPU - {4165C59D-2822-499F-A6DB-EACA4C331EB5}.EmbeddingTest|x64.Build.0 = Release|Any CPU - {4165C59D-2822-499F-A6DB-EACA4C331EB5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4165C59D-2822-499F-A6DB-EACA4C331EB5}.Release|x64.ActiveCfg = Release|Any CPU - {4165C59D-2822-499F-A6DB-EACA4C331EB5}.UnitTests|Any CPU.ActiveCfg = Debug|Any CPU - {4165C59D-2822-499F-A6DB-EACA4C331EB5}.UnitTests|x64.ActiveCfg = Debug|Any CPU - {E29DCF0A-5114-4A98-B1DD-71264B6EA349}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E29DCF0A-5114-4A98-B1DD-71264B6EA349}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E29DCF0A-5114-4A98-B1DD-71264B6EA349}.Debug|x64.ActiveCfg = Debug|Any CPU - {E29DCF0A-5114-4A98-B1DD-71264B6EA349}.Debug|x64.Build.0 = Debug|Any CPU - {E29DCF0A-5114-4A98-B1DD-71264B6EA349}.EmbeddingTest|Any CPU.ActiveCfg = EmbeddingTest|Any CPU - {E29DCF0A-5114-4A98-B1DD-71264B6EA349}.EmbeddingTest|Any CPU.Build.0 = EmbeddingTest|Any CPU - {E29DCF0A-5114-4A98-B1DD-71264B6EA349}.EmbeddingTest|x64.ActiveCfg = EmbeddingTest|Any CPU - {E29DCF0A-5114-4A98-B1DD-71264B6EA349}.EmbeddingTest|x64.Build.0 = EmbeddingTest|Any CPU - {E29DCF0A-5114-4A98-B1DD-71264B6EA349}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E29DCF0A-5114-4A98-B1DD-71264B6EA349}.Release|Any CPU.Build.0 = Release|Any CPU - {E29DCF0A-5114-4A98-B1DD-71264B6EA349}.Release|x64.ActiveCfg = Release|Any CPU - {E29DCF0A-5114-4A98-B1DD-71264B6EA349}.Release|x64.Build.0 = Release|Any CPU - {E29DCF0A-5114-4A98-B1DD-71264B6EA349}.UnitTests|Any CPU.ActiveCfg = UnitTests|Any CPU - {E29DCF0A-5114-4A98-B1DD-71264B6EA349}.UnitTests|Any CPU.Build.0 = UnitTests|Any CPU - {E29DCF0A-5114-4A98-B1DD-71264B6EA349}.UnitTests|x64.ActiveCfg = UnitTests|Any CPU - {E29DCF0A-5114-4A98-B1DD-71264B6EA349}.UnitTests|x64.Build.0 = UnitTests|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal + +Microsoft Visual Studio Solution File, Format Version 9.00 +# Visual Studio 2005 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Python.Runtime", "src\runtime\Python.Runtime.csproj", "{097B4AC0-74E9-4C58-BCF8-C69746EC8271}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Python.Test", "src\testing\Python.Test.csproj", "{6F401A34-273B-450F-9A4C-13550BE0767B}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Python.EmbeddingTest", "src\embed_tests\Python.EmbeddingTest.csproj", "{4165C59D-2822-499F-A6DB-EACA4C331EB5}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Console", "src\console\Console.csproj", "{E29DCF0A-5114-4A98-B1DD-71264B6EA349}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Debug|x64 = Debug|x64 + EmbeddingTest|Any CPU = EmbeddingTest|Any CPU + EmbeddingTest|x64 = EmbeddingTest|x64 + Release|Any CPU = Release|Any CPU + Release|x64 = Release|x64 + UnitTests|Any CPU = UnitTests|Any CPU + UnitTests|x64 = UnitTests|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {097B4AC0-74E9-4C58-BCF8-C69746EC8271}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {097B4AC0-74E9-4C58-BCF8-C69746EC8271}.Debug|Any CPU.Build.0 = Debug|Any CPU + {097B4AC0-74E9-4C58-BCF8-C69746EC8271}.Debug|x64.ActiveCfg = Debug|x64 + {097B4AC0-74E9-4C58-BCF8-C69746EC8271}.Debug|x64.Build.0 = Debug|x64 + {097B4AC0-74E9-4C58-BCF8-C69746EC8271}.EmbeddingTest|Any CPU.ActiveCfg = Debug|Any CPU + {097B4AC0-74E9-4C58-BCF8-C69746EC8271}.EmbeddingTest|Any CPU.Build.0 = Debug|Any CPU + {097B4AC0-74E9-4C58-BCF8-C69746EC8271}.EmbeddingTest|x64.ActiveCfg = Debug|x64 + {097B4AC0-74E9-4C58-BCF8-C69746EC8271}.EmbeddingTest|x64.Build.0 = Debug|x64 + {097B4AC0-74E9-4C58-BCF8-C69746EC8271}.Release|Any CPU.ActiveCfg = Release|Any CPU + {097B4AC0-74E9-4C58-BCF8-C69746EC8271}.Release|Any CPU.Build.0 = Release|Any CPU + {097B4AC0-74E9-4C58-BCF8-C69746EC8271}.Release|x64.ActiveCfg = Release|x64 + {097B4AC0-74E9-4C58-BCF8-C69746EC8271}.Release|x64.Build.0 = Release|x64 + {097B4AC0-74E9-4C58-BCF8-C69746EC8271}.UnitTests|Any CPU.ActiveCfg = Debug|Any CPU + {097B4AC0-74E9-4C58-BCF8-C69746EC8271}.UnitTests|Any CPU.Build.0 = Debug|Any CPU + {097B4AC0-74E9-4C58-BCF8-C69746EC8271}.UnitTests|x64.ActiveCfg = Debug|x64 + {097B4AC0-74E9-4C58-BCF8-C69746EC8271}.UnitTests|x64.Build.0 = Debug|x64 + {6F401A34-273B-450F-9A4C-13550BE0767B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {6F401A34-273B-450F-9A4C-13550BE0767B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {6F401A34-273B-450F-9A4C-13550BE0767B}.Debug|x64.ActiveCfg = Debug|Any CPU + {6F401A34-273B-450F-9A4C-13550BE0767B}.Debug|x64.Build.0 = Debug|Any CPU + {6F401A34-273B-450F-9A4C-13550BE0767B}.EmbeddingTest|Any CPU.ActiveCfg = Debug|Any CPU + {6F401A34-273B-450F-9A4C-13550BE0767B}.EmbeddingTest|Any CPU.Build.0 = Debug|Any CPU + {6F401A34-273B-450F-9A4C-13550BE0767B}.EmbeddingTest|x64.ActiveCfg = Debug|Any CPU + {6F401A34-273B-450F-9A4C-13550BE0767B}.EmbeddingTest|x64.Build.0 = Debug|Any CPU + {6F401A34-273B-450F-9A4C-13550BE0767B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {6F401A34-273B-450F-9A4C-13550BE0767B}.Release|Any CPU.Build.0 = Release|Any CPU + {6F401A34-273B-450F-9A4C-13550BE0767B}.Release|x64.ActiveCfg = Release|Any CPU + {6F401A34-273B-450F-9A4C-13550BE0767B}.Release|x64.Build.0 = Release|Any CPU + {6F401A34-273B-450F-9A4C-13550BE0767B}.UnitTests|Any CPU.ActiveCfg = Debug|Any CPU + {6F401A34-273B-450F-9A4C-13550BE0767B}.UnitTests|Any CPU.Build.0 = Debug|Any CPU + {6F401A34-273B-450F-9A4C-13550BE0767B}.UnitTests|x64.ActiveCfg = Debug|Any CPU + {6F401A34-273B-450F-9A4C-13550BE0767B}.UnitTests|x64.Build.0 = Debug|Any CPU + {4165C59D-2822-499F-A6DB-EACA4C331EB5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {4165C59D-2822-499F-A6DB-EACA4C331EB5}.Debug|x64.ActiveCfg = Debug|Any CPU + {4165C59D-2822-499F-A6DB-EACA4C331EB5}.EmbeddingTest|Any CPU.ActiveCfg = Release|Any CPU + {4165C59D-2822-499F-A6DB-EACA4C331EB5}.EmbeddingTest|Any CPU.Build.0 = Release|Any CPU + {4165C59D-2822-499F-A6DB-EACA4C331EB5}.EmbeddingTest|x64.ActiveCfg = Release|Any CPU + {4165C59D-2822-499F-A6DB-EACA4C331EB5}.EmbeddingTest|x64.Build.0 = Release|Any CPU + {4165C59D-2822-499F-A6DB-EACA4C331EB5}.Release|Any CPU.ActiveCfg = Release|Any CPU + {4165C59D-2822-499F-A6DB-EACA4C331EB5}.Release|x64.ActiveCfg = Release|Any CPU + {4165C59D-2822-499F-A6DB-EACA4C331EB5}.UnitTests|Any CPU.ActiveCfg = Debug|Any CPU + {4165C59D-2822-499F-A6DB-EACA4C331EB5}.UnitTests|x64.ActiveCfg = Debug|Any CPU + {E29DCF0A-5114-4A98-B1DD-71264B6EA349}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E29DCF0A-5114-4A98-B1DD-71264B6EA349}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E29DCF0A-5114-4A98-B1DD-71264B6EA349}.Debug|x64.ActiveCfg = Debug|Any CPU + {E29DCF0A-5114-4A98-B1DD-71264B6EA349}.Debug|x64.Build.0 = Debug|Any CPU + {E29DCF0A-5114-4A98-B1DD-71264B6EA349}.EmbeddingTest|Any CPU.ActiveCfg = EmbeddingTest|Any CPU + {E29DCF0A-5114-4A98-B1DD-71264B6EA349}.EmbeddingTest|Any CPU.Build.0 = EmbeddingTest|Any CPU + {E29DCF0A-5114-4A98-B1DD-71264B6EA349}.EmbeddingTest|x64.ActiveCfg = EmbeddingTest|Any CPU + {E29DCF0A-5114-4A98-B1DD-71264B6EA349}.EmbeddingTest|x64.Build.0 = EmbeddingTest|Any CPU + {E29DCF0A-5114-4A98-B1DD-71264B6EA349}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E29DCF0A-5114-4A98-B1DD-71264B6EA349}.Release|Any CPU.Build.0 = Release|Any CPU + {E29DCF0A-5114-4A98-B1DD-71264B6EA349}.Release|x64.ActiveCfg = Release|Any CPU + {E29DCF0A-5114-4A98-B1DD-71264B6EA349}.Release|x64.Build.0 = Release|Any CPU + {E29DCF0A-5114-4A98-B1DD-71264B6EA349}.UnitTests|Any CPU.ActiveCfg = UnitTests|Any CPU + {E29DCF0A-5114-4A98-B1DD-71264B6EA349}.UnitTests|Any CPU.Build.0 = UnitTests|Any CPU + {E29DCF0A-5114-4A98-B1DD-71264B6EA349}.UnitTests|x64.ActiveCfg = UnitTests|Any CPU + {E29DCF0A-5114-4A98-B1DD-71264B6EA349}.UnitTests|x64.Build.0 = UnitTests|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/pythonnet/pythonnet_9.sln b/pythonnet_9.sln similarity index 98% rename from pythonnet/pythonnet_9.sln rename to pythonnet_9.sln index ca2df9516..1d11d7fd8 100644 --- a/pythonnet/pythonnet_9.sln +++ b/pythonnet_9.sln @@ -1,87 +1,87 @@ - -Microsoft Visual Studio Solution File, Format Version 10.00 -# Visual Studio 2008 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Python.Runtime", "src\runtime\Python.Runtime.csproj", "{097B4AC0-74E9-4C58-BCF8-C69746EC8271}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Python.Test", "src\testing\Python.Test.csproj", "{6F401A34-273B-450F-9A4C-13550BE0767B}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Python.EmbeddingTest", "src\embed_tests\Python.EmbeddingTest.csproj", "{4165C59D-2822-499F-A6DB-EACA4C331EB5}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Console", "src\console\Console.csproj", "{E29DCF0A-5114-4A98-B1DD-71264B6EA349}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Debug|x64 = Debug|x64 - EmbeddingTest|Any CPU = EmbeddingTest|Any CPU - EmbeddingTest|x64 = EmbeddingTest|x64 - Release|Any CPU = Release|Any CPU - Release|x64 = Release|x64 - UnitTests|Any CPU = UnitTests|Any CPU - UnitTests|x64 = UnitTests|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {097B4AC0-74E9-4C58-BCF8-C69746EC8271}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {097B4AC0-74E9-4C58-BCF8-C69746EC8271}.Debug|Any CPU.Build.0 = Debug|Any CPU - {097B4AC0-74E9-4C58-BCF8-C69746EC8271}.Debug|x64.ActiveCfg = Debug|x64 - {097B4AC0-74E9-4C58-BCF8-C69746EC8271}.Debug|x64.Build.0 = Debug|x64 - {097B4AC0-74E9-4C58-BCF8-C69746EC8271}.EmbeddingTest|Any CPU.ActiveCfg = Debug|Any CPU - {097B4AC0-74E9-4C58-BCF8-C69746EC8271}.EmbeddingTest|Any CPU.Build.0 = Debug|Any CPU - {097B4AC0-74E9-4C58-BCF8-C69746EC8271}.EmbeddingTest|x64.ActiveCfg = Debug|x64 - {097B4AC0-74E9-4C58-BCF8-C69746EC8271}.EmbeddingTest|x64.Build.0 = Debug|x64 - {097B4AC0-74E9-4C58-BCF8-C69746EC8271}.Release|Any CPU.ActiveCfg = Release|Any CPU - {097B4AC0-74E9-4C58-BCF8-C69746EC8271}.Release|Any CPU.Build.0 = Release|Any CPU - {097B4AC0-74E9-4C58-BCF8-C69746EC8271}.Release|x64.ActiveCfg = Release|x64 - {097B4AC0-74E9-4C58-BCF8-C69746EC8271}.Release|x64.Build.0 = Release|x64 - {097B4AC0-74E9-4C58-BCF8-C69746EC8271}.UnitTests|Any CPU.ActiveCfg = Debug|Any CPU - {097B4AC0-74E9-4C58-BCF8-C69746EC8271}.UnitTests|Any CPU.Build.0 = Debug|Any CPU - {097B4AC0-74E9-4C58-BCF8-C69746EC8271}.UnitTests|x64.ActiveCfg = Debug|x64 - {097B4AC0-74E9-4C58-BCF8-C69746EC8271}.UnitTests|x64.Build.0 = Debug|x64 - {6F401A34-273B-450F-9A4C-13550BE0767B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6F401A34-273B-450F-9A4C-13550BE0767B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6F401A34-273B-450F-9A4C-13550BE0767B}.Debug|x64.ActiveCfg = Debug|Any CPU - {6F401A34-273B-450F-9A4C-13550BE0767B}.Debug|x64.Build.0 = Debug|Any CPU - {6F401A34-273B-450F-9A4C-13550BE0767B}.EmbeddingTest|Any CPU.ActiveCfg = Debug|Any CPU - {6F401A34-273B-450F-9A4C-13550BE0767B}.EmbeddingTest|Any CPU.Build.0 = Debug|Any CPU - {6F401A34-273B-450F-9A4C-13550BE0767B}.EmbeddingTest|x64.ActiveCfg = Debug|Any CPU - {6F401A34-273B-450F-9A4C-13550BE0767B}.EmbeddingTest|x64.Build.0 = Debug|Any CPU - {6F401A34-273B-450F-9A4C-13550BE0767B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6F401A34-273B-450F-9A4C-13550BE0767B}.Release|Any CPU.Build.0 = Release|Any CPU - {6F401A34-273B-450F-9A4C-13550BE0767B}.Release|x64.ActiveCfg = Release|Any CPU - {6F401A34-273B-450F-9A4C-13550BE0767B}.Release|x64.Build.0 = Release|Any CPU - {6F401A34-273B-450F-9A4C-13550BE0767B}.UnitTests|Any CPU.ActiveCfg = Debug|Any CPU - {6F401A34-273B-450F-9A4C-13550BE0767B}.UnitTests|Any CPU.Build.0 = Debug|Any CPU - {6F401A34-273B-450F-9A4C-13550BE0767B}.UnitTests|x64.ActiveCfg = Debug|Any CPU - {6F401A34-273B-450F-9A4C-13550BE0767B}.UnitTests|x64.Build.0 = Debug|Any CPU - {4165C59D-2822-499F-A6DB-EACA4C331EB5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4165C59D-2822-499F-A6DB-EACA4C331EB5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4165C59D-2822-499F-A6DB-EACA4C331EB5}.Debug|x64.ActiveCfg = Debug|Any CPU - {4165C59D-2822-499F-A6DB-EACA4C331EB5}.EmbeddingTest|Any CPU.ActiveCfg = Release|Any CPU - {4165C59D-2822-499F-A6DB-EACA4C331EB5}.EmbeddingTest|Any CPU.Build.0 = Release|Any CPU - {4165C59D-2822-499F-A6DB-EACA4C331EB5}.EmbeddingTest|x64.ActiveCfg = Release|Any CPU - {4165C59D-2822-499F-A6DB-EACA4C331EB5}.EmbeddingTest|x64.Build.0 = Release|Any CPU - {4165C59D-2822-499F-A6DB-EACA4C331EB5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4165C59D-2822-499F-A6DB-EACA4C331EB5}.Release|x64.ActiveCfg = Release|Any CPU - {4165C59D-2822-499F-A6DB-EACA4C331EB5}.UnitTests|Any CPU.ActiveCfg = Debug|Any CPU - {4165C59D-2822-499F-A6DB-EACA4C331EB5}.UnitTests|x64.ActiveCfg = Debug|Any CPU - {E29DCF0A-5114-4A98-B1DD-71264B6EA349}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E29DCF0A-5114-4A98-B1DD-71264B6EA349}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E29DCF0A-5114-4A98-B1DD-71264B6EA349}.Debug|x64.ActiveCfg = Debug|Any CPU - {E29DCF0A-5114-4A98-B1DD-71264B6EA349}.Debug|x64.Build.0 = Debug|Any CPU - {E29DCF0A-5114-4A98-B1DD-71264B6EA349}.EmbeddingTest|Any CPU.ActiveCfg = EmbeddingTest|Any CPU - {E29DCF0A-5114-4A98-B1DD-71264B6EA349}.EmbeddingTest|Any CPU.Build.0 = EmbeddingTest|Any CPU - {E29DCF0A-5114-4A98-B1DD-71264B6EA349}.EmbeddingTest|x64.ActiveCfg = EmbeddingTest|Any CPU - {E29DCF0A-5114-4A98-B1DD-71264B6EA349}.EmbeddingTest|x64.Build.0 = EmbeddingTest|Any CPU - {E29DCF0A-5114-4A98-B1DD-71264B6EA349}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E29DCF0A-5114-4A98-B1DD-71264B6EA349}.Release|Any CPU.Build.0 = Release|Any CPU - {E29DCF0A-5114-4A98-B1DD-71264B6EA349}.Release|x64.ActiveCfg = Release|Any CPU - {E29DCF0A-5114-4A98-B1DD-71264B6EA349}.Release|x64.Build.0 = Release|Any CPU - {E29DCF0A-5114-4A98-B1DD-71264B6EA349}.UnitTests|Any CPU.ActiveCfg = UnitTests|Any CPU - {E29DCF0A-5114-4A98-B1DD-71264B6EA349}.UnitTests|Any CPU.Build.0 = UnitTests|Any CPU - {E29DCF0A-5114-4A98-B1DD-71264B6EA349}.UnitTests|x64.ActiveCfg = UnitTests|Any CPU - {E29DCF0A-5114-4A98-B1DD-71264B6EA349}.UnitTests|x64.Build.0 = UnitTests|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal + +Microsoft Visual Studio Solution File, Format Version 10.00 +# Visual Studio 2008 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Python.Runtime", "src\runtime\Python.Runtime.csproj", "{097B4AC0-74E9-4C58-BCF8-C69746EC8271}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Python.Test", "src\testing\Python.Test.csproj", "{6F401A34-273B-450F-9A4C-13550BE0767B}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Python.EmbeddingTest", "src\embed_tests\Python.EmbeddingTest.csproj", "{4165C59D-2822-499F-A6DB-EACA4C331EB5}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Console", "src\console\Console.csproj", "{E29DCF0A-5114-4A98-B1DD-71264B6EA349}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Debug|x64 = Debug|x64 + EmbeddingTest|Any CPU = EmbeddingTest|Any CPU + EmbeddingTest|x64 = EmbeddingTest|x64 + Release|Any CPU = Release|Any CPU + Release|x64 = Release|x64 + UnitTests|Any CPU = UnitTests|Any CPU + UnitTests|x64 = UnitTests|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {097B4AC0-74E9-4C58-BCF8-C69746EC8271}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {097B4AC0-74E9-4C58-BCF8-C69746EC8271}.Debug|Any CPU.Build.0 = Debug|Any CPU + {097B4AC0-74E9-4C58-BCF8-C69746EC8271}.Debug|x64.ActiveCfg = Debug|x64 + {097B4AC0-74E9-4C58-BCF8-C69746EC8271}.Debug|x64.Build.0 = Debug|x64 + {097B4AC0-74E9-4C58-BCF8-C69746EC8271}.EmbeddingTest|Any CPU.ActiveCfg = Debug|Any CPU + {097B4AC0-74E9-4C58-BCF8-C69746EC8271}.EmbeddingTest|Any CPU.Build.0 = Debug|Any CPU + {097B4AC0-74E9-4C58-BCF8-C69746EC8271}.EmbeddingTest|x64.ActiveCfg = Debug|x64 + {097B4AC0-74E9-4C58-BCF8-C69746EC8271}.EmbeddingTest|x64.Build.0 = Debug|x64 + {097B4AC0-74E9-4C58-BCF8-C69746EC8271}.Release|Any CPU.ActiveCfg = Release|Any CPU + {097B4AC0-74E9-4C58-BCF8-C69746EC8271}.Release|Any CPU.Build.0 = Release|Any CPU + {097B4AC0-74E9-4C58-BCF8-C69746EC8271}.Release|x64.ActiveCfg = Release|x64 + {097B4AC0-74E9-4C58-BCF8-C69746EC8271}.Release|x64.Build.0 = Release|x64 + {097B4AC0-74E9-4C58-BCF8-C69746EC8271}.UnitTests|Any CPU.ActiveCfg = Debug|Any CPU + {097B4AC0-74E9-4C58-BCF8-C69746EC8271}.UnitTests|Any CPU.Build.0 = Debug|Any CPU + {097B4AC0-74E9-4C58-BCF8-C69746EC8271}.UnitTests|x64.ActiveCfg = Debug|x64 + {097B4AC0-74E9-4C58-BCF8-C69746EC8271}.UnitTests|x64.Build.0 = Debug|x64 + {6F401A34-273B-450F-9A4C-13550BE0767B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {6F401A34-273B-450F-9A4C-13550BE0767B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {6F401A34-273B-450F-9A4C-13550BE0767B}.Debug|x64.ActiveCfg = Debug|Any CPU + {6F401A34-273B-450F-9A4C-13550BE0767B}.Debug|x64.Build.0 = Debug|Any CPU + {6F401A34-273B-450F-9A4C-13550BE0767B}.EmbeddingTest|Any CPU.ActiveCfg = Debug|Any CPU + {6F401A34-273B-450F-9A4C-13550BE0767B}.EmbeddingTest|Any CPU.Build.0 = Debug|Any CPU + {6F401A34-273B-450F-9A4C-13550BE0767B}.EmbeddingTest|x64.ActiveCfg = Debug|Any CPU + {6F401A34-273B-450F-9A4C-13550BE0767B}.EmbeddingTest|x64.Build.0 = Debug|Any CPU + {6F401A34-273B-450F-9A4C-13550BE0767B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {6F401A34-273B-450F-9A4C-13550BE0767B}.Release|Any CPU.Build.0 = Release|Any CPU + {6F401A34-273B-450F-9A4C-13550BE0767B}.Release|x64.ActiveCfg = Release|Any CPU + {6F401A34-273B-450F-9A4C-13550BE0767B}.Release|x64.Build.0 = Release|Any CPU + {6F401A34-273B-450F-9A4C-13550BE0767B}.UnitTests|Any CPU.ActiveCfg = Debug|Any CPU + {6F401A34-273B-450F-9A4C-13550BE0767B}.UnitTests|Any CPU.Build.0 = Debug|Any CPU + {6F401A34-273B-450F-9A4C-13550BE0767B}.UnitTests|x64.ActiveCfg = Debug|Any CPU + {6F401A34-273B-450F-9A4C-13550BE0767B}.UnitTests|x64.Build.0 = Debug|Any CPU + {4165C59D-2822-499F-A6DB-EACA4C331EB5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {4165C59D-2822-499F-A6DB-EACA4C331EB5}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4165C59D-2822-499F-A6DB-EACA4C331EB5}.Debug|x64.ActiveCfg = Debug|Any CPU + {4165C59D-2822-499F-A6DB-EACA4C331EB5}.EmbeddingTest|Any CPU.ActiveCfg = Release|Any CPU + {4165C59D-2822-499F-A6DB-EACA4C331EB5}.EmbeddingTest|Any CPU.Build.0 = Release|Any CPU + {4165C59D-2822-499F-A6DB-EACA4C331EB5}.EmbeddingTest|x64.ActiveCfg = Release|Any CPU + {4165C59D-2822-499F-A6DB-EACA4C331EB5}.EmbeddingTest|x64.Build.0 = Release|Any CPU + {4165C59D-2822-499F-A6DB-EACA4C331EB5}.Release|Any CPU.ActiveCfg = Release|Any CPU + {4165C59D-2822-499F-A6DB-EACA4C331EB5}.Release|x64.ActiveCfg = Release|Any CPU + {4165C59D-2822-499F-A6DB-EACA4C331EB5}.UnitTests|Any CPU.ActiveCfg = Debug|Any CPU + {4165C59D-2822-499F-A6DB-EACA4C331EB5}.UnitTests|x64.ActiveCfg = Debug|Any CPU + {E29DCF0A-5114-4A98-B1DD-71264B6EA349}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E29DCF0A-5114-4A98-B1DD-71264B6EA349}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E29DCF0A-5114-4A98-B1DD-71264B6EA349}.Debug|x64.ActiveCfg = Debug|Any CPU + {E29DCF0A-5114-4A98-B1DD-71264B6EA349}.Debug|x64.Build.0 = Debug|Any CPU + {E29DCF0A-5114-4A98-B1DD-71264B6EA349}.EmbeddingTest|Any CPU.ActiveCfg = EmbeddingTest|Any CPU + {E29DCF0A-5114-4A98-B1DD-71264B6EA349}.EmbeddingTest|Any CPU.Build.0 = EmbeddingTest|Any CPU + {E29DCF0A-5114-4A98-B1DD-71264B6EA349}.EmbeddingTest|x64.ActiveCfg = EmbeddingTest|Any CPU + {E29DCF0A-5114-4A98-B1DD-71264B6EA349}.EmbeddingTest|x64.Build.0 = EmbeddingTest|Any CPU + {E29DCF0A-5114-4A98-B1DD-71264B6EA349}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E29DCF0A-5114-4A98-B1DD-71264B6EA349}.Release|Any CPU.Build.0 = Release|Any CPU + {E29DCF0A-5114-4A98-B1DD-71264B6EA349}.Release|x64.ActiveCfg = Release|Any CPU + {E29DCF0A-5114-4A98-B1DD-71264B6EA349}.Release|x64.Build.0 = Release|Any CPU + {E29DCF0A-5114-4A98-B1DD-71264B6EA349}.UnitTests|Any CPU.ActiveCfg = UnitTests|Any CPU + {E29DCF0A-5114-4A98-B1DD-71264B6EA349}.UnitTests|Any CPU.Build.0 = UnitTests|Any CPU + {E29DCF0A-5114-4A98-B1DD-71264B6EA349}.UnitTests|x64.ActiveCfg = UnitTests|Any CPU + {E29DCF0A-5114-4A98-B1DD-71264B6EA349}.UnitTests|x64.Build.0 = UnitTests|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/pythonnet/setup.py b/setup.py similarity index 100% rename from pythonnet/setup.py rename to setup.py diff --git a/pythonnet/src/clrmodule/ClrModule.cs b/src/clrmodule/ClrModule.cs similarity index 97% rename from pythonnet/src/clrmodule/ClrModule.cs rename to src/clrmodule/ClrModule.cs index 368a3da14..3347d55a9 100644 --- a/pythonnet/src/clrmodule/ClrModule.cs +++ b/src/clrmodule/ClrModule.cs @@ -1,115 +1,115 @@ -// ========================================================================== -// This software is subject to the provisions of the Zope Public License, -// Version 2.0 (ZPL). A copy of the ZPL should accompany this distribution. -// THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED -// WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -// WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS -// FOR A PARTICULAR PURPOSE. -// ========================================================================== - -//============================================================================ -// This file replaces the hand-maintained stub that used to implement clr.dll. -// This is a line-by-line port from IL back to C#. -// We now use RGiesecke.DllExport on the required static init method so it can be -// loaded by a standard CPython interpreter as an extension module. When it -// is loaded, it bootstraps the managed runtime integration layer and defers -// to it to do initialization and put the clr module into sys.modules, etc. - -// The "USE_PYTHON_RUNTIME_*" defines control what extra evidence is used -// to help the CLR find the appropriate Python.Runtime assembly. - -// If defined, the "pythonRuntimeVersionString" variable must be set to -// Python.Runtime's current version. - -#define USE_PYTHON_RUNTIME_VERSION - -// If defined, the "PythonRuntimePublicKeyTokenData" data array must be -// set to Python.Runtime's public key token. (sn -T Python.Runtin.dll) -#define USE_PYTHON_RUNTIME_PUBLIC_KEY_TOKEN - -// If DEBUG_PRINT is defined in the Build Properties, a few System.Console.WriteLine -// calls are made to indicate what's going on during the load... -//============================================================================ - - -// ReSharper disable CheckNamespace -// ReSharper disable InconsistentNaming -public class clrModule -// ReSharper restore InconsistentNaming -// ReSharper restore CheckNamespace -{ - - [RGiesecke.DllExport.DllExport("initclr", System.Runtime.InteropServices.CallingConvention.StdCall)] -// ReSharper disable InconsistentNaming - public static void initclr() -// ReSharper restore InconsistentNaming - { -#if DEBUG_PRINT - System.Console.WriteLine("Attempting to load Python.Runtime using standard binding rules... "); -#endif -#if USE_PYTHON_RUNTIME_PUBLIC_KEY_TOKEN - var pythonRuntimePublicKeyTokenData = new byte[] { 0x50, 0x00, 0xfe, 0xa6, 0xcb, 0xa7, 0x02, 0xdd }; -#endif - - // Attempt to find and load Python.Runtime using standard assembly binding rules. - // This roughly translates into looking in order: - // - GAC - // - ApplicationBase - // - A PrivateBinPath under ApplicationBase - // With an unsigned assembly, the GAC is skipped. - var pythonRuntimeName = new System.Reflection.AssemblyName("Python.Runtime") - { -#if USE_PYTHON_RUNTIME_VERSION - Version = new System.Version("4.0.0.1"), -#endif - CultureInfo = System.Globalization.CultureInfo.InvariantCulture, - }; -#if USE_PYTHON_RUNTIME_PUBLIC_KEY_TOKEN - pythonRuntimeName.SetPublicKeyToken(pythonRuntimePublicKeyTokenData); -#endif - // We've got the AssemblyName with optional features; try to load it. - System.Reflection.Assembly pythonRuntime; - try - { - pythonRuntime = System.Reflection.Assembly.Load(pythonRuntimeName); -#if DEBUG_PRINT - System.Console.WriteLine("Success!"); -#endif - } - catch (System.IO.FileNotFoundException) - { - try - { - // If the above fails for any reason, we fallback to attempting to load "Python.Runtime.dll" - // from the directory this assembly is running in. "This assembly" is probably "clr.pyd", - // sitting somewhere in PYTHONPATH. This is using Assembly.LoadFrom, and inherits all the - // caveats of that call. See MSDN docs for details. - // Suzanne Cook's blog is also an excellent source of info on this: - // http://blogs.msdn.com/suzcook/ - // http://blogs.msdn.com/suzcook/archive/2003/05/29/57143.aspx - // http://blogs.msdn.com/suzcook/archive/2003/06/13/57180.aspx - - var executingAssembly = System.Reflection.Assembly.GetExecutingAssembly(); - var assemblyDirectory = System.IO.Path.GetDirectoryName(executingAssembly.Location); - if (assemblyDirectory == null) - throw new System.InvalidOperationException(executingAssembly.Location); - var pythonRuntimeDllPath = System.IO.Path.Combine(assemblyDirectory, "Python.Runtime.dll"); -#if DEBUG_PRINT - System.Console.WriteLine("Attempting to load Python.Runtime from: '{0}'...", pythonRuntimeDllPath); -#endif - pythonRuntime = System.Reflection.Assembly.LoadFrom(pythonRuntimeDllPath); - } - catch (System.InvalidOperationException) { -#if DEBUG_PRINT - System.Console.WriteLine("Could not load Python.Runtime, so sad."); -#endif - return; - } - } - - // Once here, we've successfully loaded SOME version of Python.Runtime - // So now we get the PythonEngine and execute the InitExt method on it. - var pythonEngineType = pythonRuntime.GetType("Python.Runtime.PythonEngine"); - pythonEngineType.InvokeMember("InitExt", System.Reflection.BindingFlags.InvokeMethod, null, null, null); - } -} +// ========================================================================== +// This software is subject to the provisions of the Zope Public License, +// Version 2.0 (ZPL). A copy of the ZPL should accompany this distribution. +// THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED +// WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +// WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS +// FOR A PARTICULAR PURPOSE. +// ========================================================================== + +//============================================================================ +// This file replaces the hand-maintained stub that used to implement clr.dll. +// This is a line-by-line port from IL back to C#. +// We now use RGiesecke.DllExport on the required static init method so it can be +// loaded by a standard CPython interpreter as an extension module. When it +// is loaded, it bootstraps the managed runtime integration layer and defers +// to it to do initialization and put the clr module into sys.modules, etc. + +// The "USE_PYTHON_RUNTIME_*" defines control what extra evidence is used +// to help the CLR find the appropriate Python.Runtime assembly. + +// If defined, the "pythonRuntimeVersionString" variable must be set to +// Python.Runtime's current version. + +#define USE_PYTHON_RUNTIME_VERSION + +// If defined, the "PythonRuntimePublicKeyTokenData" data array must be +// set to Python.Runtime's public key token. (sn -T Python.Runtin.dll) +#define USE_PYTHON_RUNTIME_PUBLIC_KEY_TOKEN + +// If DEBUG_PRINT is defined in the Build Properties, a few System.Console.WriteLine +// calls are made to indicate what's going on during the load... +//============================================================================ + + +// ReSharper disable CheckNamespace +// ReSharper disable InconsistentNaming +public class clrModule +// ReSharper restore InconsistentNaming +// ReSharper restore CheckNamespace +{ + + [RGiesecke.DllExport.DllExport("initclr", System.Runtime.InteropServices.CallingConvention.StdCall)] +// ReSharper disable InconsistentNaming + public static void initclr() +// ReSharper restore InconsistentNaming + { +#if DEBUG_PRINT + System.Console.WriteLine("Attempting to load Python.Runtime using standard binding rules... "); +#endif +#if USE_PYTHON_RUNTIME_PUBLIC_KEY_TOKEN + var pythonRuntimePublicKeyTokenData = new byte[] { 0x50, 0x00, 0xfe, 0xa6, 0xcb, 0xa7, 0x02, 0xdd }; +#endif + + // Attempt to find and load Python.Runtime using standard assembly binding rules. + // This roughly translates into looking in order: + // - GAC + // - ApplicationBase + // - A PrivateBinPath under ApplicationBase + // With an unsigned assembly, the GAC is skipped. + var pythonRuntimeName = new System.Reflection.AssemblyName("Python.Runtime") + { +#if USE_PYTHON_RUNTIME_VERSION + Version = new System.Version("4.0.0.1"), +#endif + CultureInfo = System.Globalization.CultureInfo.InvariantCulture, + }; +#if USE_PYTHON_RUNTIME_PUBLIC_KEY_TOKEN + pythonRuntimeName.SetPublicKeyToken(pythonRuntimePublicKeyTokenData); +#endif + // We've got the AssemblyName with optional features; try to load it. + System.Reflection.Assembly pythonRuntime; + try + { + pythonRuntime = System.Reflection.Assembly.Load(pythonRuntimeName); +#if DEBUG_PRINT + System.Console.WriteLine("Success!"); +#endif + } + catch (System.IO.FileNotFoundException) + { + try + { + // If the above fails for any reason, we fallback to attempting to load "Python.Runtime.dll" + // from the directory this assembly is running in. "This assembly" is probably "clr.pyd", + // sitting somewhere in PYTHONPATH. This is using Assembly.LoadFrom, and inherits all the + // caveats of that call. See MSDN docs for details. + // Suzanne Cook's blog is also an excellent source of info on this: + // http://blogs.msdn.com/suzcook/ + // http://blogs.msdn.com/suzcook/archive/2003/05/29/57143.aspx + // http://blogs.msdn.com/suzcook/archive/2003/06/13/57180.aspx + + var executingAssembly = System.Reflection.Assembly.GetExecutingAssembly(); + var assemblyDirectory = System.IO.Path.GetDirectoryName(executingAssembly.Location); + if (assemblyDirectory == null) + throw new System.InvalidOperationException(executingAssembly.Location); + var pythonRuntimeDllPath = System.IO.Path.Combine(assemblyDirectory, "Python.Runtime.dll"); +#if DEBUG_PRINT + System.Console.WriteLine("Attempting to load Python.Runtime from: '{0}'...", pythonRuntimeDllPath); +#endif + pythonRuntime = System.Reflection.Assembly.LoadFrom(pythonRuntimeDllPath); + } + catch (System.InvalidOperationException) { +#if DEBUG_PRINT + System.Console.WriteLine("Could not load Python.Runtime, so sad."); +#endif + return; + } + } + + // Once here, we've successfully loaded SOME version of Python.Runtime + // So now we get the PythonEngine and execute the InitExt method on it. + var pythonEngineType = pythonRuntime.GetType("Python.Runtime.PythonEngine"); + pythonEngineType.InvokeMember("InitExt", System.Reflection.BindingFlags.InvokeMethod, null, null, null); + } +} diff --git a/pythonnet/src/clrmodule/Properties/AssemblyInfo.cs b/src/clrmodule/Properties/AssemblyInfo.cs similarity index 97% rename from pythonnet/src/clrmodule/Properties/AssemblyInfo.cs rename to src/clrmodule/Properties/AssemblyInfo.cs index a7a317b08..dbf311d9a 100644 --- a/pythonnet/src/clrmodule/Properties/AssemblyInfo.cs +++ b/src/clrmodule/Properties/AssemblyInfo.cs @@ -1,36 +1,36 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("clrmodule")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("clrmodule")] -[assembly: AssemblyCopyright("Copyright © 2013")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("ae10d6a4-55c2-482f-9716-9988e6c169e3")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: AssemblyTitle("clrmodule")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("clrmodule")] +[assembly: AssemblyCopyright("Copyright © 2013")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from +// COM, set the ComVisible attribute to true on that type. +[assembly: ComVisible(false)] + +// The following GUID is for the ID of the typelib if this project is exposed to COM +[assembly: Guid("ae10d6a4-55c2-482f-9716-9988e6c169e3")] + +// Version information for an assembly consists of the following four values: +// +// Major Version +// Minor Version +// Build Number +// Revision +// +// You can specify all the values or you can default the Build and Revision Numbers +// by using the '*' as shown below: +// [assembly: AssemblyVersion("1.0.*")] +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/pythonnet/src/clrmodule/clrmodule.csproj b/src/clrmodule/clrmodule.csproj similarity index 98% rename from pythonnet/src/clrmodule/clrmodule.csproj rename to src/clrmodule/clrmodule.csproj index 85a686162..92dc2a945 100644 --- a/pythonnet/src/clrmodule/clrmodule.csproj +++ b/src/clrmodule/clrmodule.csproj @@ -1,126 +1,126 @@ - - - - Debug - x86 - 8.0.30703 - 2.0 - {86E834DE-1139-4511-96CC-69636A56E7AC} - Library - Properties - clrmodule - clrmodule - v4.0 - 512 - ..\..\ - $(SolutionDir) - true - - - true - bin\x86\DebugMono\ - DEBUG;TRACE - full - x86 - prompt - true - true - false - - - true - bin\x64\DebugMono\ - DEBUG;TRACE - full - x64 - prompt - true - true - false - - - bin\x86\ReleaseMono\ - - true - pdbonly - x86 - prompt - true - true - false - - - bin\x64\ReleaseMono\ - - true - pdbonly - x64 - prompt - true - true - false - - - true - bin\x86\DebugWin\ - TRACE;DEBUG;DEBUG_PRINT - full - x86 - prompt - true - false - false - - - true - bin\x64\DebugWin\ - DEBUG;TRACE - full - x64 - prompt - true - true - false - - - bin\x86\ReleaseWin\ - - true - pdbonly - x86 - prompt - true - true - false - - - bin\x64\ReleaseWin\ - - true - pdbonly - x64 - prompt - true - true - false - - - - ..\..\packages\UnmanagedExports.1.2.6\lib\net\RGiesecke.DllExport.Metadata.dll - False - - - - - - - - - - - - - - - + + + + Debug + x86 + 8.0.30703 + 2.0 + {86E834DE-1139-4511-96CC-69636A56E7AC} + Library + Properties + clrmodule + clrmodule + v4.0 + 512 + ..\..\ + $(SolutionDir) + true + + + true + bin\x86\DebugMono\ + DEBUG;TRACE + full + x86 + prompt + true + true + false + + + true + bin\x64\DebugMono\ + DEBUG;TRACE + full + x64 + prompt + true + true + false + + + bin\x86\ReleaseMono\ + + true + pdbonly + x86 + prompt + true + true + false + + + bin\x64\ReleaseMono\ + + true + pdbonly + x64 + prompt + true + true + false + + + true + bin\x86\DebugWin\ + TRACE;DEBUG;DEBUG_PRINT + full + x86 + prompt + true + false + false + + + true + bin\x64\DebugWin\ + DEBUG;TRACE + full + x64 + prompt + true + true + false + + + bin\x86\ReleaseWin\ + + true + pdbonly + x86 + prompt + true + true + false + + + bin\x64\ReleaseWin\ + + true + pdbonly + x64 + prompt + true + true + false + + + + ..\..\packages\UnmanagedExports.1.2.6\lib\net\RGiesecke.DllExport.Metadata.dll + False + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/pythonnet/src/clrmodule/packages.config b/src/clrmodule/packages.config similarity index 97% rename from pythonnet/src/clrmodule/packages.config rename to src/clrmodule/packages.config index f7d898f5c..05f605e37 100644 --- a/pythonnet/src/clrmodule/packages.config +++ b/src/clrmodule/packages.config @@ -1,4 +1,4 @@ - - - + + + \ No newline at end of file diff --git a/pythonnet/src/console/Console.csproj b/src/console/Console.csproj similarity index 97% rename from pythonnet/src/console/Console.csproj rename to src/console/Console.csproj index 2bbb182b7..6a8baad95 100644 --- a/pythonnet/src/console/Console.csproj +++ b/src/console/Console.csproj @@ -1,215 +1,215 @@ - - - - Debug - AnyCPU - {E29DCF0A-5114-4A98-B1DD-71264B6EA349} - Exe - false - nPython - Python.Runtime - OnBuildSuccess - - - - - 3.5 - python-clear.ico - 10.0.0 - 2.0 - ..\..\ - $(SolutionDir) - - - True - full - False - bin\Debug\ - DEBUG;TRACE - 4 - - - pdbonly - True - bin\Release\ - TRACE - True - false - 4 - - - True - bin\EmbeddingTest\ - DEBUG;TRACE - full - AnyCPU - 4 - False - - - True - bin\UnitTests\ - DEBUG;TRACE - full - AnyCPU - 4 - False - - - True - bin\x86\Debug\ - DEBUG;TRACE - full - x86 - true - true - True - 4 - False - False - - - True - bin\x86\Release\ - TRACE - True - pdbonly - x86 - false - true - true - 4 - - - True - bin\x86\EmbeddingTest\ - DEBUG;TRACE - full - x86 - 4 - False - - - True - bin\x86\UnitTests\ - DEBUG;TRACE - full - x86 - false - false - 4 - False - - - True - bin\DebugMono_x86\ - DEBUG;TRACE - full - AnyCPU - 4 - False - - - True - bin\x86\DebugMono_x86\ - DEBUG;TRACE - full - x86 - true - true - 4 - False - - - True - bin\x64\Debug\ - DEBUG;TRACE - full - x64 - true - true - false - 4 - False - - - True - bin\x64\Release\ - TRACE - True - pdbonly - x64 - false - true - true - false - 4 - - - True - bin\x64\EmbeddingTest\ - DEBUG;TRACE - full - x64 - false - false - false - 4 - False - - - True - bin\x64\UnitTests\ - DEBUG;TRACE - full - x64 - false - false - 4 - False - - - True - bin\x64\DebugMono_x86\ - DEBUG;TRACE - full - x64 - true - true - false - 4 - False - - - - - 3.5 - - - - - - - - - - Python.Runtime.dll - - - - - - - - {097b4ac0-74e9-4c58-bcf8-c69746ec8271} - Python.Runtime - - - - - - - - - + + + + Debug + AnyCPU + {E29DCF0A-5114-4A98-B1DD-71264B6EA349} + Exe + false + nPython + Python.Runtime + OnBuildSuccess + + + + + 3.5 + python-clear.ico + 10.0.0 + 2.0 + ..\..\ + $(SolutionDir) + + + True + full + False + bin\Debug\ + DEBUG;TRACE + 4 + + + pdbonly + True + bin\Release\ + TRACE + True + false + 4 + + + True + bin\EmbeddingTest\ + DEBUG;TRACE + full + AnyCPU + 4 + False + + + True + bin\UnitTests\ + DEBUG;TRACE + full + AnyCPU + 4 + False + + + True + bin\x86\Debug\ + DEBUG;TRACE + full + x86 + true + true + True + 4 + False + False + + + True + bin\x86\Release\ + TRACE + True + pdbonly + x86 + false + true + true + 4 + + + True + bin\x86\EmbeddingTest\ + DEBUG;TRACE + full + x86 + 4 + False + + + True + bin\x86\UnitTests\ + DEBUG;TRACE + full + x86 + false + false + 4 + False + + + True + bin\DebugMono_x86\ + DEBUG;TRACE + full + AnyCPU + 4 + False + + + True + bin\x86\DebugMono_x86\ + DEBUG;TRACE + full + x86 + true + true + 4 + False + + + True + bin\x64\Debug\ + DEBUG;TRACE + full + x64 + true + true + false + 4 + False + + + True + bin\x64\Release\ + TRACE + True + pdbonly + x64 + false + true + true + false + 4 + + + True + bin\x64\EmbeddingTest\ + DEBUG;TRACE + full + x64 + false + false + false + 4 + False + + + True + bin\x64\UnitTests\ + DEBUG;TRACE + full + x64 + false + false + 4 + False + + + True + bin\x64\DebugMono_x86\ + DEBUG;TRACE + full + x64 + true + true + false + 4 + False + + + + + 3.5 + + + + + + + + + + Python.Runtime.dll + + + + + + + + {097b4ac0-74e9-4c58-bcf8-c69746ec8271} + Python.Runtime + + + + + + + + + \ No newline at end of file diff --git a/pythonnet/src/console/Console.mdp b/src/console/Console.mdp similarity index 100% rename from pythonnet/src/console/Console.mdp rename to src/console/Console.mdp diff --git a/pythonnet/src/console/app.config b/src/console/app.config similarity index 97% rename from pythonnet/src/console/app.config rename to src/console/app.config index cb2586beb..e36560333 100644 --- a/pythonnet/src/console/app.config +++ b/src/console/app.config @@ -1,3 +1,3 @@ - - - + + + diff --git a/pythonnet/src/console/assemblyinfo.cs b/src/console/assemblyinfo.cs similarity index 100% rename from pythonnet/src/console/assemblyinfo.cs rename to src/console/assemblyinfo.cs diff --git a/pythonnet/src/console/python-clear.ico b/src/console/python-clear.ico similarity index 100% rename from pythonnet/src/console/python-clear.ico rename to src/console/python-clear.ico diff --git a/pythonnet/src/console/pythonconsole.cs b/src/console/pythonconsole.cs similarity index 100% rename from pythonnet/src/console/pythonconsole.cs rename to src/console/pythonconsole.cs diff --git a/pythonnet/src/console/sourceforge-logo.png b/src/console/sourceforge-logo.png similarity index 100% rename from pythonnet/src/console/sourceforge-logo.png rename to src/console/sourceforge-logo.png diff --git a/pythonnet/src/embed_tests/Embeddingtest.VisualState.xml b/src/embed_tests/Embeddingtest.VisualState.xml similarity index 98% rename from pythonnet/src/embed_tests/Embeddingtest.VisualState.xml rename to src/embed_tests/Embeddingtest.VisualState.xml index cbd5bb85c..4909bca42 100644 --- a/pythonnet/src/embed_tests/Embeddingtest.VisualState.xml +++ b/src/embed_tests/Embeddingtest.VisualState.xml @@ -1,21 +1,21 @@ - - - [0-1000]C:\Users\Barton\Documents\Visual Studio 2008\Projects\PySharp\trunk\pythonnet\src\embed_tests\Embeddingtest.nunit - [0-1003]Python.EmbeddingTest.PyImportTest - false - - - - - - - - - - - - - - - + + + [0-1000]C:\Users\Barton\Documents\Visual Studio 2008\Projects\PySharp\trunk\pythonnet\src\embed_tests\Embeddingtest.nunit + [0-1003]Python.EmbeddingTest.PyImportTest + false + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/pythonnet/src/embed_tests/Embeddingtest.nunit b/src/embed_tests/Embeddingtest.nunit similarity index 97% rename from pythonnet/src/embed_tests/Embeddingtest.nunit rename to src/embed_tests/Embeddingtest.nunit index 73b915a26..ab4a73f4e 100644 --- a/pythonnet/src/embed_tests/Embeddingtest.nunit +++ b/src/embed_tests/Embeddingtest.nunit @@ -1,7 +1,7 @@ - - - - - - + + + + + + \ No newline at end of file diff --git a/pythonnet/src/embed_tests/Python.EmbeddingTest.csproj b/src/embed_tests/Python.EmbeddingTest.csproj similarity index 97% rename from pythonnet/src/embed_tests/Python.EmbeddingTest.csproj rename to src/embed_tests/Python.EmbeddingTest.csproj index 6a1752783..14f97f5fb 100644 --- a/pythonnet/src/embed_tests/Python.EmbeddingTest.csproj +++ b/src/embed_tests/Python.EmbeddingTest.csproj @@ -1,178 +1,178 @@ - - - - Debug - AnyCPU - {4165C59D-2822-499F-A6DB-EACA4C331EB5} - Library - false - Python.EmbeddingTest - Python.EmbeddingTest - OnBuildSuccess - - - - - 3.5 - publish\ - true - Disk - false - Foreground - 7 - Days - false - false - true - 0 - 1.0.0.%2a - false - false - true - 10.0.0 - 2.0 - ..\..\ - $(SolutionDir) - true - - - true - bin\x86\DebugMono\ - DEBUG;TRACE - full - x86 - prompt - true - true - false - - - true - bin\x64\DebugMono\ - DEBUG;TRACE - full - x64 - prompt - true - true - false - - - bin\x86\ReleaseMono\ - - true - pdbonly - x86 - prompt - true - true - false - - - bin\x64\ReleaseMono\ - - true - pdbonly - x64 - prompt - true - true - false - - - true - bin\x86\DebugWin\ - DEBUG;TRACE - full - x86 - prompt - true - false - false - - - true - bin\x64\DebugWin\ - DEBUG;TRACE - full - x64 - prompt - true - true - false - - - bin\x86\ReleaseWin\ - - true - pdbonly - x86 - prompt - true - true - false - - - bin\x64\ReleaseWin\ - - true - pdbonly - x64 - prompt - true - true - false - - - - - 3.5 - - - ..\..\packages\NUnit.2.6.2\lib\nunit.framework.dll - - - - - - - - - - - Code - - - - - - - False - .NET Framework 2.0 %28x86%29 - true - - - False - .NET Framework 3.0 %28x86%29 - false - - - False - .NET Framework 3.5 - false - - - - - {097B4AC0-74E9-4C58-BCF8-C69746EC8271} - Python.Runtime - - - - - - - - - - + + + + Debug + AnyCPU + {4165C59D-2822-499F-A6DB-EACA4C331EB5} + Library + false + Python.EmbeddingTest + Python.EmbeddingTest + OnBuildSuccess + + + + + 3.5 + publish\ + true + Disk + false + Foreground + 7 + Days + false + false + true + 0 + 1.0.0.%2a + false + false + true + 10.0.0 + 2.0 + ..\..\ + $(SolutionDir) + true + + + true + bin\x86\DebugMono\ + DEBUG;TRACE + full + x86 + prompt + true + true + false + + + true + bin\x64\DebugMono\ + DEBUG;TRACE + full + x64 + prompt + true + true + false + + + bin\x86\ReleaseMono\ + + true + pdbonly + x86 + prompt + true + true + false + + + bin\x64\ReleaseMono\ + + true + pdbonly + x64 + prompt + true + true + false + + + true + bin\x86\DebugWin\ + DEBUG;TRACE + full + x86 + prompt + true + false + false + + + true + bin\x64\DebugWin\ + DEBUG;TRACE + full + x64 + prompt + true + true + false + + + bin\x86\ReleaseWin\ + + true + pdbonly + x86 + prompt + true + true + false + + + bin\x64\ReleaseWin\ + + true + pdbonly + x64 + prompt + true + true + false + + + + + 3.5 + + + ..\..\packages\NUnit.2.6.2\lib\nunit.framework.dll + + + + + + + + + + + Code + + + + + + + False + .NET Framework 2.0 %28x86%29 + true + + + False + .NET Framework 3.0 %28x86%29 + false + + + False + .NET Framework 3.5 + false + + + + + {097B4AC0-74E9-4C58-BCF8-C69746EC8271} + Python.Runtime + + + + + + + + + + diff --git a/pythonnet/src/embed_tests/packages.config b/src/embed_tests/packages.config similarity index 100% rename from pythonnet/src/embed_tests/packages.config rename to src/embed_tests/packages.config diff --git a/pythonnet/src/embed_tests/pyimport.cs b/src/embed_tests/pyimport.cs similarity index 100% rename from pythonnet/src/embed_tests/pyimport.cs rename to src/embed_tests/pyimport.cs diff --git a/pythonnet/src/embed_tests/pyiter.cs b/src/embed_tests/pyiter.cs similarity index 100% rename from pythonnet/src/embed_tests/pyiter.cs rename to src/embed_tests/pyiter.cs diff --git a/pythonnet/src/embed_tests/pylong.cs b/src/embed_tests/pylong.cs similarity index 95% rename from pythonnet/src/embed_tests/pylong.cs rename to src/embed_tests/pylong.cs index 567736985..1b5ffdb66 100644 --- a/pythonnet/src/embed_tests/pylong.cs +++ b/src/embed_tests/pylong.cs @@ -1,34 +1,34 @@ -using System; -using NUnit.Framework; -using Python.Runtime; - -namespace Python.EmbeddingTest -{ - [TestFixture] - public class PyLongTest - { - private IntPtr gs; - - [SetUp] - public void SetUp() - { - PythonEngine.Initialize(); - gs = PythonEngine.AcquireLock(); - } - - [TearDown] - public void TearDown() - { - PythonEngine.ReleaseLock(gs); - PythonEngine.Shutdown(); - } - - [Test] - public void TestToInt64() - { - long largeNumber = 8L * 1024L * 1024L * 1024L; // 8 GB - PyLong pyLargeNumber = new PyLong(largeNumber); - Assert.AreEqual(largeNumber, pyLargeNumber.ToInt64()); - } - } -} +using System; +using NUnit.Framework; +using Python.Runtime; + +namespace Python.EmbeddingTest +{ + [TestFixture] + public class PyLongTest + { + private IntPtr gs; + + [SetUp] + public void SetUp() + { + PythonEngine.Initialize(); + gs = PythonEngine.AcquireLock(); + } + + [TearDown] + public void TearDown() + { + PythonEngine.ReleaseLock(gs); + PythonEngine.Shutdown(); + } + + [Test] + public void TestToInt64() + { + long largeNumber = 8L * 1024L * 1024L * 1024L; // 8 GB + PyLong pyLargeNumber = new PyLong(largeNumber); + Assert.AreEqual(largeNumber, pyLargeNumber.ToInt64()); + } + } +} diff --git a/pythonnet/src/embed_tests/pyobject.cs b/src/embed_tests/pyobject.cs similarity index 100% rename from pythonnet/src/embed_tests/pyobject.cs rename to src/embed_tests/pyobject.cs diff --git a/pythonnet/src/embed_tests/pythonexception.cs b/src/embed_tests/pythonexception.cs similarity index 100% rename from pythonnet/src/embed_tests/pythonexception.cs rename to src/embed_tests/pythonexception.cs diff --git a/pythonnet/src/monoclr/clrmod.c b/src/monoclr/clrmod.c similarity index 100% rename from pythonnet/src/monoclr/clrmod.c rename to src/monoclr/clrmod.c diff --git a/pythonnet/src/monoclr/clrpython.c b/src/monoclr/clrpython.c similarity index 100% rename from pythonnet/src/monoclr/clrpython.c rename to src/monoclr/clrpython.c diff --git a/pythonnet/src/monoclr/pynetclr.h b/src/monoclr/pynetclr.h similarity index 100% rename from pythonnet/src/monoclr/pynetclr.h rename to src/monoclr/pynetclr.h diff --git a/pythonnet/src/monoclr/pynetinit.c b/src/monoclr/pynetinit.c similarity index 100% rename from pythonnet/src/monoclr/pynetinit.c rename to src/monoclr/pynetinit.c diff --git a/pythonnet/src/monoclr/python.c b/src/monoclr/python.c similarity index 100% rename from pythonnet/src/monoclr/python.c rename to src/monoclr/python.c diff --git a/pythonnet/src/runtime/Python.Runtime.csproj b/src/runtime/Python.Runtime.csproj similarity index 97% rename from pythonnet/src/runtime/Python.Runtime.csproj rename to src/runtime/Python.Runtime.csproj index d4132da2c..f5bf3378a 100644 --- a/pythonnet/src/runtime/Python.Runtime.csproj +++ b/src/runtime/Python.Runtime.csproj @@ -1,190 +1,190 @@ - - - - Debug - x86 - {097B4AC0-74E9-4C58-BCF8-C69746EC8271} - Library - false - Python.Runtime - Python.Runtime - ..\..\ - $(SolutionDir) - - - bin\x86\ReleaseMono\ - PYTHON27, UCS4 - true - true - pdbonly - x86 - false - true - - - bin\x64\ReleaseMono\ - PYTHON27, UCS4 - true - true - pdbonly - x64 - false - true - - - bin\x86\ReleaseWin\ - PYTHON27, UCS2 - true - true - pdbonly - x86 - false - true - - - bin\x64\ReleaseWin\ - PYTHON27, UCS2 - true - true - pdbonly - x64 - false - true - - - true - bin\x86\DebugMono\ - TRACE;DEBUG;PYTHON27,UCS4 - true - false - full - x86 - false - false - false - - - true - bin\x64\DebugMono\ - TRACE;DEBUG;PYTHON27,UCS4 - true - false - full - x64 - - - true - bin\x86\DebugWin\ - TRACE;DEBUG;PYTHON27,UCS2 - true - false - full - x86 - false - false - false - - - true - bin\x64\DebugWin\ - TRACE;DEBUG;PYTHON27,UCS2 - true - false - full - x64 - - - - - - False - ..\..\packages\MonoGAC\Mono.Posix\4.0.0.0__0738eb9f132ed756\Mono.Posix.dll - - - - - - - False - ..\..\packages\MonoGAC\Mono.Posix\4.0.0.0__0738eb9f132ed756\Mono.Posix.dll - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + Debug + x86 + {097B4AC0-74E9-4C58-BCF8-C69746EC8271} + Library + false + Python.Runtime + Python.Runtime + ..\..\ + $(SolutionDir) + + + bin\x86\ReleaseMono\ + PYTHON27, UCS4 + true + true + pdbonly + x86 + false + true + + + bin\x64\ReleaseMono\ + PYTHON27, UCS4 + true + true + pdbonly + x64 + false + true + + + bin\x86\ReleaseWin\ + PYTHON27, UCS2 + true + true + pdbonly + x86 + false + true + + + bin\x64\ReleaseWin\ + PYTHON27, UCS2 + true + true + pdbonly + x64 + false + true + + + true + bin\x86\DebugMono\ + TRACE;DEBUG;PYTHON27,UCS4 + true + false + full + x86 + false + false + false + + + true + bin\x64\DebugMono\ + TRACE;DEBUG;PYTHON27,UCS4 + true + false + full + x64 + + + true + bin\x86\DebugWin\ + TRACE;DEBUG;PYTHON27,UCS2 + true + false + full + x86 + false + false + false + + + true + bin\x64\DebugWin\ + TRACE;DEBUG;PYTHON27,UCS2 + true + false + full + x64 + + + + + + False + ..\..\packages\MonoGAC\Mono.Posix\4.0.0.0__0738eb9f132ed756\Mono.Posix.dll + + + + + + + False + ..\..\packages\MonoGAC\Mono.Posix\4.0.0.0__0738eb9f132ed756\Mono.Posix.dll + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/pythonnet/src/runtime/Python.Runtime.mdp b/src/runtime/Python.Runtime.mdp similarity index 100% rename from pythonnet/src/runtime/Python.Runtime.mdp rename to src/runtime/Python.Runtime.mdp diff --git a/pythonnet/src/runtime/arrayobject.cs b/src/runtime/arrayobject.cs similarity index 100% rename from pythonnet/src/runtime/arrayobject.cs rename to src/runtime/arrayobject.cs diff --git a/pythonnet/src/runtime/assemblyinfo.cs b/src/runtime/assemblyinfo.cs similarity index 100% rename from pythonnet/src/runtime/assemblyinfo.cs rename to src/runtime/assemblyinfo.cs diff --git a/pythonnet/src/runtime/assemblymanager.cs b/src/runtime/assemblymanager.cs similarity index 100% rename from pythonnet/src/runtime/assemblymanager.cs rename to src/runtime/assemblymanager.cs diff --git a/pythonnet/src/runtime/buildclrmodule.bat b/src/runtime/buildclrmodule.bat similarity index 96% rename from pythonnet/src/runtime/buildclrmodule.bat rename to src/runtime/buildclrmodule.bat index 549902d7f..125ff9090 100644 --- a/pythonnet/src/runtime/buildclrmodule.bat +++ b/src/runtime/buildclrmodule.bat @@ -1,36 +1,36 @@ -:: Call with buildclrmodule.bat - -@echo off - -set TARGET_PLATFORM=%1 -set INPUT_DIRECTORY=%~2 -set INPUT_PATH="%INPUT_DIRECTORY%\clrmodule.il" -set OUTPUT_PATH=%3 - -if %TARGET_PLATFORM%==x86 goto SETUP32 -if %TARGET_PLATFORM%==x64 goto SETUP64 -goto ERROR_BAD_PLATFORM - -:SETUP32 -set INCLUDE_PATH="%INPUT_DIRECTORY%\x86" -goto BUILD_CLR_MODULE - -:SETUP64 -set INCLUDE_PATH="%INPUT_DIRECTORY%\x64" -set ILASM_EXTRA_ARGS=/pe64 /x64 -goto BUILD_CLR_MODULE - -:ERROR_BAD_PLATFORM -echo Unknown target platform: %TARGET_PLATFORM% -exit /b 1 - -:ERROR_MISSING_INPUT -echo Can't find input file: %INPUT_PATH% -exit /b 1 - -:BUILD_CLR_MODULE -if not exist %INPUT_PATH% goto ERROR_MISSING_INPUT -%windir%\Microsoft.NET\Framework\v4.0.30319\ilasm /nologo /quiet /dll %ILASM_EXTRA_ARGS% /include=%INCLUDE_PATH% /output=%OUTPUT_PATH% %INPUT_PATH% - -::: 2.0 or 3.5 -:::%windir%\Microsoft.NET\Framework\v2.0.50727\ilasm /nologo /quiet /dll %ILASM_EXTRA_ARGS% /include=%INCLUDE_PATH% /output=%OUTPUT_PATH% %INPUT_PATH% +:: Call with buildclrmodule.bat + +@echo off + +set TARGET_PLATFORM=%1 +set INPUT_DIRECTORY=%~2 +set INPUT_PATH="%INPUT_DIRECTORY%\clrmodule.il" +set OUTPUT_PATH=%3 + +if %TARGET_PLATFORM%==x86 goto SETUP32 +if %TARGET_PLATFORM%==x64 goto SETUP64 +goto ERROR_BAD_PLATFORM + +:SETUP32 +set INCLUDE_PATH="%INPUT_DIRECTORY%\x86" +goto BUILD_CLR_MODULE + +:SETUP64 +set INCLUDE_PATH="%INPUT_DIRECTORY%\x64" +set ILASM_EXTRA_ARGS=/pe64 /x64 +goto BUILD_CLR_MODULE + +:ERROR_BAD_PLATFORM +echo Unknown target platform: %TARGET_PLATFORM% +exit /b 1 + +:ERROR_MISSING_INPUT +echo Can't find input file: %INPUT_PATH% +exit /b 1 + +:BUILD_CLR_MODULE +if not exist %INPUT_PATH% goto ERROR_MISSING_INPUT +%windir%\Microsoft.NET\Framework\v4.0.30319\ilasm /nologo /quiet /dll %ILASM_EXTRA_ARGS% /include=%INCLUDE_PATH% /output=%OUTPUT_PATH% %INPUT_PATH% + +::: 2.0 or 3.5 +:::%windir%\Microsoft.NET\Framework\v2.0.50727\ilasm /nologo /quiet /dll %ILASM_EXTRA_ARGS% /include=%INCLUDE_PATH% /output=%OUTPUT_PATH% %INPUT_PATH% diff --git a/pythonnet/src/runtime/classbase.cs b/src/runtime/classbase.cs similarity index 100% rename from pythonnet/src/runtime/classbase.cs rename to src/runtime/classbase.cs diff --git a/pythonnet/src/runtime/classmanager.cs b/src/runtime/classmanager.cs similarity index 100% rename from pythonnet/src/runtime/classmanager.cs rename to src/runtime/classmanager.cs diff --git a/pythonnet/src/runtime/classobject.cs b/src/runtime/classobject.cs similarity index 100% rename from pythonnet/src/runtime/classobject.cs rename to src/runtime/classobject.cs diff --git a/pythonnet/src/runtime/clrmodule.il b/src/runtime/clrmodule.il old mode 100755 new mode 100644 similarity index 100% rename from pythonnet/src/runtime/clrmodule.il rename to src/runtime/clrmodule.il diff --git a/pythonnet/src/runtime/clrmodule.pp.il b/src/runtime/clrmodule.pp.il similarity index 100% rename from pythonnet/src/runtime/clrmodule.pp.il rename to src/runtime/clrmodule.pp.il diff --git a/pythonnet/src/runtime/clrobject.cs b/src/runtime/clrobject.cs similarity index 100% rename from pythonnet/src/runtime/clrobject.cs rename to src/runtime/clrobject.cs diff --git a/pythonnet/src/runtime/codegenerator.cs b/src/runtime/codegenerator.cs similarity index 100% rename from pythonnet/src/runtime/codegenerator.cs rename to src/runtime/codegenerator.cs diff --git a/pythonnet/src/runtime/constructorbinder.cs b/src/runtime/constructorbinder.cs similarity index 100% rename from pythonnet/src/runtime/constructorbinder.cs rename to src/runtime/constructorbinder.cs diff --git a/pythonnet/src/runtime/constructorbinding.cs b/src/runtime/constructorbinding.cs similarity index 97% rename from pythonnet/src/runtime/constructorbinding.cs rename to src/runtime/constructorbinding.cs index 8ed887912..c5f014469 100644 --- a/pythonnet/src/runtime/constructorbinding.cs +++ b/src/runtime/constructorbinding.cs @@ -1,237 +1,237 @@ -// ========================================================================== -// This software is subject to the provisions of the Zope Public License, -// Version 2.0 (ZPL). A copy of the ZPL should accompany this distribution. -// THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED -// WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -// WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS -// FOR A PARTICULAR PURPOSE. -// ========================================================================== - -using System; -using System.Reflection; - -namespace Python.Runtime { - - /// - /// Implements a Python type that wraps a CLR ctor call. Constructor objects - /// support a .Overloads[] syntax to allow explicit ctor overload selection. - /// - /// - /// ClassManager stores a ConstructorBinding instance in the class's __dict__['Overloads'] - /// - /// SomeType.Overloads[Type, ...] works like this: - /// 1) Python retreives the Overloads attribute from this ClassObject's dictionary normally - /// and finds a non-null tp_descr_get slot which is called by the interpreter - /// and returns an IncRef()ed pyHandle to itself. - /// 2) The ConstructorBinding object handles the [] syntax in its mp_subscript by matching - /// the Type object parameters to a contructor overload using Type.GetConstructor() - /// [NOTE: I don't know why method overloads are not searched the same way.] - /// and creating the BoundContructor oject which contains ContructorInfo object. - /// 3) In tp_call, if ctorInfo is not null, ctorBinder.InvokeRaw() is called. - /// - internal class ConstructorBinding : ExtensionType - { - Type type; // The managed Type being wrapped in a ClassObject - IntPtr pyTypeHndl; // The python type tells GetInstHandle which Type to create. - ConstructorBinder ctorBinder; - IntPtr repr; - - public ConstructorBinding(Type type, IntPtr pyTypeHndl, ConstructorBinder ctorBinder) : base() { - this.type = type; - Runtime.Incref(pyTypeHndl); - this.pyTypeHndl = pyTypeHndl; - this.ctorBinder = ctorBinder; - repr = IntPtr.Zero; - } - - /// - /// Descriptor __get__ implementation. - /// Implements a Python type that wraps a CLR ctor call that requires the use - /// of a .Overloads[pyTypeOrType...] syntax to allow explicit ctor overload - /// selection. - /// - /// PyObject* to a Constructors wrapper - /// the instance that the attribute was accessed through, - /// or None when the attribute is accessed through the owner - /// always the owner class - /// a CtorMapper (that borrows a reference to this python type and the - /// ClassObject's ConstructorBinder) wrapper. - /// - /// - /// Python 2.6.5 docs: - /// object.__get__(self, instance, owner) - /// Called to get the attribute of the owner class (class attribute access) - /// or of an instance of that class (instance attribute access). - /// owner is always the owner class, while instance is the instance that - /// the attribute was accessed through, or None when the attribute is accessed through the owner. - /// This method should return the (computed) attribute value or raise an AttributeError exception. - /// - public static IntPtr tp_descr_get(IntPtr op, IntPtr instance, IntPtr owner) - { - ConstructorBinding self = (ConstructorBinding)GetManagedObject(op); - if (self == null) { - return IntPtr.Zero; - } - - // It doesn't seem to matter if it's accessed through an instance (rather than via the type). - /*if (instance != IntPtr.Zero) { - // This is ugly! PyObject_IsInstance() returns 1 for true, 0 for false, -1 for error... - if (Runtime.PyObject_IsInstance(instance, owner) < 1) { - return Exceptions.RaiseTypeError("How in the world could that happen!"); - } - }*/ - Runtime.Incref(self.pyHandle); // Decref'd by the interpreter. - return self.pyHandle; - } - - //==================================================================== - // Implement explicit overload selection using subscript syntax ([]). - //==================================================================== - /// - /// ConstructorBinding.GetItem(PyObject *o, PyObject *key) - /// Return element of o corresponding to the object key or NULL on failure. - /// This is the equivalent of the Python expression o[key]. - /// - /// - /// - /// - public static IntPtr mp_subscript(IntPtr op, IntPtr key) { - ConstructorBinding self = (ConstructorBinding)GetManagedObject(op); - - Type[] types = Runtime.PythonArgsToTypeArray(key); - if (types == null) { - return Exceptions.RaiseTypeError("type(s) expected"); - } - //MethodBase[] methBaseArray = self.ctorBinder.GetMethods(); - //MethodBase ci = MatchSignature(methBaseArray, types); - ConstructorInfo ci = self.type.GetConstructor(types); - if (ci == null) { - string msg = "No match found for constructor signature"; - return Exceptions.RaiseTypeError(msg); - } - BoundContructor boundCtor = new BoundContructor(self.type, self.pyTypeHndl, self.ctorBinder, ci); - - /* Since nothing's chached, do we need the increment??? - Runtime.Incref(boundCtor.pyHandle); // Decref'd by the interpreter??? */ - return boundCtor.pyHandle; - } - - //==================================================================== - // ConstructorBinding __repr__ implementation [borrowed from MethodObject]. - //==================================================================== - - public static IntPtr tp_repr(IntPtr ob) { - ConstructorBinding self = (ConstructorBinding)GetManagedObject(ob); - if (self.repr != IntPtr.Zero) { - Runtime.Incref(self.repr); - return self.repr; - } - MethodBase[] methods = self.ctorBinder.GetMethods(); - string name = self.type.FullName; - string doc = ""; - for (int i = 0; i < methods.Length; i++) { - if (doc.Length > 0) - doc += "\n"; - string str = methods[i].ToString(); - int idx = str.IndexOf("("); - doc += String.Format("{0}{1}", name, str.Substring(idx)); - } - self.repr = Runtime.PyString_FromString(doc); - Runtime.Incref(self.repr); - return self.repr; - } - - //==================================================================== - // ConstructorBinding dealloc implementation. - //==================================================================== - - public static new void tp_dealloc(IntPtr ob) { - ConstructorBinding self = (ConstructorBinding)GetManagedObject(ob); - Runtime.Decref(self.repr); - Runtime.Decref(self.pyTypeHndl); - ExtensionType.FinalizeObject(self); - } - } - - /// - /// Implements a Python type that constucts the given Type given a particular ContructorInfo. - /// - /// - /// Here mostly because I wanted a new __repr__ function for the selected constructor. - /// An earlier implementation hung the __call__ on the ContructorBinding class and - /// returned an Incref()ed self.pyHandle from the __get__ function. - /// - internal class BoundContructor : ExtensionType { - Type type; // The managed Type being wrapped in a ClassObject - IntPtr pyTypeHndl; // The python type tells GetInstHandle which Type to create. - ConstructorBinder ctorBinder; - ConstructorInfo ctorInfo; - IntPtr repr; - - public BoundContructor(Type type, IntPtr pyTypeHndl, ConstructorBinder ctorBinder, ConstructorInfo ci) - : base() { - this.type = type; - Runtime.Incref(pyTypeHndl); - this.pyTypeHndl = pyTypeHndl; - this.ctorBinder = ctorBinder; - ctorInfo = ci; - repr = IntPtr.Zero; - } - - /// - /// BoundContructor.__call__(PyObject *callable_object, PyObject *args, PyObject *kw) - /// - /// PyObject *callable_object - /// PyObject *args - /// PyObject *kw - /// A reference to a new instance of the class by invoking the selected ctor(). - public static IntPtr tp_call(IntPtr op, IntPtr args, IntPtr kw) { - BoundContructor self = (BoundContructor)GetManagedObject(op); - // Even though a call with null ctorInfo just produces the old behavior - /*if (self.ctorInfo == null) { - string msg = "Usage: Class.Overloads[CLR_or_python_Type, ...]"; - return Exceptions.RaiseTypeError(msg); - }*/ - // Bind using ConstructorBinder.Bind and invoke the ctor providing a null instancePtr - // which will fire self.ctorInfo using ConstructorInfo.Invoke(). - Object obj = self.ctorBinder.InvokeRaw(IntPtr.Zero, args, kw, self.ctorInfo); - if (obj == null) { - // XXX set an error - return IntPtr.Zero; - } - // Instantiate the python object that wraps the result of the method call - // and return the PyObject* to it. - return CLRObject.GetInstHandle(obj, self.pyTypeHndl); - } - - //==================================================================== - // BoundContructor __repr__ implementation [borrowed from MethodObject]. - //==================================================================== - - public static IntPtr tp_repr(IntPtr ob) { - BoundContructor self = (BoundContructor)GetManagedObject(ob); - if (self.repr != IntPtr.Zero) { - Runtime.Incref(self.repr); - return self.repr; - } - string name = self.type.FullName; - string str = self.ctorInfo.ToString(); - int idx = str.IndexOf("("); - str = String.Format("returns a new {0}{1}", name, str.Substring(idx)); - self.repr = Runtime.PyString_FromString(str); - Runtime.Incref(self.repr); - return self.repr; - } - - //==================================================================== - // ConstructorBinding dealloc implementation. - //==================================================================== - - public static new void tp_dealloc(IntPtr ob) { - BoundContructor self = (BoundContructor)GetManagedObject(ob); - Runtime.Decref(self.repr); - Runtime.Decref(self.pyTypeHndl); - ExtensionType.FinalizeObject(self); - } - } -} +// ========================================================================== +// This software is subject to the provisions of the Zope Public License, +// Version 2.0 (ZPL). A copy of the ZPL should accompany this distribution. +// THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED +// WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +// WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS +// FOR A PARTICULAR PURPOSE. +// ========================================================================== + +using System; +using System.Reflection; + +namespace Python.Runtime { + + /// + /// Implements a Python type that wraps a CLR ctor call. Constructor objects + /// support a .Overloads[] syntax to allow explicit ctor overload selection. + /// + /// + /// ClassManager stores a ConstructorBinding instance in the class's __dict__['Overloads'] + /// + /// SomeType.Overloads[Type, ...] works like this: + /// 1) Python retreives the Overloads attribute from this ClassObject's dictionary normally + /// and finds a non-null tp_descr_get slot which is called by the interpreter + /// and returns an IncRef()ed pyHandle to itself. + /// 2) The ConstructorBinding object handles the [] syntax in its mp_subscript by matching + /// the Type object parameters to a contructor overload using Type.GetConstructor() + /// [NOTE: I don't know why method overloads are not searched the same way.] + /// and creating the BoundContructor oject which contains ContructorInfo object. + /// 3) In tp_call, if ctorInfo is not null, ctorBinder.InvokeRaw() is called. + /// + internal class ConstructorBinding : ExtensionType + { + Type type; // The managed Type being wrapped in a ClassObject + IntPtr pyTypeHndl; // The python type tells GetInstHandle which Type to create. + ConstructorBinder ctorBinder; + IntPtr repr; + + public ConstructorBinding(Type type, IntPtr pyTypeHndl, ConstructorBinder ctorBinder) : base() { + this.type = type; + Runtime.Incref(pyTypeHndl); + this.pyTypeHndl = pyTypeHndl; + this.ctorBinder = ctorBinder; + repr = IntPtr.Zero; + } + + /// + /// Descriptor __get__ implementation. + /// Implements a Python type that wraps a CLR ctor call that requires the use + /// of a .Overloads[pyTypeOrType...] syntax to allow explicit ctor overload + /// selection. + /// + /// PyObject* to a Constructors wrapper + /// the instance that the attribute was accessed through, + /// or None when the attribute is accessed through the owner + /// always the owner class + /// a CtorMapper (that borrows a reference to this python type and the + /// ClassObject's ConstructorBinder) wrapper. + /// + /// + /// Python 2.6.5 docs: + /// object.__get__(self, instance, owner) + /// Called to get the attribute of the owner class (class attribute access) + /// or of an instance of that class (instance attribute access). + /// owner is always the owner class, while instance is the instance that + /// the attribute was accessed through, or None when the attribute is accessed through the owner. + /// This method should return the (computed) attribute value or raise an AttributeError exception. + /// + public static IntPtr tp_descr_get(IntPtr op, IntPtr instance, IntPtr owner) + { + ConstructorBinding self = (ConstructorBinding)GetManagedObject(op); + if (self == null) { + return IntPtr.Zero; + } + + // It doesn't seem to matter if it's accessed through an instance (rather than via the type). + /*if (instance != IntPtr.Zero) { + // This is ugly! PyObject_IsInstance() returns 1 for true, 0 for false, -1 for error... + if (Runtime.PyObject_IsInstance(instance, owner) < 1) { + return Exceptions.RaiseTypeError("How in the world could that happen!"); + } + }*/ + Runtime.Incref(self.pyHandle); // Decref'd by the interpreter. + return self.pyHandle; + } + + //==================================================================== + // Implement explicit overload selection using subscript syntax ([]). + //==================================================================== + /// + /// ConstructorBinding.GetItem(PyObject *o, PyObject *key) + /// Return element of o corresponding to the object key or NULL on failure. + /// This is the equivalent of the Python expression o[key]. + /// + /// + /// + /// + public static IntPtr mp_subscript(IntPtr op, IntPtr key) { + ConstructorBinding self = (ConstructorBinding)GetManagedObject(op); + + Type[] types = Runtime.PythonArgsToTypeArray(key); + if (types == null) { + return Exceptions.RaiseTypeError("type(s) expected"); + } + //MethodBase[] methBaseArray = self.ctorBinder.GetMethods(); + //MethodBase ci = MatchSignature(methBaseArray, types); + ConstructorInfo ci = self.type.GetConstructor(types); + if (ci == null) { + string msg = "No match found for constructor signature"; + return Exceptions.RaiseTypeError(msg); + } + BoundContructor boundCtor = new BoundContructor(self.type, self.pyTypeHndl, self.ctorBinder, ci); + + /* Since nothing's chached, do we need the increment??? + Runtime.Incref(boundCtor.pyHandle); // Decref'd by the interpreter??? */ + return boundCtor.pyHandle; + } + + //==================================================================== + // ConstructorBinding __repr__ implementation [borrowed from MethodObject]. + //==================================================================== + + public static IntPtr tp_repr(IntPtr ob) { + ConstructorBinding self = (ConstructorBinding)GetManagedObject(ob); + if (self.repr != IntPtr.Zero) { + Runtime.Incref(self.repr); + return self.repr; + } + MethodBase[] methods = self.ctorBinder.GetMethods(); + string name = self.type.FullName; + string doc = ""; + for (int i = 0; i < methods.Length; i++) { + if (doc.Length > 0) + doc += "\n"; + string str = methods[i].ToString(); + int idx = str.IndexOf("("); + doc += String.Format("{0}{1}", name, str.Substring(idx)); + } + self.repr = Runtime.PyString_FromString(doc); + Runtime.Incref(self.repr); + return self.repr; + } + + //==================================================================== + // ConstructorBinding dealloc implementation. + //==================================================================== + + public static new void tp_dealloc(IntPtr ob) { + ConstructorBinding self = (ConstructorBinding)GetManagedObject(ob); + Runtime.Decref(self.repr); + Runtime.Decref(self.pyTypeHndl); + ExtensionType.FinalizeObject(self); + } + } + + /// + /// Implements a Python type that constucts the given Type given a particular ContructorInfo. + /// + /// + /// Here mostly because I wanted a new __repr__ function for the selected constructor. + /// An earlier implementation hung the __call__ on the ContructorBinding class and + /// returned an Incref()ed self.pyHandle from the __get__ function. + /// + internal class BoundContructor : ExtensionType { + Type type; // The managed Type being wrapped in a ClassObject + IntPtr pyTypeHndl; // The python type tells GetInstHandle which Type to create. + ConstructorBinder ctorBinder; + ConstructorInfo ctorInfo; + IntPtr repr; + + public BoundContructor(Type type, IntPtr pyTypeHndl, ConstructorBinder ctorBinder, ConstructorInfo ci) + : base() { + this.type = type; + Runtime.Incref(pyTypeHndl); + this.pyTypeHndl = pyTypeHndl; + this.ctorBinder = ctorBinder; + ctorInfo = ci; + repr = IntPtr.Zero; + } + + /// + /// BoundContructor.__call__(PyObject *callable_object, PyObject *args, PyObject *kw) + /// + /// PyObject *callable_object + /// PyObject *args + /// PyObject *kw + /// A reference to a new instance of the class by invoking the selected ctor(). + public static IntPtr tp_call(IntPtr op, IntPtr args, IntPtr kw) { + BoundContructor self = (BoundContructor)GetManagedObject(op); + // Even though a call with null ctorInfo just produces the old behavior + /*if (self.ctorInfo == null) { + string msg = "Usage: Class.Overloads[CLR_or_python_Type, ...]"; + return Exceptions.RaiseTypeError(msg); + }*/ + // Bind using ConstructorBinder.Bind and invoke the ctor providing a null instancePtr + // which will fire self.ctorInfo using ConstructorInfo.Invoke(). + Object obj = self.ctorBinder.InvokeRaw(IntPtr.Zero, args, kw, self.ctorInfo); + if (obj == null) { + // XXX set an error + return IntPtr.Zero; + } + // Instantiate the python object that wraps the result of the method call + // and return the PyObject* to it. + return CLRObject.GetInstHandle(obj, self.pyTypeHndl); + } + + //==================================================================== + // BoundContructor __repr__ implementation [borrowed from MethodObject]. + //==================================================================== + + public static IntPtr tp_repr(IntPtr ob) { + BoundContructor self = (BoundContructor)GetManagedObject(ob); + if (self.repr != IntPtr.Zero) { + Runtime.Incref(self.repr); + return self.repr; + } + string name = self.type.FullName; + string str = self.ctorInfo.ToString(); + int idx = str.IndexOf("("); + str = String.Format("returns a new {0}{1}", name, str.Substring(idx)); + self.repr = Runtime.PyString_FromString(str); + Runtime.Incref(self.repr); + return self.repr; + } + + //==================================================================== + // ConstructorBinding dealloc implementation. + //==================================================================== + + public static new void tp_dealloc(IntPtr ob) { + BoundContructor self = (BoundContructor)GetManagedObject(ob); + Runtime.Decref(self.repr); + Runtime.Decref(self.pyTypeHndl); + ExtensionType.FinalizeObject(self); + } + } +} diff --git a/pythonnet/src/runtime/converter.cs b/src/runtime/converter.cs similarity index 100% rename from pythonnet/src/runtime/converter.cs rename to src/runtime/converter.cs diff --git a/pythonnet/src/runtime/debughelper.cs b/src/runtime/debughelper.cs similarity index 100% rename from pythonnet/src/runtime/debughelper.cs rename to src/runtime/debughelper.cs diff --git a/pythonnet/src/runtime/delegatemanager.cs b/src/runtime/delegatemanager.cs similarity index 100% rename from pythonnet/src/runtime/delegatemanager.cs rename to src/runtime/delegatemanager.cs diff --git a/pythonnet/src/runtime/delegateobject.cs b/src/runtime/delegateobject.cs similarity index 100% rename from pythonnet/src/runtime/delegateobject.cs rename to src/runtime/delegateobject.cs diff --git a/pythonnet/src/runtime/eventbinding.cs b/src/runtime/eventbinding.cs similarity index 100% rename from pythonnet/src/runtime/eventbinding.cs rename to src/runtime/eventbinding.cs diff --git a/pythonnet/src/runtime/eventobject.cs b/src/runtime/eventobject.cs similarity index 100% rename from pythonnet/src/runtime/eventobject.cs rename to src/runtime/eventobject.cs diff --git a/pythonnet/src/runtime/exceptions.cs b/src/runtime/exceptions.cs similarity index 100% rename from pythonnet/src/runtime/exceptions.cs rename to src/runtime/exceptions.cs diff --git a/pythonnet/src/runtime/extensiontype.cs b/src/runtime/extensiontype.cs similarity index 100% rename from pythonnet/src/runtime/extensiontype.cs rename to src/runtime/extensiontype.cs diff --git a/pythonnet/src/runtime/fieldobject.cs b/src/runtime/fieldobject.cs similarity index 100% rename from pythonnet/src/runtime/fieldobject.cs rename to src/runtime/fieldobject.cs diff --git a/pythonnet/src/runtime/generictype.cs b/src/runtime/generictype.cs similarity index 100% rename from pythonnet/src/runtime/generictype.cs rename to src/runtime/generictype.cs diff --git a/pythonnet/src/runtime/genericutil.cs b/src/runtime/genericutil.cs similarity index 100% rename from pythonnet/src/runtime/genericutil.cs rename to src/runtime/genericutil.cs diff --git a/pythonnet/src/runtime/importhook.cs b/src/runtime/importhook.cs similarity index 100% rename from pythonnet/src/runtime/importhook.cs rename to src/runtime/importhook.cs diff --git a/pythonnet/src/runtime/indexer.cs b/src/runtime/indexer.cs similarity index 100% rename from pythonnet/src/runtime/indexer.cs rename to src/runtime/indexer.cs diff --git a/pythonnet/src/runtime/interfaceobject.cs b/src/runtime/interfaceobject.cs similarity index 100% rename from pythonnet/src/runtime/interfaceobject.cs rename to src/runtime/interfaceobject.cs diff --git a/pythonnet/src/runtime/interfaces.cs b/src/runtime/interfaces.cs similarity index 100% rename from pythonnet/src/runtime/interfaces.cs rename to src/runtime/interfaces.cs diff --git a/pythonnet/src/runtime/interop.cs b/src/runtime/interop.cs similarity index 100% rename from pythonnet/src/runtime/interop.cs rename to src/runtime/interop.cs diff --git a/pythonnet/src/runtime/iterator.cs b/src/runtime/iterator.cs similarity index 100% rename from pythonnet/src/runtime/iterator.cs rename to src/runtime/iterator.cs diff --git a/pythonnet/src/runtime/managedtype.cs b/src/runtime/managedtype.cs similarity index 100% rename from pythonnet/src/runtime/managedtype.cs rename to src/runtime/managedtype.cs diff --git a/pythonnet/src/runtime/metatype.cs b/src/runtime/metatype.cs similarity index 100% rename from pythonnet/src/runtime/metatype.cs rename to src/runtime/metatype.cs diff --git a/pythonnet/src/runtime/methodbinder.cs b/src/runtime/methodbinder.cs similarity index 100% rename from pythonnet/src/runtime/methodbinder.cs rename to src/runtime/methodbinder.cs diff --git a/pythonnet/src/runtime/methodbinding.cs b/src/runtime/methodbinding.cs similarity index 100% rename from pythonnet/src/runtime/methodbinding.cs rename to src/runtime/methodbinding.cs diff --git a/pythonnet/src/runtime/methodobject.cs b/src/runtime/methodobject.cs similarity index 100% rename from pythonnet/src/runtime/methodobject.cs rename to src/runtime/methodobject.cs diff --git a/pythonnet/src/runtime/methodwrapper.cs b/src/runtime/methodwrapper.cs similarity index 100% rename from pythonnet/src/runtime/methodwrapper.cs rename to src/runtime/methodwrapper.cs diff --git a/pythonnet/src/runtime/modulefunctionobject.cs b/src/runtime/modulefunctionobject.cs similarity index 100% rename from pythonnet/src/runtime/modulefunctionobject.cs rename to src/runtime/modulefunctionobject.cs diff --git a/pythonnet/src/runtime/moduleobject.cs b/src/runtime/moduleobject.cs similarity index 100% rename from pythonnet/src/runtime/moduleobject.cs rename to src/runtime/moduleobject.cs diff --git a/pythonnet/src/runtime/modulepropertyobject.cs b/src/runtime/modulepropertyobject.cs similarity index 100% rename from pythonnet/src/runtime/modulepropertyobject.cs rename to src/runtime/modulepropertyobject.cs diff --git a/pythonnet/src/runtime/monosupport.cs b/src/runtime/monosupport.cs similarity index 100% rename from pythonnet/src/runtime/monosupport.cs rename to src/runtime/monosupport.cs diff --git a/pythonnet/src/runtime/nativecall.cs b/src/runtime/nativecall.cs similarity index 100% rename from pythonnet/src/runtime/nativecall.cs rename to src/runtime/nativecall.cs diff --git a/pythonnet/src/runtime/oldmodule.il b/src/runtime/oldmodule.il old mode 100755 new mode 100644 similarity index 100% rename from pythonnet/src/runtime/oldmodule.il rename to src/runtime/oldmodule.il diff --git a/pythonnet/src/runtime/overload.cs b/src/runtime/overload.cs similarity index 100% rename from pythonnet/src/runtime/overload.cs rename to src/runtime/overload.cs diff --git a/pythonnet/src/runtime/propertyobject.cs b/src/runtime/propertyobject.cs similarity index 100% rename from pythonnet/src/runtime/propertyobject.cs rename to src/runtime/propertyobject.cs diff --git a/pythonnet/src/runtime/pyansistring.cs b/src/runtime/pyansistring.cs similarity index 96% rename from pythonnet/src/runtime/pyansistring.cs rename to src/runtime/pyansistring.cs index d9d6f5041..db8e249a1 100644 --- a/pythonnet/src/runtime/pyansistring.cs +++ b/src/runtime/pyansistring.cs @@ -1,82 +1,82 @@ -// ========================================================================== -// This is a user contribution to the pythondotnet project. -// THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED -// WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -// WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS -// FOR A PARTICULAR PURPOSE. -// ========================================================================== - -using System; - -namespace Python.Runtime { - - public class PyAnsiString : PySequence - { - /// - /// PyAnsiString Constructor - /// - /// - /// - /// Creates a new PyAnsiString from an existing object reference. Note - /// that the instance assumes ownership of the object reference. - /// The object reference is not checked for type-correctness. - /// - - public PyAnsiString(IntPtr ptr) : base(ptr) { } - - - /// - /// PyString Constructor - /// - /// - /// - /// Copy constructor - obtain a PyAnsiString from a generic PyObject. - /// An ArgumentException will be thrown if the given object is not - /// a Python string object. - /// - - public PyAnsiString(PyObject o) - : base() - { - if (!IsStringType(o)) - { - throw new ArgumentException("object is not a string"); - } - Runtime.Incref(o.obj); - obj = o.obj; - } - - - /// - /// PyAnsiString Constructor - /// - /// - /// - /// Creates a Python string from a managed string. - /// - - public PyAnsiString(string s) - : base() - { - obj = Runtime.PyString_FromStringAndSize(s, s.Length); - if (obj == IntPtr.Zero) - { - throw new PythonException(); - } - } - - - /// - /// IsStringType Method - /// - /// - /// - /// Returns true if the given object is a Python string. - /// - - public static bool IsStringType(PyObject value) - { - return Runtime.PyString_Check(value.obj); - } - } +// ========================================================================== +// This is a user contribution to the pythondotnet project. +// THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED +// WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +// WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS +// FOR A PARTICULAR PURPOSE. +// ========================================================================== + +using System; + +namespace Python.Runtime { + + public class PyAnsiString : PySequence + { + /// + /// PyAnsiString Constructor + /// + /// + /// + /// Creates a new PyAnsiString from an existing object reference. Note + /// that the instance assumes ownership of the object reference. + /// The object reference is not checked for type-correctness. + /// + + public PyAnsiString(IntPtr ptr) : base(ptr) { } + + + /// + /// PyString Constructor + /// + /// + /// + /// Copy constructor - obtain a PyAnsiString from a generic PyObject. + /// An ArgumentException will be thrown if the given object is not + /// a Python string object. + /// + + public PyAnsiString(PyObject o) + : base() + { + if (!IsStringType(o)) + { + throw new ArgumentException("object is not a string"); + } + Runtime.Incref(o.obj); + obj = o.obj; + } + + + /// + /// PyAnsiString Constructor + /// + /// + /// + /// Creates a Python string from a managed string. + /// + + public PyAnsiString(string s) + : base() + { + obj = Runtime.PyString_FromStringAndSize(s, s.Length); + if (obj == IntPtr.Zero) + { + throw new PythonException(); + } + } + + + /// + /// IsStringType Method + /// + /// + /// + /// Returns true if the given object is a Python string. + /// + + public static bool IsStringType(PyObject value) + { + return Runtime.PyString_Check(value.obj); + } + } } \ No newline at end of file diff --git a/pythonnet/src/runtime/pydict.cs b/src/runtime/pydict.cs similarity index 100% rename from pythonnet/src/runtime/pydict.cs rename to src/runtime/pydict.cs diff --git a/pythonnet/src/runtime/pyfloat.cs b/src/runtime/pyfloat.cs similarity index 100% rename from pythonnet/src/runtime/pyfloat.cs rename to src/runtime/pyfloat.cs diff --git a/pythonnet/src/runtime/pyint.cs b/src/runtime/pyint.cs similarity index 100% rename from pythonnet/src/runtime/pyint.cs rename to src/runtime/pyint.cs diff --git a/pythonnet/src/runtime/pyiter.cs b/src/runtime/pyiter.cs similarity index 100% rename from pythonnet/src/runtime/pyiter.cs rename to src/runtime/pyiter.cs diff --git a/pythonnet/src/runtime/pylist.cs b/src/runtime/pylist.cs similarity index 100% rename from pythonnet/src/runtime/pylist.cs rename to src/runtime/pylist.cs diff --git a/pythonnet/src/runtime/pylong.cs b/src/runtime/pylong.cs similarity index 100% rename from pythonnet/src/runtime/pylong.cs rename to src/runtime/pylong.cs diff --git a/pythonnet/src/runtime/pynumber.cs b/src/runtime/pynumber.cs similarity index 100% rename from pythonnet/src/runtime/pynumber.cs rename to src/runtime/pynumber.cs diff --git a/pythonnet/src/runtime/pyobject.cs b/src/runtime/pyobject.cs similarity index 100% rename from pythonnet/src/runtime/pyobject.cs rename to src/runtime/pyobject.cs diff --git a/pythonnet/src/runtime/pysequence.cs b/src/runtime/pysequence.cs similarity index 100% rename from pythonnet/src/runtime/pysequence.cs rename to src/runtime/pysequence.cs diff --git a/pythonnet/src/runtime/pystring.cs b/src/runtime/pystring.cs similarity index 100% rename from pythonnet/src/runtime/pystring.cs rename to src/runtime/pystring.cs diff --git a/pythonnet/src/runtime/pythonengine.cs b/src/runtime/pythonengine.cs similarity index 100% rename from pythonnet/src/runtime/pythonengine.cs rename to src/runtime/pythonengine.cs diff --git a/pythonnet/src/runtime/pythonexception.cs b/src/runtime/pythonexception.cs similarity index 100% rename from pythonnet/src/runtime/pythonexception.cs rename to src/runtime/pythonexception.cs diff --git a/pythonnet/src/runtime/pytuple.cs b/src/runtime/pytuple.cs similarity index 100% rename from pythonnet/src/runtime/pytuple.cs rename to src/runtime/pytuple.cs diff --git a/pythonnet/src/runtime/runtime.cs b/src/runtime/runtime.cs similarity index 100% rename from pythonnet/src/runtime/runtime.cs rename to src/runtime/runtime.cs diff --git a/pythonnet/src/runtime/typemanager.cs b/src/runtime/typemanager.cs similarity index 100% rename from pythonnet/src/runtime/typemanager.cs rename to src/runtime/typemanager.cs diff --git a/pythonnet/src/runtime/typemethod.cs b/src/runtime/typemethod.cs similarity index 100% rename from pythonnet/src/runtime/typemethod.cs rename to src/runtime/typemethod.cs diff --git a/pythonnet/src/runtime/x64/clrmodule-platform.il b/src/runtime/x64/clrmodule-platform.il similarity index 98% rename from pythonnet/src/runtime/x64/clrmodule-platform.il rename to src/runtime/x64/clrmodule-platform.il index 9bdf33d65..d04f74603 100644 --- a/pythonnet/src/runtime/x64/clrmodule-platform.il +++ b/src/runtime/x64/clrmodule-platform.il @@ -1,11 +1,11 @@ -// ========================================================================== -// This software is subject to the provisions of the Zope Public License, -// Version 2.0 (ZPL). A copy of the ZPL should accompany this distribution. -// THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED -// WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -// WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS -// FOR A PARTICULAR PURPOSE. -// ========================================================================== - -.vtfixup [1] int64 fromunmanaged at VT_01 -.data VT_01 = int64(0) +// ========================================================================== +// This software is subject to the provisions of the Zope Public License, +// Version 2.0 (ZPL). A copy of the ZPL should accompany this distribution. +// THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED +// WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +// WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS +// FOR A PARTICULAR PURPOSE. +// ========================================================================== + +.vtfixup [1] int64 fromunmanaged at VT_01 +.data VT_01 = int64(0) diff --git a/pythonnet/src/runtime/x86/clrmodule-platform.il b/src/runtime/x86/clrmodule-platform.il similarity index 98% rename from pythonnet/src/runtime/x86/clrmodule-platform.il rename to src/runtime/x86/clrmodule-platform.il index 638bf1f6c..aeac29658 100644 --- a/pythonnet/src/runtime/x86/clrmodule-platform.il +++ b/src/runtime/x86/clrmodule-platform.il @@ -1,11 +1,11 @@ -// ========================================================================== -// This software is subject to the provisions of the Zope Public License, -// Version 2.0 (ZPL). A copy of the ZPL should accompany this distribution. -// THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED -// WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -// WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS -// FOR A PARTICULAR PURPOSE. -// ========================================================================== - -.vtfixup [1] int32 fromunmanaged at VT_01 -.data VT_01 = int32(0) +// ========================================================================== +// This software is subject to the provisions of the Zope Public License, +// Version 2.0 (ZPL). A copy of the ZPL should accompany this distribution. +// THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED +// WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +// WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS +// FOR A PARTICULAR PURPOSE. +// ========================================================================== + +.vtfixup [1] int32 fromunmanaged at VT_01 +.data VT_01 = int32(0) diff --git a/pythonnet/src/testing/Python.Test.csproj b/src/testing/Python.Test.csproj similarity index 98% rename from pythonnet/src/testing/Python.Test.csproj rename to src/testing/Python.Test.csproj index 97d5d09e7..b0c41a866 100644 --- a/pythonnet/src/testing/Python.Test.csproj +++ b/src/testing/Python.Test.csproj @@ -1,147 +1,147 @@ - - - - Debug - AnyCPU - {6F401A34-273B-450F-9A4C-13550BE0767B} - Library - false - Python.Test - Python.Test - OnBuildSuccess - v4.0 - - ..\..\ - $(SolutionDir) - - - true - bin\x86\DebugMono\ - DEBUG;TRACE - full - x86 - prompt - true - true - false - - - true - bin\x64\DebugMono\ - DEBUG;TRACE - full - x64 - prompt - true - true - false - - - bin\x86\ReleaseMono\ - - true - pdbonly - x86 - prompt - true - true - false - - - bin\x64\ReleaseMono\ - - true - pdbonly - x64 - prompt - true - true - false - - - true - bin\x86\DebugWin\ - DEBUG;TRACE - full - x86 - prompt - true - false - false - - - true - bin\x64\DebugWin\ - DEBUG;TRACE - full - x64 - prompt - true - true - false - - - bin\x86\ReleaseWin\ - - true - pdbonly - x86 - prompt - true - true - false - - - bin\x64\ReleaseWin\ - - true - pdbonly - x64 - prompt - true - true - false - - - - - - - - - - - - - - - - - - - - - - - - 3.5 - - - - - - {097B4AC0-74E9-4C58-BCF8-C69746EC8271} - Python.Runtime - - - - - - - - $(SolutionDir) - - - - - + + + + Debug + AnyCPU + {6F401A34-273B-450F-9A4C-13550BE0767B} + Library + false + Python.Test + Python.Test + OnBuildSuccess + v4.0 + + ..\..\ + $(SolutionDir) + + + true + bin\x86\DebugMono\ + DEBUG;TRACE + full + x86 + prompt + true + true + false + + + true + bin\x64\DebugMono\ + DEBUG;TRACE + full + x64 + prompt + true + true + false + + + bin\x86\ReleaseMono\ + + true + pdbonly + x86 + prompt + true + true + false + + + bin\x64\ReleaseMono\ + + true + pdbonly + x64 + prompt + true + true + false + + + true + bin\x86\DebugWin\ + DEBUG;TRACE + full + x86 + prompt + true + false + false + + + true + bin\x64\DebugWin\ + DEBUG;TRACE + full + x64 + prompt + true + true + false + + + bin\x86\ReleaseWin\ + + true + pdbonly + x86 + prompt + true + true + false + + + bin\x64\ReleaseWin\ + + true + pdbonly + x64 + prompt + true + true + false + + + + + + + + + + + + + + + + + + + + + + + + 3.5 + + + + + + {097B4AC0-74E9-4C58-BCF8-C69746EC8271} + Python.Runtime + + + + + + + + $(SolutionDir) + + + + + diff --git a/pythonnet/src/testing/Python.Test.mdp b/src/testing/Python.Test.mdp similarity index 100% rename from pythonnet/src/testing/Python.Test.mdp rename to src/testing/Python.Test.mdp diff --git a/pythonnet/src/testing/arraytest.cs b/src/testing/arraytest.cs similarity index 100% rename from pythonnet/src/testing/arraytest.cs rename to src/testing/arraytest.cs diff --git a/pythonnet/src/testing/classtest.cs b/src/testing/classtest.cs similarity index 100% rename from pythonnet/src/testing/classtest.cs rename to src/testing/classtest.cs diff --git a/pythonnet/src/testing/constructortests.cs b/src/testing/constructortests.cs similarity index 100% rename from pythonnet/src/testing/constructortests.cs rename to src/testing/constructortests.cs diff --git a/pythonnet/src/testing/conversiontest.cs b/src/testing/conversiontest.cs similarity index 100% rename from pythonnet/src/testing/conversiontest.cs rename to src/testing/conversiontest.cs diff --git a/pythonnet/src/testing/delegatetest.cs b/src/testing/delegatetest.cs similarity index 100% rename from pythonnet/src/testing/delegatetest.cs rename to src/testing/delegatetest.cs diff --git a/pythonnet/src/testing/doctest.cs b/src/testing/doctest.cs similarity index 100% rename from pythonnet/src/testing/doctest.cs rename to src/testing/doctest.cs diff --git a/pythonnet/src/testing/enumtest.cs b/src/testing/enumtest.cs similarity index 100% rename from pythonnet/src/testing/enumtest.cs rename to src/testing/enumtest.cs diff --git a/pythonnet/src/testing/eventtest.cs b/src/testing/eventtest.cs similarity index 100% rename from pythonnet/src/testing/eventtest.cs rename to src/testing/eventtest.cs diff --git a/pythonnet/src/testing/exceptiontest.cs b/src/testing/exceptiontest.cs similarity index 100% rename from pythonnet/src/testing/exceptiontest.cs rename to src/testing/exceptiontest.cs diff --git a/pythonnet/src/testing/fieldtest.cs b/src/testing/fieldtest.cs similarity index 100% rename from pythonnet/src/testing/fieldtest.cs rename to src/testing/fieldtest.cs diff --git a/pythonnet/src/testing/generictest.cs b/src/testing/generictest.cs similarity index 100% rename from pythonnet/src/testing/generictest.cs rename to src/testing/generictest.cs diff --git a/pythonnet/src/testing/globaltest.cs b/src/testing/globaltest.cs similarity index 100% rename from pythonnet/src/testing/globaltest.cs rename to src/testing/globaltest.cs diff --git a/pythonnet/src/testing/indexertest.cs b/src/testing/indexertest.cs similarity index 100% rename from pythonnet/src/testing/indexertest.cs rename to src/testing/indexertest.cs diff --git a/pythonnet/src/testing/interfacetest.cs b/src/testing/interfacetest.cs similarity index 100% rename from pythonnet/src/testing/interfacetest.cs rename to src/testing/interfacetest.cs diff --git a/pythonnet/src/testing/methodtest.cs b/src/testing/methodtest.cs similarity index 100% rename from pythonnet/src/testing/methodtest.cs rename to src/testing/methodtest.cs diff --git a/pythonnet/src/testing/propertytest.cs b/src/testing/propertytest.cs similarity index 100% rename from pythonnet/src/testing/propertytest.cs rename to src/testing/propertytest.cs diff --git a/pythonnet/src/testing/threadtest.cs b/src/testing/threadtest.cs similarity index 100% rename from pythonnet/src/testing/threadtest.cs rename to src/testing/threadtest.cs diff --git a/pythonnet/src/tests/PyImportTest/__init__.py b/src/tests/PyImportTest/__init__.py similarity index 100% rename from pythonnet/src/tests/PyImportTest/__init__.py rename to src/tests/PyImportTest/__init__.py diff --git a/pythonnet/src/tests/PyImportTest/test/__init__.py b/src/tests/PyImportTest/test/__init__.py similarity index 100% rename from pythonnet/src/tests/PyImportTest/test/__init__.py rename to src/tests/PyImportTest/test/__init__.py diff --git a/pythonnet/src/tests/PyImportTest/test/one.py b/src/tests/PyImportTest/test/one.py similarity index 100% rename from pythonnet/src/tests/PyImportTest/test/one.py rename to src/tests/PyImportTest/test/one.py diff --git a/pythonnet/src/tests/leaktest.py b/src/tests/leaktest.py old mode 100755 new mode 100644 similarity index 100% rename from pythonnet/src/tests/leaktest.py rename to src/tests/leaktest.py diff --git a/pythonnet/src/tests/profile.py b/src/tests/profile.py old mode 100755 new mode 100644 similarity index 100% rename from pythonnet/src/tests/profile.py rename to src/tests/profile.py diff --git a/pythonnet/src/tests/runtests.py b/src/tests/runtests.py old mode 100755 new mode 100644 similarity index 100% rename from pythonnet/src/tests/runtests.py rename to src/tests/runtests.py diff --git a/pythonnet/src/tests/stress.py b/src/tests/stress.py old mode 100755 new mode 100644 similarity index 100% rename from pythonnet/src/tests/stress.py rename to src/tests/stress.py diff --git a/pythonnet/src/tests/stresstest.py b/src/tests/stresstest.py old mode 100755 new mode 100644 similarity index 100% rename from pythonnet/src/tests/stresstest.py rename to src/tests/stresstest.py diff --git a/pythonnet/src/tests/test_array.py b/src/tests/test_array.py similarity index 100% rename from pythonnet/src/tests/test_array.py rename to src/tests/test_array.py diff --git a/pythonnet/src/tests/test_class.py b/src/tests/test_class.py similarity index 100% rename from pythonnet/src/tests/test_class.py rename to src/tests/test_class.py diff --git a/pythonnet/src/tests/test_compat.py b/src/tests/test_compat.py similarity index 100% rename from pythonnet/src/tests/test_compat.py rename to src/tests/test_compat.py diff --git a/pythonnet/src/tests/test_constructors.py b/src/tests/test_constructors.py similarity index 100% rename from pythonnet/src/tests/test_constructors.py rename to src/tests/test_constructors.py diff --git a/pythonnet/src/tests/test_conversion.py b/src/tests/test_conversion.py similarity index 100% rename from pythonnet/src/tests/test_conversion.py rename to src/tests/test_conversion.py diff --git a/pythonnet/src/tests/test_delegate.py b/src/tests/test_delegate.py similarity index 100% rename from pythonnet/src/tests/test_delegate.py rename to src/tests/test_delegate.py diff --git a/pythonnet/src/tests/test_docstring.py b/src/tests/test_docstring.py similarity index 100% rename from pythonnet/src/tests/test_docstring.py rename to src/tests/test_docstring.py diff --git a/pythonnet/src/tests/test_engine.py b/src/tests/test_engine.py similarity index 100% rename from pythonnet/src/tests/test_engine.py rename to src/tests/test_engine.py diff --git a/pythonnet/src/tests/test_enum.py b/src/tests/test_enum.py similarity index 100% rename from pythonnet/src/tests/test_enum.py rename to src/tests/test_enum.py diff --git a/pythonnet/src/tests/test_event.py b/src/tests/test_event.py similarity index 100% rename from pythonnet/src/tests/test_event.py rename to src/tests/test_event.py diff --git a/pythonnet/src/tests/test_exceptions.py b/src/tests/test_exceptions.py similarity index 100% rename from pythonnet/src/tests/test_exceptions.py rename to src/tests/test_exceptions.py diff --git a/pythonnet/src/tests/test_field.py b/src/tests/test_field.py similarity index 100% rename from pythonnet/src/tests/test_field.py rename to src/tests/test_field.py diff --git a/pythonnet/src/tests/test_generic.py b/src/tests/test_generic.py similarity index 100% rename from pythonnet/src/tests/test_generic.py rename to src/tests/test_generic.py diff --git a/pythonnet/src/tests/test_indexer.py b/src/tests/test_indexer.py similarity index 100% rename from pythonnet/src/tests/test_indexer.py rename to src/tests/test_indexer.py diff --git a/pythonnet/src/tests/test_interface.py b/src/tests/test_interface.py similarity index 100% rename from pythonnet/src/tests/test_interface.py rename to src/tests/test_interface.py diff --git a/pythonnet/src/tests/test_method.py b/src/tests/test_method.py similarity index 100% rename from pythonnet/src/tests/test_method.py rename to src/tests/test_method.py diff --git a/pythonnet/src/tests/test_module.py b/src/tests/test_module.py similarity index 100% rename from pythonnet/src/tests/test_module.py rename to src/tests/test_module.py diff --git a/pythonnet/src/tests/test_property.py b/src/tests/test_property.py similarity index 100% rename from pythonnet/src/tests/test_property.py rename to src/tests/test_property.py diff --git a/pythonnet/src/tests/test_thread.py b/src/tests/test_thread.py similarity index 100% rename from pythonnet/src/tests/test_thread.py rename to src/tests/test_thread.py diff --git a/pythonnet/src/tests/warnfilter.py b/src/tests/warnfilter.py similarity index 100% rename from pythonnet/src/tests/warnfilter.py rename to src/tests/warnfilter.py diff --git a/pythonnet/tools/nuget/nuget.exe b/tools/nuget/nuget.exe similarity index 100% rename from pythonnet/tools/nuget/nuget.exe rename to tools/nuget/nuget.exe From 3278ce9afd28a9356b5fbe2889cee7c58cbdaaf7 Mon Sep 17 00:00:00 2001 From: David Anthoff Date: Fri, 11 Apr 2014 14:57:56 -0700 Subject: [PATCH 2/2] Make CI work with setup.py in root folder --- .travis.yml | 1 - appveyor.yml | 1 - 2 files changed, 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index d63efafd6..6355ce73d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,7 +12,6 @@ before_install: - yes | sudo certmgr -ssl -m https://nugetgallery.blob.core.windows.net - yes | sudo certmgr -ssl -m https://nuget.org install: - - cd pythonnet - python setup.py build_ext --inplace script: - export PYTHONPATH=`pwd` diff --git a/appveyor.yml b/appveyor.yml index 6bf286fbd..18f9761c0 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -21,7 +21,6 @@ install: - C:\Python\Scripts\pip.exe install wheel build_script: - - cd pythonnet - C:\python\python.exe setup.py bdist_wheel test_script: pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy