Commit Graph

122 Commits

Author SHA1 Message Date
Martijn Berger
5d3adafcbb Buildbot SCons MSVC 2013 packing also requires something extra 2013-12-29 19:56:03 +01:00
Martijn Berger
8c4d40d0e5 MSVC 2013 buildbot changes 2013-12-29 17:43:31 +01:00
Sergey Sharybin
fb2bc547fe Buildbot: move lib step before blender.git step
This is an attempt to make it so revision from git
SHA is being displayed, not from libs svn revision.
2013-11-25 15:25:10 +06:00
Sergey Sharybin
2d8d3f364e Buildbot: update configuration file
Consider this configuration final-1 for the migration,
Linux and OSX slaves seems to be fine, Windows slave
would need some changes from the slave side.
2013-11-19 18:52:18 +06:00
Sergey Sharybin
3c662efee3 Buildbot: fix path got pack step 2013-11-19 16:02:13 +06:00
Sergey Sharybin
998fe53076 Buildbot: tweaks for source directory
Need this so checkout of existing svn does not
interferes with new git checkout which would
need to be done.
2013-11-19 15:28:03 +06:00
Jens Verwiebe
106cff1b93 OSX/buildbot: after scons refactor we only need the vars to change 2013-11-07 15:25:11 +00:00
Jens Verwiebe
5f084aced0 OSX/scons: simplification for getting the system version ( major, minor ), use sw_vers -productVersion instead of uname -r, we must not redine it then from darwin version -> osx version 2013-11-06 12:52:09 +00:00
Brecht Van Lommel
99c5e71397 Quicktime: remove backend with the old quicktime API, and keep the QTKit backend.
This means that if you have WITH_BF_QUICKTIME or WITH_CODEC_QUICKTIME enabled,
it will always use QTKit.

The old backend was only used on 32 bit OS X builds, now 32 and 64 bit builds will
give consistent input/output. On Windows or Linux quicktime isn't being used.
2013-11-06 01:45:15 +00:00
Jens Verwiebe
6477062b6b OSX/scons: buildbot cleanup following darwin-config 2013-11-05 18:25:43 +00:00
Jens Verwiebe
6c4b06a46d OSX: also remove USE_QTKIT option from configs, leave env var for later use ( always True ) 2013-11-05 16:04:32 +00:00
Jens Verwiebe
25b1280c50 OSX: buildbot cleanups after carbon removal 2013-11-05 16:00:23 +00:00
Brecht Van Lommel
f634509dc2 CMake and scons update to detect OS X 10.9, cmake patch by Jake Kauth. 2013-09-06 12:43:27 +00:00
Campbell Barton
a5b78bb6bd replace use of 'a.find(b) != -1' --> 'b in a' 2013-06-24 05:55:05 +00:00
Sergey Sharybin
4acd963860 Switch buildbot to use OpenEXR-2.0 2013-06-23 11:31:54 +00:00
Nathan Letwory
2749875945 Move DLL copying to before actual build process. 2013-06-20 14:19:46 +00:00
Brecht Van Lommel
8d6e5e2fee Cycles: update build configurations to include CUDA sm_35 architecture. When using
a compiler older than CUDA 5.0 it will give a warning and skip this architecture.
2013-06-20 13:10:47 +00:00
Jürgen Herrmann
836b91c9c7 Scons and BuildBot changes for MSVC 2012 support.
Thanks Brecht and Thomas for reviewing ;)
2013-06-18 11:55:32 +00:00
Brecht Van Lommel
344ffb99ae Buildbot: use relative path for redistributable dlls on windows. 2013-06-15 14:01:12 +00:00
Brecht Van Lommel
790e8b6eda Buildbot: use 1 thread for windows builds. 2013-06-15 10:16:01 +00:00
Sergey Sharybin
b453516cf2 Updtae buildbot's master.vfg 2013-06-01 10:18:47 +00:00
Brecht Van Lommel
13c0ef139f Fix OS X 32 bit build error, and bring buildbot config in sync with default. 2013-05-07 18:32:37 +00:00
Sergey Sharybin
ddf01af533 Buildbot tweaks
Add numpy installation to blender player configuration,
this is so because player is building first and it installs
python, which prevented numpy installation from blender
configuration.
2013-04-23 15:29:39 +00:00
Sergey Sharybin
85363c79bf Enable numpy install for buildbot
Numpy is compiled at build environment, but
importing it from blender somehow fails.

Will need help of Campbell for this.
2013-04-18 12:25:13 +00:00
Campbell Barton
8e3d590b76 code cleanup: python/pep8 and double-promotion warnings. 2013-03-28 19:33:14 +00:00
Sergey Sharybin
31eee77a45 Fix #33518: Jack sync doesn't work in 2.64, 2.64 or 2.65 stable versions
Added new build option WITH_JACK_DYNLOAD for CMake and
WITH_BF_JACK_DYNLOAD for SCons, which means there'll be
no build-time linking against libjack and getting symbols
from libjack will happen runtime using dlopen and dlsym
tricks.

Alternative would be to use weak linking, but it'll require
having wrapper for preloading libjack.

This new options are disabled by default and they only
intended to be used on linux. Other platforms shall not
be using this and there shall be no functional changes
on non-linux platforms at all.
2013-03-27 07:19:54 +00:00
Sergey Sharybin
36887c0ed0 Woops, installing dlls shall happen after all the folders are created. 2013-03-12 09:24:52 +00:00
Sergey Sharybin
ff65a6d457 Made a mistake in recent windows buildbot tweaks.
Didn't count indentation correct..
2013-03-12 09:19:38 +00:00
Sergey Sharybin
b93c44b8cc Mixed paths to redist libraries in recent commit 2013-03-11 14:16:41 +00:00
Sergey Sharybin
1a0789dc72 Windows buildbot tweaks
Make it so install directory is being nicely
cleaned before next build, which makes it
automatically removing all old files from
previous installations.
2013-03-11 10:49:51 +00:00
Sergey Sharybin
ed1c22db00 Fix first regression introduced with r55173: need to import shutil before using methods from it
Otherwise linux buildbot fails dramatically.

