Commit044edfe

committed

Refactor runtime's dllBase

As long as the API doesn't change on new python minor releases,all changes needed for new minor versions is isolated to a smallsection of code.

1 parent9650e8b commit044edfeCopy full SHA for 044edfe

File tree

1 file changed

+11

-33

lines changed

src/runtime
- runtime.cs

1 file changed

+11

-33

lines changed

`‎src/runtime/runtime.cs`

Lines changed: 11 additions & 33 deletions

Original file line number	Diff line number	Diff line change
`@@ -102,54 +102,30 @@ public class Runtime`
`102`	`102`
`103`	`103`	`#ifPYTHON27`
`104`	`104`	`publicconststringpyversion="2.7";`
`105`		`-publicconstintpyversionnumber=27;`
	`105`	`+publicconststringpyver="27";`
`106`	`106`	`#elifPYTHON33`
`107`	`107`	`publicconststringpyversion="3.3";`
`108`		`-publicconstintpyversionnumber=33;`
	`108`	`+publicconststringpyver="33";`
`109`	`109`	`#elifPYTHON34`
`110`	`110`	`publicconststringpyversion="3.4";`
`111`		`-publicconstintpyversionnumber=34;`
	`111`	`+publicconststringpyver="34";`
`112`	`112`	`#elifPYTHON35`
`113`	`113`	`publicconststringpyversion="3.5";`
`114`		`-publicconstintpyversionnumber=35;`
	`114`	`+publicconststringpyver="35";`
`115`	`115`	`#elifPYTHON36`
`116`	`116`	`publicconststringpyversion="3.6";`
`117`		`-publicconstintpyversionnumber=36;`
	`117`	`+publicconststringpyver="36";`
`118`	`118`	`#elifPYTHON37// TODO: Add interop37 after Python3.7 is released`
`119`	`119`	`publicconststringpyversion="3.7";`
`120`		`-publicconstintpyversionnumber=37;`
	`120`	`+publicconststringpyver="37";`
`121`	`121`	`#else`
`122`	`122`	`#error You must define one of PYTHON33 to PYTHON37 or PYTHON27`
`123`	`123`	`#endif`
`124`	`124`
`125`		`-#ifMONO_LINUX\|\|MONO_OSX`
`126`		`-#ifPYTHON27`
`127`		`-internalconststringdllBase="python2.7";`
`128`		`-#elifPYTHON33`
`129`		`-internalconststringdllBase="python3.3";`
`130`		`-#elifPYTHON34`
`131`		`-internalconststringdllBase="python3.4";`
`132`		`-#elifPYTHON35`
`133`		`-internalconststringdllBase="python3.5";`
`134`		`-#elifPYTHON36`
`135`		`-internalconststringdllBase="python3.6";`
`136`		`-#elifPYTHON37`
`137`		`-internalconststringdllBase="python3.7";`
`138`		`-#endif`
	`125`	`+#ifMONO_LINUX\|\|MONO_OSX// Linux/macOS use dotted version string`
	`126`	`+internalconststringdllBase="python"+pyversion;`
`139`	`127`	`#else// Windows`
`140`		`-#ifPYTHON27`
`141`		`-internalconststringdllBase="python27";`
`142`		`-#elifPYTHON33`
`143`		`-internalconststringdllBase="python33";`
`144`		`-#elifPYTHON34`
`145`		`-internalconststringdllBase="python34";`
`146`		`-#elifPYTHON35`
`147`		`-internalconststringdllBase="python35";`
`148`		`-#elifPYTHON36`
`149`		`-internalconststringdllBase="python36";`
`150`		`-#elifPYTHON37`
`151`		`-internalconststringdllBase="python37";`
`152`		`-#endif`
	`128`	`+internalconststringdllBase="python"+pyver;`
`153`	`129`	`#endif`
`154`	`130`
`155`	`131`	`#ifPYTHON_WITH_PYDEBUG`
`@@ -174,6 +150,8 @@ public class Runtime`
`174`	`150`	`publicconststringPythonDll=dllBase+dllWithPyDebug+dllWithPyMalloc+dllWithWideUnicode;`
`175`	`151`	`#endif`
`176`	`152`
	`153`	`+publicstaticreadonlyintpyversionnumber=Convert.ToInt32(pyver);`
	`154`	`+`
`177`	`155`	`// set to true when python is finalizing`
`178`	`156`	`internalstaticobjectIsFinalizingLock=newobject();`
`179`	`157`	`internalstaticboolIsFinalizing=false;`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit044edfe

File tree

1 file changed

1 file changed

`‎src/runtime/runtime.cs`

0 commit comments