From 38adb2e8701f78a203ca5f7ddc60582c382e2b6b Mon Sep 17 00:00:00 2001 From: dse Date: Wed, 28 Dec 2016 18:30:02 +0400 Subject: [PATCH] Moving to CoreCLR build system. --- .gitignore | 2 + pythonnet.CoreCLR.sln | 52 +++++ .../Python.Runtime.mdp | 0 src/Python.Runtime/Python.Runtime.xproj | 19 ++ .../arrayobject.cs | 0 .../assemblyinfo.cs | 0 .../assemblymanager.cs | 0 .../buildclrmodule.bat | 0 src/{runtime => Python.Runtime}/classbase.cs | 0 .../classderived.cs | 0 .../classmanager.cs | 0 .../classobject.cs | 0 src/{runtime => Python.Runtime}/clrmodule.il | 0 .../clrmodule.pp.il | 0 src/{runtime => Python.Runtime}/clrobject.cs | 0 .../codegenerator.cs | 0 .../constructorbinder.cs | 0 .../constructorbinding.cs | 0 src/{runtime => Python.Runtime}/converter.cs | 0 .../debughelper.cs | 0 .../delegatemanager.cs | 0 .../delegateobject.cs | 0 .../eventbinding.cs | 0 .../eventobject.cs | 0 src/{runtime => Python.Runtime}/exceptions.cs | 0 .../extensiontype.cs | 0 .../fieldobject.cs | 0 .../generictype.cs | 0 .../genericutil.cs | 0 src/{runtime => Python.Runtime}/importhook.cs | 0 src/{runtime => Python.Runtime}/indexer.cs | 0 .../interfaceobject.cs | 0 src/{runtime => Python.Runtime}/interfaces.cs | 0 src/{runtime => Python.Runtime}/interop.cs | 0 src/{runtime => Python.Runtime}/interop26.cs | 0 src/{runtime => Python.Runtime}/interop27.cs | 0 src/{runtime => Python.Runtime}/interop32.cs | 0 src/{runtime => Python.Runtime}/interop33.cs | 0 src/{runtime => Python.Runtime}/interop34.cs | 0 src/{runtime => Python.Runtime}/interop35.cs | 0 src/{runtime => Python.Runtime}/iterator.cs | 0 .../managedtype.cs | 0 src/{runtime => Python.Runtime}/metatype.cs | 0 .../methodbinder.cs | 0 .../methodbinding.cs | 0 .../methodobject.cs | 0 .../methodwrapper.cs | 0 .../modulefunctionobject.cs | 0 .../moduleobject.cs | 0 .../modulepropertyobject.cs | 0 .../monosupport.cs | 0 src/{runtime => Python.Runtime}/nativecall.cs | 0 src/{runtime => Python.Runtime}/oldmodule.il | 0 src/{runtime => Python.Runtime}/overload.cs | 0 src/Python.Runtime/project.json | 33 +++ .../propertyobject.cs | 0 .../pyansistring.cs | 0 src/{runtime => Python.Runtime}/pydict.cs | 0 src/{runtime => Python.Runtime}/pyfloat.cs | 0 src/{runtime => Python.Runtime}/pyint.cs | 0 src/{runtime => Python.Runtime}/pyiter.cs | 0 src/{runtime => Python.Runtime}/pylist.cs | 0 src/{runtime => Python.Runtime}/pylong.cs | 0 src/{runtime => Python.Runtime}/pynumber.cs | 0 src/{runtime => Python.Runtime}/pyobject.cs | 0 src/{runtime => Python.Runtime}/pysequence.cs | 0 src/{runtime => Python.Runtime}/pystring.cs | 0 .../pythonengine.cs | 2 +- .../pythonexception.cs | 0 src/{runtime => Python.Runtime}/pytuple.cs | 0 .../resources/clr.py | 0 src/{runtime => Python.Runtime}/runtime.cs | 0 .../typemanager.cs | 0 src/{runtime => Python.Runtime}/typemethod.cs | 0 .../x64/clrmodule-platform.il | 0 .../x86/clrmodule-platform.il | 0 src/console/Console.xproj | 19 ++ src/console/project.json | 28 +++ src/embed_tests/Python.EmbeddingTest.csproj | 187 --------------- src/embed_tests/embed_tests.xproj | 22 ++ src/embed_tests/project.json | 23 ++ src/runtime/Python.Runtime.csproj | 212 ------------------ 82 files changed, 199 insertions(+), 400 deletions(-) create mode 100644 pythonnet.CoreCLR.sln rename src/{runtime => Python.Runtime}/Python.Runtime.mdp (100%) create mode 100644 src/Python.Runtime/Python.Runtime.xproj rename src/{runtime => Python.Runtime}/arrayobject.cs (100%) rename src/{runtime => Python.Runtime}/assemblyinfo.cs (100%) rename src/{runtime => Python.Runtime}/assemblymanager.cs (100%) rename src/{runtime => Python.Runtime}/buildclrmodule.bat (100%) rename src/{runtime => Python.Runtime}/classbase.cs (100%) rename src/{runtime => Python.Runtime}/classderived.cs (100%) rename src/{runtime => Python.Runtime}/classmanager.cs (100%) rename src/{runtime => Python.Runtime}/classobject.cs (100%) rename src/{runtime => Python.Runtime}/clrmodule.il (100%) rename src/{runtime => Python.Runtime}/clrmodule.pp.il (100%) rename src/{runtime => Python.Runtime}/clrobject.cs (100%) rename src/{runtime => Python.Runtime}/codegenerator.cs (100%) rename src/{runtime => Python.Runtime}/constructorbinder.cs (100%) rename src/{runtime => Python.Runtime}/constructorbinding.cs (100%) rename src/{runtime => Python.Runtime}/converter.cs (100%) rename src/{runtime => Python.Runtime}/debughelper.cs (100%) rename src/{runtime => Python.Runtime}/delegatemanager.cs (100%) rename src/{runtime => Python.Runtime}/delegateobject.cs (100%) rename src/{runtime => Python.Runtime}/eventbinding.cs (100%) rename src/{runtime => Python.Runtime}/eventobject.cs (100%) rename src/{runtime => Python.Runtime}/exceptions.cs (100%) rename src/{runtime => Python.Runtime}/extensiontype.cs (100%) rename src/{runtime => Python.Runtime}/fieldobject.cs (100%) rename src/{runtime => Python.Runtime}/generictype.cs (100%) rename src/{runtime => Python.Runtime}/genericutil.cs (100%) rename src/{runtime => Python.Runtime}/importhook.cs (100%) rename src/{runtime => Python.Runtime}/indexer.cs (100%) rename src/{runtime => Python.Runtime}/interfaceobject.cs (100%) rename src/{runtime => Python.Runtime}/interfaces.cs (100%) rename src/{runtime => Python.Runtime}/interop.cs (100%) rename src/{runtime => Python.Runtime}/interop26.cs (100%) rename src/{runtime => Python.Runtime}/interop27.cs (100%) rename src/{runtime => Python.Runtime}/interop32.cs (100%) rename src/{runtime => Python.Runtime}/interop33.cs (100%) rename src/{runtime => Python.Runtime}/interop34.cs (100%) rename src/{runtime => Python.Runtime}/interop35.cs (100%) rename src/{runtime => Python.Runtime}/iterator.cs (100%) rename src/{runtime => Python.Runtime}/managedtype.cs (100%) rename src/{runtime => Python.Runtime}/metatype.cs (100%) rename src/{runtime => Python.Runtime}/methodbinder.cs (100%) rename src/{runtime => Python.Runtime}/methodbinding.cs (100%) rename src/{runtime => Python.Runtime}/methodobject.cs (100%) rename src/{runtime => Python.Runtime}/methodwrapper.cs (100%) rename src/{runtime => Python.Runtime}/modulefunctionobject.cs (100%) rename src/{runtime => Python.Runtime}/moduleobject.cs (100%) rename src/{runtime => Python.Runtime}/modulepropertyobject.cs (100%) rename src/{runtime => Python.Runtime}/monosupport.cs (100%) rename src/{runtime => Python.Runtime}/nativecall.cs (100%) rename src/{runtime => Python.Runtime}/oldmodule.il (100%) rename src/{runtime => Python.Runtime}/overload.cs (100%) create mode 100644 src/Python.Runtime/project.json rename src/{runtime => Python.Runtime}/propertyobject.cs (100%) rename src/{runtime => Python.Runtime}/pyansistring.cs (100%) rename src/{runtime => Python.Runtime}/pydict.cs (100%) rename src/{runtime => Python.Runtime}/pyfloat.cs (100%) rename src/{runtime => Python.Runtime}/pyint.cs (100%) rename src/{runtime => Python.Runtime}/pyiter.cs (100%) rename src/{runtime => Python.Runtime}/pylist.cs (100%) rename src/{runtime => Python.Runtime}/pylong.cs (100%) rename src/{runtime => Python.Runtime}/pynumber.cs (100%) rename src/{runtime => Python.Runtime}/pyobject.cs (100%) rename src/{runtime => Python.Runtime}/pysequence.cs (100%) rename src/{runtime => Python.Runtime}/pystring.cs (100%) rename src/{runtime => Python.Runtime}/pythonengine.cs (99%) rename src/{runtime => Python.Runtime}/pythonexception.cs (100%) rename src/{runtime => Python.Runtime}/pytuple.cs (100%) rename src/{runtime => Python.Runtime}/resources/clr.py (100%) rename src/{runtime => Python.Runtime}/runtime.cs (100%) rename src/{runtime => Python.Runtime}/typemanager.cs (100%) rename src/{runtime => Python.Runtime}/typemethod.cs (100%) rename src/{runtime => Python.Runtime}/x64/clrmodule-platform.il (100%) rename src/{runtime => Python.Runtime}/x86/clrmodule-platform.il (100%) create mode 100644 src/console/Console.xproj create mode 100644 src/console/project.json delete mode 100644 src/embed_tests/Python.EmbeddingTest.csproj create mode 100644 src/embed_tests/embed_tests.xproj create mode 100644 src/embed_tests/project.json delete mode 100644 src/runtime/Python.Runtime.csproj diff --git a/.gitignore b/.gitignore index 864ba3d1f..83d430085 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,5 @@ pythonnet.egg-info *.userprefs build/ tools/nuget/*.exe +.vs +*.lock.json \ No newline at end of file diff --git a/pythonnet.CoreCLR.sln b/pythonnet.CoreCLR.sln new file mode 100644 index 000000000..25916634c --- /dev/null +++ b/pythonnet.CoreCLR.sln @@ -0,0 +1,52 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 14 +VisualStudioVersion = 14.0.25420.1 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Console", "src\console\Console.xproj", "{5BF55E20-325C-45B3-86FC-2FDBBD91901F}" +EndProject +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Python.Runtime", "src\Python.Runtime\Python.Runtime.xproj", "{C41B9F67-571D-4852-B7C4-B54E84DCBCDC}" +EndProject +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "embed_tests", "src\embed_tests\embed_tests.xproj", "{9F91A9DC-D7B3-45A9-96FF-57AACC1B959A}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Py35-UCS2-Win-Debug|Any CPU = Py35-UCS2-Win-Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {5BF55E20-325C-45B3-86FC-2FDBBD91901F}.Debug|Any CPU.ActiveCfg = Py35-UCS2-Win-Debug|Any CPU + {5BF55E20-325C-45B3-86FC-2FDBBD91901F}.Debug|Any CPU.Build.0 = Py35-UCS2-Win-Debug|Any CPU + {5BF55E20-325C-45B3-86FC-2FDBBD91901F}.Py35-UCS2-Win-Debug|Any CPU.ActiveCfg = Py35-UCS2-Win-Debug|Any CPU + {5BF55E20-325C-45B3-86FC-2FDBBD91901F}.Py35-UCS2-Win-Debug|Any CPU.Build.0 = Py35-UCS2-Win-Debug|Any CPU + {5BF55E20-325C-45B3-86FC-2FDBBD91901F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {5BF55E20-325C-45B3-86FC-2FDBBD91901F}.Release|Any CPU.Build.0 = Release|Any CPU + {C41B9F67-571D-4852-B7C4-B54E84DCBCDC}.Debug|Any CPU.ActiveCfg = Py35-UCS2-Win-Debug|Any CPU + {C41B9F67-571D-4852-B7C4-B54E84DCBCDC}.Debug|Any CPU.Build.0 = Py35-UCS2-Win-Debug|Any CPU + {C41B9F67-571D-4852-B7C4-B54E84DCBCDC}.Py35-UCS2-Win-Debug|Any CPU.ActiveCfg = Py35-UCS2-Win-Debug|Any CPU + {C41B9F67-571D-4852-B7C4-B54E84DCBCDC}.Py35-UCS2-Win-Debug|Any CPU.Build.0 = Py35-UCS2-Win-Debug|Any CPU + {C41B9F67-571D-4852-B7C4-B54E84DCBCDC}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C41B9F67-571D-4852-B7C4-B54E84DCBCDC}.Release|Any CPU.Build.0 = Release|Any CPU + {9F91A9DC-D7B3-45A9-96FF-57AACC1B959A}.Debug|Any CPU.ActiveCfg = Py35-UCS2-Win-Debug|Any CPU + {9F91A9DC-D7B3-45A9-96FF-57AACC1B959A}.Debug|Any CPU.Build.0 = Py35-UCS2-Win-Debug|Any CPU + {9F91A9DC-D7B3-45A9-96FF-57AACC1B959A}.Py35-UCS2-Win-Debug|Any CPU.ActiveCfg = Debug|Any CPU + {9F91A9DC-D7B3-45A9-96FF-57AACC1B959A}.Py35-UCS2-Win-Debug|Any CPU.Build.0 = Debug|Any CPU + {9F91A9DC-D7B3-45A9-96FF-57AACC1B959A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {9F91A9DC-D7B3-45A9-96FF-57AACC1B959A}.Release|Any CPU.Build.0 = Release|Any CPU + 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/src/runtime/Python.Runtime.mdp b/src/Python.Runtime/Python.Runtime.mdp similarity index 100% rename from src/runtime/Python.Runtime.mdp rename to src/Python.Runtime/Python.Runtime.mdp diff --git a/src/Python.Runtime/Python.Runtime.xproj b/src/Python.Runtime/Python.Runtime.xproj new file mode 100644 index 000000000..1a4f8684e --- /dev/null +++ b/src/Python.Runtime/Python.Runtime.xproj @@ -0,0 +1,19 @@ + + + + 14.0 + $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) + + + + c41b9f67-571d-4852-b7c4-b54e84dcbcdc + runtime.x + .\obj + .\bin\ + v4.5 + + + 2.0 + + + \ No newline at end of file diff --git a/src/runtime/arrayobject.cs b/src/Python.Runtime/arrayobject.cs similarity index 100% rename from src/runtime/arrayobject.cs rename to src/Python.Runtime/arrayobject.cs diff --git a/src/runtime/assemblyinfo.cs b/src/Python.Runtime/assemblyinfo.cs similarity index 100% rename from src/runtime/assemblyinfo.cs rename to src/Python.Runtime/assemblyinfo.cs diff --git a/src/runtime/assemblymanager.cs b/src/Python.Runtime/assemblymanager.cs similarity index 100% rename from src/runtime/assemblymanager.cs rename to src/Python.Runtime/assemblymanager.cs diff --git a/src/runtime/buildclrmodule.bat b/src/Python.Runtime/buildclrmodule.bat similarity index 100% rename from src/runtime/buildclrmodule.bat rename to src/Python.Runtime/buildclrmodule.bat diff --git a/src/runtime/classbase.cs b/src/Python.Runtime/classbase.cs similarity index 100% rename from src/runtime/classbase.cs rename to src/Python.Runtime/classbase.cs diff --git a/src/runtime/classderived.cs b/src/Python.Runtime/classderived.cs similarity index 100% rename from src/runtime/classderived.cs rename to src/Python.Runtime/classderived.cs diff --git a/src/runtime/classmanager.cs b/src/Python.Runtime/classmanager.cs similarity index 100% rename from src/runtime/classmanager.cs rename to src/Python.Runtime/classmanager.cs diff --git a/src/runtime/classobject.cs b/src/Python.Runtime/classobject.cs similarity index 100% rename from src/runtime/classobject.cs rename to src/Python.Runtime/classobject.cs diff --git a/src/runtime/clrmodule.il b/src/Python.Runtime/clrmodule.il similarity index 100% rename from src/runtime/clrmodule.il rename to src/Python.Runtime/clrmodule.il diff --git a/src/runtime/clrmodule.pp.il b/src/Python.Runtime/clrmodule.pp.il similarity index 100% rename from src/runtime/clrmodule.pp.il rename to src/Python.Runtime/clrmodule.pp.il diff --git a/src/runtime/clrobject.cs b/src/Python.Runtime/clrobject.cs similarity index 100% rename from src/runtime/clrobject.cs rename to src/Python.Runtime/clrobject.cs diff --git a/src/runtime/codegenerator.cs b/src/Python.Runtime/codegenerator.cs similarity index 100% rename from src/runtime/codegenerator.cs rename to src/Python.Runtime/codegenerator.cs diff --git a/src/runtime/constructorbinder.cs b/src/Python.Runtime/constructorbinder.cs similarity index 100% rename from src/runtime/constructorbinder.cs rename to src/Python.Runtime/constructorbinder.cs diff --git a/src/runtime/constructorbinding.cs b/src/Python.Runtime/constructorbinding.cs similarity index 100% rename from src/runtime/constructorbinding.cs rename to src/Python.Runtime/constructorbinding.cs diff --git a/src/runtime/converter.cs b/src/Python.Runtime/converter.cs similarity index 100% rename from src/runtime/converter.cs rename to src/Python.Runtime/converter.cs diff --git a/src/runtime/debughelper.cs b/src/Python.Runtime/debughelper.cs similarity index 100% rename from src/runtime/debughelper.cs rename to src/Python.Runtime/debughelper.cs diff --git a/src/runtime/delegatemanager.cs b/src/Python.Runtime/delegatemanager.cs similarity index 100% rename from src/runtime/delegatemanager.cs rename to src/Python.Runtime/delegatemanager.cs diff --git a/src/runtime/delegateobject.cs b/src/Python.Runtime/delegateobject.cs similarity index 100% rename from src/runtime/delegateobject.cs rename to src/Python.Runtime/delegateobject.cs diff --git a/src/runtime/eventbinding.cs b/src/Python.Runtime/eventbinding.cs similarity index 100% rename from src/runtime/eventbinding.cs rename to src/Python.Runtime/eventbinding.cs diff --git a/src/runtime/eventobject.cs b/src/Python.Runtime/eventobject.cs similarity index 100% rename from src/runtime/eventobject.cs rename to src/Python.Runtime/eventobject.cs diff --git a/src/runtime/exceptions.cs b/src/Python.Runtime/exceptions.cs similarity index 100% rename from src/runtime/exceptions.cs rename to src/Python.Runtime/exceptions.cs diff --git a/src/runtime/extensiontype.cs b/src/Python.Runtime/extensiontype.cs similarity index 100% rename from src/runtime/extensiontype.cs rename to src/Python.Runtime/extensiontype.cs diff --git a/src/runtime/fieldobject.cs b/src/Python.Runtime/fieldobject.cs similarity index 100% rename from src/runtime/fieldobject.cs rename to src/Python.Runtime/fieldobject.cs diff --git a/src/runtime/generictype.cs b/src/Python.Runtime/generictype.cs similarity index 100% rename from src/runtime/generictype.cs rename to src/Python.Runtime/generictype.cs diff --git a/src/runtime/genericutil.cs b/src/Python.Runtime/genericutil.cs similarity index 100% rename from src/runtime/genericutil.cs rename to src/Python.Runtime/genericutil.cs diff --git a/src/runtime/importhook.cs b/src/Python.Runtime/importhook.cs similarity index 100% rename from src/runtime/importhook.cs rename to src/Python.Runtime/importhook.cs diff --git a/src/runtime/indexer.cs b/src/Python.Runtime/indexer.cs similarity index 100% rename from src/runtime/indexer.cs rename to src/Python.Runtime/indexer.cs diff --git a/src/runtime/interfaceobject.cs b/src/Python.Runtime/interfaceobject.cs similarity index 100% rename from src/runtime/interfaceobject.cs rename to src/Python.Runtime/interfaceobject.cs diff --git a/src/runtime/interfaces.cs b/src/Python.Runtime/interfaces.cs similarity index 100% rename from src/runtime/interfaces.cs rename to src/Python.Runtime/interfaces.cs diff --git a/src/runtime/interop.cs b/src/Python.Runtime/interop.cs similarity index 100% rename from src/runtime/interop.cs rename to src/Python.Runtime/interop.cs diff --git a/src/runtime/interop26.cs b/src/Python.Runtime/interop26.cs similarity index 100% rename from src/runtime/interop26.cs rename to src/Python.Runtime/interop26.cs diff --git a/src/runtime/interop27.cs b/src/Python.Runtime/interop27.cs similarity index 100% rename from src/runtime/interop27.cs rename to src/Python.Runtime/interop27.cs diff --git a/src/runtime/interop32.cs b/src/Python.Runtime/interop32.cs similarity index 100% rename from src/runtime/interop32.cs rename to src/Python.Runtime/interop32.cs diff --git a/src/runtime/interop33.cs b/src/Python.Runtime/interop33.cs similarity index 100% rename from src/runtime/interop33.cs rename to src/Python.Runtime/interop33.cs diff --git a/src/runtime/interop34.cs b/src/Python.Runtime/interop34.cs similarity index 100% rename from src/runtime/interop34.cs rename to src/Python.Runtime/interop34.cs diff --git a/src/runtime/interop35.cs b/src/Python.Runtime/interop35.cs similarity index 100% rename from src/runtime/interop35.cs rename to src/Python.Runtime/interop35.cs diff --git a/src/runtime/iterator.cs b/src/Python.Runtime/iterator.cs similarity index 100% rename from src/runtime/iterator.cs rename to src/Python.Runtime/iterator.cs diff --git a/src/runtime/managedtype.cs b/src/Python.Runtime/managedtype.cs similarity index 100% rename from src/runtime/managedtype.cs rename to src/Python.Runtime/managedtype.cs diff --git a/src/runtime/metatype.cs b/src/Python.Runtime/metatype.cs similarity index 100% rename from src/runtime/metatype.cs rename to src/Python.Runtime/metatype.cs diff --git a/src/runtime/methodbinder.cs b/src/Python.Runtime/methodbinder.cs similarity index 100% rename from src/runtime/methodbinder.cs rename to src/Python.Runtime/methodbinder.cs diff --git a/src/runtime/methodbinding.cs b/src/Python.Runtime/methodbinding.cs similarity index 100% rename from src/runtime/methodbinding.cs rename to src/Python.Runtime/methodbinding.cs diff --git a/src/runtime/methodobject.cs b/src/Python.Runtime/methodobject.cs similarity index 100% rename from src/runtime/methodobject.cs rename to src/Python.Runtime/methodobject.cs diff --git a/src/runtime/methodwrapper.cs b/src/Python.Runtime/methodwrapper.cs similarity index 100% rename from src/runtime/methodwrapper.cs rename to src/Python.Runtime/methodwrapper.cs diff --git a/src/runtime/modulefunctionobject.cs b/src/Python.Runtime/modulefunctionobject.cs similarity index 100% rename from src/runtime/modulefunctionobject.cs rename to src/Python.Runtime/modulefunctionobject.cs diff --git a/src/runtime/moduleobject.cs b/src/Python.Runtime/moduleobject.cs similarity index 100% rename from src/runtime/moduleobject.cs rename to src/Python.Runtime/moduleobject.cs diff --git a/src/runtime/modulepropertyobject.cs b/src/Python.Runtime/modulepropertyobject.cs similarity index 100% rename from src/runtime/modulepropertyobject.cs rename to src/Python.Runtime/modulepropertyobject.cs diff --git a/src/runtime/monosupport.cs b/src/Python.Runtime/monosupport.cs similarity index 100% rename from src/runtime/monosupport.cs rename to src/Python.Runtime/monosupport.cs diff --git a/src/runtime/nativecall.cs b/src/Python.Runtime/nativecall.cs similarity index 100% rename from src/runtime/nativecall.cs rename to src/Python.Runtime/nativecall.cs diff --git a/src/runtime/oldmodule.il b/src/Python.Runtime/oldmodule.il similarity index 100% rename from src/runtime/oldmodule.il rename to src/Python.Runtime/oldmodule.il diff --git a/src/runtime/overload.cs b/src/Python.Runtime/overload.cs similarity index 100% rename from src/runtime/overload.cs rename to src/Python.Runtime/overload.cs diff --git a/src/Python.Runtime/project.json b/src/Python.Runtime/project.json new file mode 100644 index 000000000..bb07458af --- /dev/null +++ b/src/Python.Runtime/project.json @@ -0,0 +1,33 @@ +{ + "version": "0.1.0-*", + + "buildOptions": { + "compile": { + "exclude": [ + "interop33.cs" + ] + }, + "allowUnsafe": true, + "embed": { + "include": [ "**/*.resx", "resources/**/*" ] + } + }, + "dependencies": { + "NETStandard.Library": "1.6.0" + }, + "frameworks": { + //"netstandard1.3": { + // "imports": "dnxcore50" + //}, + "net46": { + + } + }, + "configurations": { + "Py35-UCS2-Win-Debug": { + "buildOptions": { + "define": [ "TRACE", "DEBUG", "UCS2", "PYTHON35" ] + } + } + } +} diff --git a/src/runtime/propertyobject.cs b/src/Python.Runtime/propertyobject.cs similarity index 100% rename from src/runtime/propertyobject.cs rename to src/Python.Runtime/propertyobject.cs diff --git a/src/runtime/pyansistring.cs b/src/Python.Runtime/pyansistring.cs similarity index 100% rename from src/runtime/pyansistring.cs rename to src/Python.Runtime/pyansistring.cs diff --git a/src/runtime/pydict.cs b/src/Python.Runtime/pydict.cs similarity index 100% rename from src/runtime/pydict.cs rename to src/Python.Runtime/pydict.cs diff --git a/src/runtime/pyfloat.cs b/src/Python.Runtime/pyfloat.cs similarity index 100% rename from src/runtime/pyfloat.cs rename to src/Python.Runtime/pyfloat.cs diff --git a/src/runtime/pyint.cs b/src/Python.Runtime/pyint.cs similarity index 100% rename from src/runtime/pyint.cs rename to src/Python.Runtime/pyint.cs diff --git a/src/runtime/pyiter.cs b/src/Python.Runtime/pyiter.cs similarity index 100% rename from src/runtime/pyiter.cs rename to src/Python.Runtime/pyiter.cs diff --git a/src/runtime/pylist.cs b/src/Python.Runtime/pylist.cs similarity index 100% rename from src/runtime/pylist.cs rename to src/Python.Runtime/pylist.cs diff --git a/src/runtime/pylong.cs b/src/Python.Runtime/pylong.cs similarity index 100% rename from src/runtime/pylong.cs rename to src/Python.Runtime/pylong.cs diff --git a/src/runtime/pynumber.cs b/src/Python.Runtime/pynumber.cs similarity index 100% rename from src/runtime/pynumber.cs rename to src/Python.Runtime/pynumber.cs diff --git a/src/runtime/pyobject.cs b/src/Python.Runtime/pyobject.cs similarity index 100% rename from src/runtime/pyobject.cs rename to src/Python.Runtime/pyobject.cs diff --git a/src/runtime/pysequence.cs b/src/Python.Runtime/pysequence.cs similarity index 100% rename from src/runtime/pysequence.cs rename to src/Python.Runtime/pysequence.cs diff --git a/src/runtime/pystring.cs b/src/Python.Runtime/pystring.cs similarity index 100% rename from src/runtime/pystring.cs rename to src/Python.Runtime/pystring.cs diff --git a/src/runtime/pythonengine.cs b/src/Python.Runtime/pythonengine.cs similarity index 99% rename from src/runtime/pythonengine.cs rename to src/Python.Runtime/pythonengine.cs index 70a1c557b..504cbf167 100644 --- a/src/runtime/pythonengine.cs +++ b/src/Python.Runtime/pythonengine.cs @@ -149,7 +149,7 @@ public static void Initialize() Runtime.PyDict_SetItemString(module_globals, "__builtins__", builtins); var assembly = Assembly.GetExecutingAssembly(); - using (Stream stream = assembly.GetManifestResourceStream("clr.py")) + using (Stream stream = assembly.GetManifestResourceStream("Python.Runtime.resources.clr.py")) using (StreamReader reader = new StreamReader(stream)) { // add the contents of clr.py to the module diff --git a/src/runtime/pythonexception.cs b/src/Python.Runtime/pythonexception.cs similarity index 100% rename from src/runtime/pythonexception.cs rename to src/Python.Runtime/pythonexception.cs diff --git a/src/runtime/pytuple.cs b/src/Python.Runtime/pytuple.cs similarity index 100% rename from src/runtime/pytuple.cs rename to src/Python.Runtime/pytuple.cs diff --git a/src/runtime/resources/clr.py b/src/Python.Runtime/resources/clr.py similarity index 100% rename from src/runtime/resources/clr.py rename to src/Python.Runtime/resources/clr.py diff --git a/src/runtime/runtime.cs b/src/Python.Runtime/runtime.cs similarity index 100% rename from src/runtime/runtime.cs rename to src/Python.Runtime/runtime.cs diff --git a/src/runtime/typemanager.cs b/src/Python.Runtime/typemanager.cs similarity index 100% rename from src/runtime/typemanager.cs rename to src/Python.Runtime/typemanager.cs diff --git a/src/runtime/typemethod.cs b/src/Python.Runtime/typemethod.cs similarity index 100% rename from src/runtime/typemethod.cs rename to src/Python.Runtime/typemethod.cs diff --git a/src/runtime/x64/clrmodule-platform.il b/src/Python.Runtime/x64/clrmodule-platform.il similarity index 100% rename from src/runtime/x64/clrmodule-platform.il rename to src/Python.Runtime/x64/clrmodule-platform.il diff --git a/src/runtime/x86/clrmodule-platform.il b/src/Python.Runtime/x86/clrmodule-platform.il similarity index 100% rename from src/runtime/x86/clrmodule-platform.il rename to src/Python.Runtime/x86/clrmodule-platform.il diff --git a/src/console/Console.xproj b/src/console/Console.xproj new file mode 100644 index 000000000..93267d80f --- /dev/null +++ b/src/console/Console.xproj @@ -0,0 +1,19 @@ + + + + 14.0 + $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) + + + + 5bf55e20-325c-45b3-86fc-2fdbbd91901f + Console + .\obj + .\bin\ + v4.5 + + + 2.0 + + + \ No newline at end of file diff --git a/src/console/project.json b/src/console/project.json new file mode 100644 index 000000000..2ba1c946d --- /dev/null +++ b/src/console/project.json @@ -0,0 +1,28 @@ +{ + "version": "0.1.0-*", + "buildOptions": { + "emitEntryPoint": true + }, + "runtimes": { + "win7-x64": {} + }, + "dependencies": { + "NETStandard.Library": "1.6.0", + "Python.Runtime": "0.1.0-*" + }, + "frameworks": { + //"netstandard1.6": { + // "imports": "dnxcore50" + //}, + "net46": { + + } + }, + "configurations": { + "Py35-UCS2-Win-Debug": { + "buildOptions": { + "define": [ "TRACE", "DEBUG"] + } + } + } +} diff --git a/src/embed_tests/Python.EmbeddingTest.csproj b/src/embed_tests/Python.EmbeddingTest.csproj deleted file mode 100644 index 80a4a9820..000000000 --- a/src/embed_tests/Python.EmbeddingTest.csproj +++ /dev/null @@ -1,187 +0,0 @@ - - - - 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 - - - - - - - - $(TargetPath) - $(TargetDir)$(TargetName).pdb - - - - - - \ No newline at end of file diff --git a/src/embed_tests/embed_tests.xproj b/src/embed_tests/embed_tests.xproj new file mode 100644 index 000000000..9783314e0 --- /dev/null +++ b/src/embed_tests/embed_tests.xproj @@ -0,0 +1,22 @@ + + + + 14.0 + $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) + + + + 9f91a9dc-d7b3-45a9-96ff-57aacc1b959a + Python.EmbeddingTest + .\obj + .\bin\ + v4.5 + + + 2.0 + + + + + + \ No newline at end of file diff --git a/src/embed_tests/project.json b/src/embed_tests/project.json new file mode 100644 index 000000000..162e26076 --- /dev/null +++ b/src/embed_tests/project.json @@ -0,0 +1,23 @@ +{ + "version": "0.1.0-*", + "dependencies": { + "Microsoft.Net.Test.Sdk": { + "version": "15.0.0-preview-20161216-01" + }, + "dotnet-test-nunit-teamcity": "3.4.0-beta-3", + "NUnit": "3.5.0", + "Python.Runtime": "0.1.0-*" + }, + "testRunner": "nunit-teamcity", + "frameworks": { + "net46": { + } + }, + "configurations": { + "Py35-UCS2-Win-Debug": { + "buildOptions": { + "define": [ "TRACE", "DEBUG", "UCS2", "PYTHON35" ] + } + } + } +} diff --git a/src/runtime/Python.Runtime.csproj b/src/runtime/Python.Runtime.csproj deleted file mode 100644 index 823858b3d..000000000 --- a/src/runtime/Python.Runtime.csproj +++ /dev/null @@ -1,212 +0,0 @@ - - - - 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 - PYTHON27,UCS2 - - - 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 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - clr.py - - - - - - - - $(TargetPath) - $(TargetDir)$(TargetName).pdb - - - - - - \ No newline at end of file