That revision also leads to msvc runtime libs being removed, will fix this
in separate commit.

Take more respect for such creepy as linux and windows platforms, they're not so bad!
2013-03-11 09:11:46 +00:00
Brecht Van Lommel
c142698fb7 Buildbot: mac configuration files for i386 and x86_64. 2013-03-10 17:45:31 +00:00
Thomas Dinges
dc90ce5b6d Cycles GPU rendering:
* Deprecate computing capability 1.3 (sm_13)

This commit disables auto build of sm_13 CUDA platform, which means that starting with Blender 2.67, we don't support sm_13 devices anymore. It has become difficult to support that and it was already feature incomplete (no render-passes, AO, Multi Closure etc).

It's still possible to manually enable sm_13 for own tests, but building might break in the future.
2013-02-21 17:14:07 +00:00
Sergey Sharybin
a85a0f57bc Buildbot: revert r54465 and r54466 -- issue was not caused by
crosscompilation, but was caused by some bugs in toolkit itself.

Shall be all fine now (at least it is on my laptop now).

Let give it another try!
2013-02-12 08:30:12 +00:00
Sergey Sharybin
eb723ad555 Buildbot: -WITHOUT_BF_OVERWRITE_INSTALL should not be needed now 2013-02-11 13:44:18 +00:00
Sergey Sharybin
6888d6eac8 Buildbot: switch to using native toolkit again
Crosscompiling of cubins doesn't work on linux with toolkit 4.2,
so use native toolkit for now. Disabled sm_13 for 32bit platform
for now.

Would keep cudakernels build target for a while. It doesn't hurt
being in the code and it could be helpful again once we'll switch
to toolkit 5.x where crosscompilation works fine.

Some further tweaks could probably be needed still, let's see how
building goes on buildbot now :)
2013-02-11 13:39:22 +00:00
Campbell Barton
769ab3eed8 code cleanup:
- cycles ui used 'cscene' for scene.cycles and scene.cycles_curves
- style cleanup
2013-01-15 23:17:45 +00:00
Sergey Sharybin
f687ad1c4f Cuda binaries workaround for buildbot shall no longer be needed. 2013-01-14 17:30:41 +00:00
Sergey Sharybin
dc4636827b Buildbot: fix for missing CUDA compute after recent changes
Issue was caused by how CUDA devices availability done in Cycles.
Basically, if there's no WITH_CUDA_BINARIES buildtime, nvcc becomes
mandatory dependency.

Since kernels are building in separate target now, this logic broke
a bit.

Perhaps condition in util_cuda shall be changed to be a bit smarter,
but for now just work-around by enabling CUDA binaries when building
Cycles. Made it empty arch list to be sure no kernels will try to
re-compile after cudakernels target is done.
2013-01-12 19:17:50 +00:00
Sergey Sharybin
53ad8274b0 Stripping and packaging shall happen inside of chroot as well 2013-01-10 09:21:12 +00:00
Sergey Sharybin
93c82483c7 Further tweaks to buildbot
- BF_BITNESS should be passed as a command line argument
- Made it so CUDA binaries and OSL compiled scripts would
  be installed regardless WITH_BF_PYTHON (which seems to
  be quite obvious)
- Disable overwrite install, so CUDA kernels installed by
  it's build target will be preserved when building blender
  itself.
2013-01-10 08:55:44 +00:00
Sergey Sharybin
2a43380ded Switch linux buildbot to compile all cuda kernels in 64bit environment
Solves memory limit issues when building sm_13 for 32bit platform.

Some further refinement of patch could be needed.
2013-01-10 08:01:19 +00:00
Sergey Sharybin
a4ba448529 Remove glibc27 from buildbot scripts 2013-01-09 13:46:59 +00:00
Sergey Sharybin
ba868f1c50 Buildbot: disable Jack for now, it doesn't work when linked statically
No easy build configuration fix for this, need to be switched to more
like a plugin system to support jack.
2012-12-21 09:37:43 +00:00
Brecht Van Lommel
ceedd5bd35 Fix cycles CUDA sm 1.3 build with 32 bit compiler, tweaked voronoi
and brick code so that it can be uninlined.
2012-11-30 07:27:17 +00:00
Sergey Sharybin
33f451838a For sure buildbot's release buildflags should include -DNDEBUG,
otherwise asserts will abort execution for release builds.
2012-11-28 16:19:45 +00:00
Sergey Sharybin
fa9c12bbd1 Reverting previous buildbot commit - sm_13 still fails actually 2012-11-22 17:22:08 +00:00
Sergey Sharybin
9c24ae52ee Buildbot: enable sm_13 for 32bit linux 2012-11-22 16:16:33 +00:00
Brecht Van Lommel
629ea82a13 Fix 33149: LLVM caused startup crash on linux systems using Mesa llvmpipe.
Now we hide the LLVM symbols with an ld version script to avoid conflicts.
2012-11-21 22:28:15 +00:00
Brecht Van Lommel
fd7a3db8eb Buildbot:
* Use rsync upload for Mac slave, rather than uploading entire file. This could
  be enabled for more slaves, should make more frequent builds possible.
* Split Mac into 10.6 and 10.5 builds.
2012-11-18 00:20:23 +00:00