Commit: c8fc55d59488008f5b08e2b583ddc07fe19924c5
Author: Sergey Sharybin
Date: Thu Dec 3 22:47:40 2015 +0500
Branches: master
https://developer.blender.org/rBc8fc55d59488008f5b08e2b583ddc07fe19924c5
Buildbot: Remove windows + scons related code
This is also has been moved to the CMake, no need to keep old dying code around.
===================================================================
M build_files/buildbot/slave_compile.py
M build_files/buildbot/slave_pack.py
===================================================================
diff --git a/build_files/buildbot/slave_compile.py
b/build_files/buildbot/slave_compile.py
index ab58af5..0afbd9f 100644
--- a/build_files/buildbot/slave_compile.py
+++ b/build_files/buildbot/slave_compile.py
@@ -169,27 +169,7 @@ else:
buildbot_dir = os.path.dirname(os.path.realpath(__file__))
config_dir = os.path.join(buildbot_dir, 'config')
- if builder.find('win') != -1:
- bitness = '32'
-
- if builder.find('win64') != -1:
- bitness = '64'
-
- scons_options.append('BF_INSTALLDIR=' + install_dir)
- scons_options.append('BF_BUILDDIR=' + build_dir)
- scons_options.append('BF_BITNESS=' + bitness)
- scons_options.append('WITH_BF_CYCLES_CUDA_BINARIES=True')
- scons_options.append('BF_CYCLES_CUDA_NVCC=nvcc.exe')
- if builder.find('mingw') != -1:
- scons_options.append('BF_TOOLSET=mingw')
- if builder.endswith('vc2013'):
- scons_options.append('MSVS_VERSION=12.0')
- scons_options.append('MSVC_VERSION=12.0')
- scons_options.append('WITH_BF_CYCLES_CUDA_BINARIES=1')
- scons_options.append('BF_CYCLES_CUDA_NVCC=nvcc.exe')
- scons_options.append('BF_NUMJOBS=1')
-
- elif builder.find('mac') != -1:
+ if builder.find('mac') != -1:
if builder.find('x86_64') != -1:
config = 'user-config-mac-x86_64.py'
else:
@@ -197,18 +177,6 @@ else:
scons_options.append('BF_CONFIG=' + os.path.join(config_dir, config))
- if builder.find('win') != -1:
- if not os.path.exists(install_dir):
- os.makedirs(install_dir)
- if builder.endswith('vc2013'):
- dlls = ('msvcp120.dll', 'msvcr120.dll', 'vcomp120.dll')
- if builder.find('win64') == -1:
- dlls_path = '..\\..\\..\\redist\\x86'
- else:
- dlls_path = '..\\..\\..\\redist\\amd64'
- for dll in dlls:
- shutil.copyfile(os.path.join(dlls_path, dll),
os.path.join(install_dir, dll))
-
retcode = subprocess.call([python_bin, 'scons/scons.py'] + scons_options)
sys.exit(retcode)
diff --git a/build_files/buildbot/slave_pack.py
b/build_files/buildbot/slave_pack.py
index 8e7a0fb..3535e78 100644
--- a/build_files/buildbot/slave_pack.py
+++ b/build_files/buildbot/slave_pack.py
@@ -91,24 +91,7 @@ if builder.find('scons') != -1:
buildbot_dir = os.path.dirname(os.path.realpath(__file__))
config_dir = os.path.join(buildbot_dir, 'config')
- if builder.find('win') != -1:
- bitness = '32'
-
- if builder.find('win64') != -1:
- bitness = '64'
-
- scons_options.append('BF_INSTALLDIR=' + install_dir)
- scons_options.append('BF_BUILDDIR=' + build_dir)
- scons_options.append('BF_BITNESS=' + bitness)
- scons_options.append('WITH_BF_CYCLES_CUDA_BINARIES=True')
- scons_options.append('BF_CYCLES_CUDA_NVCC=nvcc.exe')
- if builder.find('mingw') != -1:
- scons_options.append('BF_TOOLSET=mingw')
- if builder.endswith('vc2013'):
- scons_options.append('MSVS_VERSION=12.0')
- scons_options.append('MSVC_VERSION=12.0')
-
- elif builder.find('mac') != -1:
+ if builder.find('mac') != -1:
if builder.find('x86_64') != -1:
config = 'user-config-mac-x86_64.py'
else:
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
