improved build system

Author: Roberto De Ioris

tools/release_win64.py

@@ -16,12 +16,10 @@ def zipdir(path, zh, base):
             filename = os.path.join(root, file)
             zh.write(filename, os.path.relpath(filename, base))
 
-def msbuild(project, python_version, variant):
+def msbuild(project, python_version):
     base_environ = os.environ
     base_environ.update({'PYTHONHOME': python_version})
     base_environ.update({'UEP_ENABLE_UNITY_BUILD': '1'})
-    if variant == 'threaded_':
-        base_environ.update({'UEP_ENABLE_THREADS': '1'})
     #vs = '"C:/Program Files (x86)/MSBuild/14.0/Bin/MSBuild.exe"'
     vs = '"C:/Program Files (x86)/Microsoft Visual Studio/2017/Community/MSBuild/15.0/Bin/MSBuild.exe"'
     process = subprocess.Popen('{0} {1} /m /t:Rebuild /p:Configuration="Development Editor" /p:Platform=Win64'.format(vs, project), env=base_environ)
@@ -56,28 +54,27 @@ def git(project):
     sln = os.path.join('D:/', project, '{0}.sln'.format(project))
     git(project)
     for python_version in PYTHON_VERSIONS:
-        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', 'UE4Editor-PythonAutomation.dll'):
-                shutil.copyfile('D:/{0}/Plugins/UnrealEnginePython/Binaries/Win64/{1}'.format(project, item), '{0}/UnrealEnginePython/Binaries/Win64/{1}'.format(RELEASE_DIR, item))
-                if python_sanitized == 'python36':
-                    shutil.copyfile('D:/{0}/Plugins/UnrealEnginePython/Binaries/Win64/{1}'.format(project, item), '{0}/Embedded/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)
+        python_sanitized = os.path.basename(python_version).lower()
+        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()
+        for item in ('UE4Editor.modules', 'UE4Editor-UnrealEnginePython.dll', 'UE4Editor-PythonConsole.dll', 'UE4Editor-PythonEditor.dll', 'UE4Editor-PythonAutomation.dll'):
+            shutil.copyfile('D:/{0}/Plugins/UnrealEnginePython/Binaries/Win64/{1}'.format(project, item), '{0}/UnrealEnginePython/Binaries/Win64/{1}'.format(RELEASE_DIR, item))
+            if python_sanitized == 'python36':
+                shutil.copyfile('D:/{0}/Plugins/UnrealEnginePython/Binaries/Win64/{1}'.format(project, item), '{0}/Embedded/UnrealEnginePython/Binaries/Win64/{1}'.format(RELEASE_DIR, item))
+        filename = 'UnrealEnginePython_{0}_{1}_{2}_win64.zip'.format(os.path.basename(RELEASE_DIR), ue_version.replace('.','_'), python_sanitized)
+        zh = zipfile.ZipFile(os.path.join(RELEASE_DIR, filename), 'w', zipfile.ZIP_DEFLATED)
+        zipdir(os.path.join(RELEASE_DIR, 'UnrealEnginePython'), zh, RELEASE_DIR)
+        zh.close()
+        if python_sanitized == 'python36':
+            filename = 'UnrealEnginePython_{0}_{1}_{2}_embedded_win64.zip'.format(os.path.basename(RELEASE_DIR), ue_version.replace('.','_'), python_sanitized)
             zh = zipfile.ZipFile(os.path.join(RELEASE_DIR, filename), 'w', zipfile.ZIP_DEFLATED)
-            zipdir(os.path.join(RELEASE_DIR, 'UnrealEnginePython'), zh, RELEASE_DIR)
+            zipdir(os.path.join(RELEASE_DIR, 'Embedded/UnrealEnginePython'), zh, os.path.join(RELEASE_DIR, 'Embedded'))
             zh.close()
-            if python_sanitized == 'python36':
-                filename = 'UnrealEnginePython_{0}_{1}_{2}_{3}embedded_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, 'Embedded/UnrealEnginePython'), zh, os.path.join(RELEASE_DIR, 'Embedded'))
-                zh.close()
-            print('\n\n***** built {0} for {1} in {2} seconds [{3}]*****\n\n'.format(project, python_version, end-start, filename))
+        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))