added automated threaded builds

Roberto De Ioris · Roberto De Ioris · commit acc830629f18 · 2017-08-16T15:34:54.000+02:00
diff --git a/Source/UnrealEnginePython/UnrealEnginePython.Build.cs b/Source/UnrealEnginePython/UnrealEnginePython.Build.cs
@@ -215,6 +215,12 @@ public UnrealEnginePython(TargetInfo Target)
             Definitions.Add(string.Format("UNREAL_ENGINE_PYTHON_ON_LINUX"));
         }
 
+	string enableThreads = System.Environment.GetEnvironmentVariable("UEP_ENABLE_THREADS");
+	if (!string.IsNullOrEmpty(enableThreads)) {
+		Definitions.Add("UEPY_THREADING");
+            	System.Console.WriteLine("*** Enabled Python Threads support ***");
+	}
+
     }
 
     private string DiscoverPythonPath(string[] knownPaths)
diff --git a/tools/release_win64.py b/tools/release_win64.py
@@ -2,13 +2,24 @@
 import subprocess
 import sys
 import time
+import shutil
+import zipfile
 
 UE_VERSIONS = ['4.15', '4.16', '4.17']
 PYTHON_VERSIONS = ["C:/Program Files/Python36", "C:/Program Files/Python35", "C:/Python27"]
 
-def msbuild(project, python_version):
+RELEASE_DIR = sys.argv[1].rstrip('/')
+
+def zipdir(path, zh):
+    for root, dirs, files in os.walk(path):
+        for file in files:
+            zh.write(os.path.join(root, file))
+
+def msbuild(project, python_version, variant):
     base_environ = os.environ
     base_environ.update({'PYTHONHOME': python_version})
+    if variant == 'threaded_':
+        base_environ.update({'UEP_ENABLE_THREADS': '1'})
     vs = '"C:/Program Files (x86)/MSBuild/14.0/Bin/MSBuild.exe"'
     process = subprocess.Popen('{0} {1} /t:Rebuild /p:Configuration="Development Editor" /p:Platform=Win64'.format(vs, project), env=base_environ)
     while process.poll() is None:
@@ -42,13 +53,21 @@ def git(project):
     sln = os.path.join('D:/', project, '{0}.sln'.format(project))
     git(project)
     for python_version in PYTHON_VERSIONS:
-        start = time.time()
-        print('\n\n***** building {0} for {1} *****\n\n'.format(sln, python_version))
-        sys.stdout.flush()
-        msbuild(sln, python_version)
-        commandlet(ue_version, project)
-        end = time.time()
-        print('\n\n***** built {0} for {1} in {2} seconds *****\n\n'.format(project, python_version, end-start))
+        for variant in ('', 'threaded_'):
+            python_sanitized = os.path.basename(python_version).lower()
+            start = time.time()
+            print('\n\n***** building {0} for {1} ({2}) *****\n\n'.format(sln, python_version, variant))
+            sys.stdout.flush()
+            msbuild(sln, python_version, variant)
+            commandlet(ue_version, project)
+            end = time.time()
+            for item in ('UE4Editor.modules', 'UE4Editor-UnrealEnginePython.dll', 'UE4Editor-PythonConsole.dll', 'UE4Editor-PythonEditor.dll'):
+                shutil.copyfile('D:/{0}/Plugins/UnrealEnginePython/Binaries/Win64/{1}'.format(project, item), '{0}/UnrealEnginePython/Binaries/Win64/{1}'.format(RELEASE_DIR, item))
+            filename = 'UnrealEnginePython_{0}_{1}_{2}_{3}win64.zip'.format(os.path.basename(RELEASE_DIR), ue_version.replace('.','_'), python_sanitized, variant)
+            zh = zipfile.ZipFile(os.path.join(RELEASE_DIR, filename), 'w', zipfile.ZIP_DEFLATED)
+            zipdir(os.path.join(RELEASE_DIR, 'UnrealEnginePython'), zh)
+            zh.close()
+            print('\n\n***** built {0} for {1} in {2} seconds [{3}]*****\n\n'.format(project, python_version, end-start, filename))
 
 main_end = time.time()
 print('release ready after {0} seconds'.format(main_end-main_start))

Original file line number	Diff line number	Diff line change
`@@ -215,6 +215,12 @@ public UnrealEnginePython(TargetInfo Target)`
`215`	`215`	`Definitions.Add(string.Format("UNREAL_ENGINE_PYTHON_ON_LINUX"));`
`216`	`216`	`}`
`217`	`217`
	`218`	`+ string enableThreads = System.Environment.GetEnvironmentVariable("UEP_ENABLE_THREADS");`
	`219`	`+ if (!string.IsNullOrEmpty(enableThreads)) {`
	`220`	`+ Definitions.Add("UEPY_THREADING");`
	`221`	`+ System.Console.WriteLine("* Enabled Python Threads support *");`
	`222`	`+ }`
	`223`	`+`
`218`	`224`	`}`
`219`	`225`
`220`	`226`	`private string DiscoverPythonPath(string[] knownPaths)`