Commit Graph

650 Commits

Author SHA1 Message Date
Thomas Dinges
88b26f24e4 Windows x64:
* Fix compile after recent OIIO changes.
2012-11-16 12:18:47 +00:00
Jens Verwiebe
4ece50723b OSX/scons/osl: ready for compile now, little hack to be resolved, todo:fix a crash with shadercompile 2012-11-16 00:43:28 +00:00
Jens Verwiebe
69320ea595 OSX/scons/osl: initial osl compiling, todo: fix shader compile and copy to bundle 2012-11-15 21:35:25 +00:00
Sergey Sharybin
2007ba687f Enable OSL for linux 32 bit builders, it should work now 2012-11-15 19:26:11 +00:00
Bastien Montagne
7d6417bbb3 Another nuch of fixes/improvements to install_deps script, among which:
*New $INST variable to easily change the installation root dir of compiled libs.
*Better handling of versions for debian (DEB) too (and fix a bug for fedora (RPM) ones).
*Enhancements/fixes to compile_FOO funcs:
**Most notable, we now can force a recompile when we change something into these funcs, so user will always have latest-instructions compiled libs (else, he would have have to manually remove lib dirs under $INST...)
*General naming cleanup inside script (still wip).

Also adding boost date_time lib to linux in cmake file (why wasn't it there???).
2012-11-15 17:31:18 +00:00
Brecht Van Lommel
2324c80f50 Cycles OSL: windows build system changes to support static OSL/OIIO. 2012-11-15 17:16:27 +00:00
Thomas Dinges
1c9b548d92 Windows / Scons OSL:
* Initial support, still commented.
2012-11-15 16:34:22 +00:00
Sergey Sharybin
b89026a302 Correction to 32bit buildslaves 2012-11-15 13:26:32 +00:00
Sergey Sharybin
9eccf40daa OSL Scons rules
Initial support of OSL builds using SCons build system. Only tested on Linux now.
No changes to configuration files themselves -- for now check how it's configured
for linux buildbot (it was already horror to make all this changes and verify them,
changes to linux-config.py could easily be done later).

Currently WITH_BF_STATICOSL and WITH_BF_STATICLLVM are more like rudiments because
linking against oslexec requires special trick with --whole-archive. We woul either
need to find a way dealing with this oslexec less hackish or drop STATICOSL and 
STATICLLVM flags. Will keep dropping this flags for until we have "final" build
rules for OSL.

Still can not make 32bit linux rendering with OSL -- blender simply crashes when
starting rendering. So for time being this issues are solving disabled OSL for
32bit build slaves.
2012-11-15 13:11:12 +00:00
Bastien Montagne
c3ce2bbfdf looks like we need those libs as well to compile with static ffmpeg on fedora (by why in hell librt???)... 2012-11-14 23:20:16 +00:00
Bastien Montagne
67f0a4b424 Fixes, mostly for RPM (tested on fedora17):
*Better handling of optional libs for ffmpeg, and is now able to check and give user additional link libs for ffmpeg.
*Added two helpers (only used by RPM for now) to:
**check whether a version number is greater or equal than another one, and...
**check whether a version number is "included" into another one (eg 3.3.2 is included into more general 3.3).
*Added date-time as target when building our own boost.
*Removed apt-get upgrade action for DEB (let the user decide when he wants to globally upgrade its system!).
2012-11-14 21:57:47 +00:00
Campbell Barton
7c3db355b1 remove ifdef'd bevel code, current bevel works better then the previous code.
reduce strlen check in texttool_suggest_add()
use 'del list[:]' rather then 'list[:] = []' in python scripts which clear lists.
2012-11-14 09:45:15 +00:00
Bastien Montagne
7138beaa64 Fix for oiio/ocio/boost in those scons config, else specifying a custom "root" path for those libs in user-config.py is useless! 2012-11-14 08:12:52 +00:00
Campbell Barton
050f09aa6c buildsystem cleanup: remove duplicate source & includes for scons,
add a check for duplicates in BlenderLib()m, if 0'd now.
2012-11-14 01:41:24 +00:00
Bastien Montagne
95a64ff2da Fixes for scons 2012-11-13 18:12:57 +00:00
Bastien Montagne
4713c30017 Adding an escape for '/' char inside the regex's char classe, looks like it is needed for ubuntu 's awk but not mandatory for debian's awk??? Anyway, does not arm... ;) 2012-11-13 18:04:52 +00:00
Bastien Montagne
a46b1feb77 Add more info to make ffmpeg work "out of the box" for DEB systems:
*For CMake, enable ffmpeg (it is disabled by default...)
*Give the full list a librairies to link.

Tested on Debian for CMake (did not test scons at all for now, anyway). Not yet implemented for RPM/SUSE distribs, but this should not be too hard.
2012-11-13 16:42:36 +00:00
Bastien Montagne
741e167f83 More fixes:
*Unset LANG envar for the script execution time, because commands like "apt-cache policy" will return translated messages, which would not be grep'ed crrectly...
*Disable using distrib's ffmpeg for DEB distribs too, as e.g. official debian features libav under ffmpeg name, which is not that much compatible with current Blender code.
*Also check for libxvidcore-dev .deb package, debian has no libxvidcore4-dev ;)
2012-11-13 10:49:55 +00:00
Sergey Sharybin
c382c03ccf Hopefully now suse will just work :) 2012-11-13 10:12:42 +00:00
Sergey Sharybin
0b1411046b Install dependencies script: added support of OpenSUSE
Currently it'll install basic packages only and will compile all
python, boost, oiio, ocio and ffmpeg.
2012-11-13 09:29:22 +00:00
Bastien Montagne
d1cd8f5802 fix for boost (symlink was buggy, and better to only build needed boost libs).
Note; we might also want to add the --without-icu option later...
2012-11-13 06:22:47 +00:00
Sergey Sharybin
d3c3f07133 Initial implementation of a script for automatic dependencies installer/builder
This script will install all packages from the repositories and will compile
missing in repositories libraries.

It is supposed to replace pre-compiled libraries from our svn.

Tested script on Fedora 14 and 17, Ubuntu 10.04 and 12.10. All the dependencies
and manually built libraries seems to be fine. However, it's really annoying to
build blender in virtual machine to ensure there's no linking errors, i would
hope community will help testing and making needed tweaks to the script :)

To use the script, simple run it from your user name. It'll run installation
commands from a sudo, so you would likely be requested to type a password.

I've made tweaks to CMake FindLibs, so it should find OIIO, OCIO and python
libraries compiled by this script. Boost and FFmpeg would need to be specified
manually.

SCons currently would require manual paths specifications as well. Perhaps we
could make SCons smarter in the future.

All the parameters you need to pass to CMake/SCons would be printed when script
finishes to run.

Pretty much sure it's not production-ready script, but we need to start testing
at some point :)
2012-11-12 19:39:09 +00:00
Sergey Sharybin
3e910de184 Enable libboost_locale for buildbot rules 2012-11-12 12:10:46 +00:00
Jens Verwiebe
ad5cf1fe9c fix scons compile after introducing BF_BOOST_LIB_INTERNATIONAL 2012-11-12 09:31:10 +00:00
Joshua Leung
c844033cd0 Scons compiling fix
Proper implementation for only including the boost locale libs when
WITH_BF_INTERNATIONAL is enabled, so that those of us who do not need/want to
bother with translated ui's can compile. The way it was done before was wrong as
1) the value was always set to true earlier in the config scripts, 2) the base
config scripts run before user config overrides are set
2012-11-12 02:30:16 +00:00
Bastien Montagne
0738284e32 Clen up of gettext stuff from scons scripts... Did not touch to buildbots ones, nor to iconv, as it’s still uncleare whether we can get rid of it :/ 2012-11-11 19:46:36 +00:00
Bastien Montagne
5ff3017900 Replacing gettext i18n backend by boost::locale one.
This commit adds a small and simplistic C wrapper around boost's locale library as intern/locale, and heavily simplifies/reduces Blender's own i18n code (under blenfont/ dir). And it adds back UI translation on windows' official builds (with msvc)!

Note to platform maintainers: iconv and gettext (libintl) can now be removed from precompiled libs (not gettext binaries, under windows, of course ;) ).

Note to MinGW32/64 users: boost_locale lib has not yet been uploaded for those build env, please disable WITH_INTERNATIONAL for now (hopefully will be fixed very soon, have contacted psy-fy).
2012-11-11 16:54:26 +00:00
Bastien Montagne
dcca228906 Another fix for finding python stuff... Should work for everyone now! (I hope...). 2012-11-09 20:38:09 +00:00
Bastien Montagne
3e004d3043 Use CMAKE_LIBRARY_ARCHITECTURE instead of hardcoded stuff like x86_64-linux-gnu! Now should work with any multiarch! 2012-11-07 16:51:09 +00:00
Bastien Montagne
5850e62262 Attempt to fix problems with local built py caused by own r51976. 2012-11-07 12:24:03 +00:00
Bastien Montagne
fff3f95768 Update to make it work with new debian-like py3.3 packages. A bit hackish (this arch-dependent stuff makes things a bit complex), and probably only working for amd64 arch, but at least should not create any regression... 2012-11-07 11:44:39 +00:00
Campbell Barton
5cf9d5e4ca for utility checkers, use QUIET env var, not to print progress. 2012-11-07 01:00:27 +00:00
Sergey Sharybin
804f642ebd Release environment script: make python linking to openssl statically 2012-11-06 12:17:47 +00:00
Sergey Sharybin
2f9e846e7d Buildbot: blenderplayer configuration needs to define path to boost now 2012-11-05 15:55:59 +00:00
Sergey Sharybin
1eb1e1e09a Switch glibc-2.7 buildbots to py3.3 2012-11-05 15:28:48 +00:00
Sergey Sharybin
6b0c7c1e59 Release environment script: correction to python shm check 2012-11-05 14:50:18 +00:00
Campbell Barton
004f8d78ed default to Python3.3 on Linux for SCons and CMake, warn when building with python 3.2x or older.
also remove casts to keep Python3.2 warning quiet.
2012-11-05 13:48:42 +00:00
Sergey Sharybin
6d8e55545d Script to configure release build environment
This script was used to initialize build environment currently used
for glibc-2.11 builds.

It's supposed to be used on debian-based distros.

Usage is described in the top comment of the script.

It is highly recommended to use this script in the virtual machine
to prevent possible conflicts with your own configuration.

TODO:
- Add OSL configuration
- Script requires manual copying of some scripts still (see comments
  at the top of the script)

I would prefer this script be edited only in cases when it's really
needed, meaning i wouldn't be fan of changes like "just use latest
version of library XXX". It's not so safe to do such changes and it's
easy to upgrade libraries after environment was set up.
2012-11-05 09:58:05 +00:00
Sergey Sharybin
7f125bbc20 Buildbot: hopefully fix for missed sound on glibc2.11 slaves 2012-10-29 18:03:32 +00:00
Sergey Sharybin
c75b6c854c Buildbot: use proper archive name for glibc2.11 archives 2012-10-29 16:07:16 +00:00
Sergey Sharybin
37801c86f2 Buildbot: tweaks for glibc2.11 build environment 2012-10-29 15:31:48 +00:00
Sergey Sharybin
07d9cb739a Buildbot: keem sm_13 disabled for new buildbot too 2012-10-28 17:04:32 +00:00
Sergey Sharybin
4f8c55c67c Buildbot: add glibc2.11 configuration files and build rules
Builder will go online as soon as new environment is copied to buildslave machine over the internet
2012-10-28 17:03:36 +00:00
Sergey Sharybin
445bd0eb6e Buildbot: add glibc2.11 slaves, not online yet 2012-10-28 16:58:44 +00:00
Sergey Sharybin
b980b43e66 Buildbot: copy master.cfg from builder.blender.org
Seems this file went out of sync with actual file on the server
2012-10-28 16:40:31 +00:00
Sergey Sharybin
b9e652a669 SCons: more libraries could be specified to be static now
Jack, jpeg, png, openmp, opencollada libraris now could be forced to be static
2012-10-27 13:22:36 +00:00
Sergey Sharybin
5b0759fc00 Temporary disable sm_13 for 32bit buildbot -- it requires more than 4GB of memory
to compile, which for sure can not be allocated on 32bit platform
2012-10-22 18:10:15 +00:00
Campbell Barton
226a5ee834 remove LOD_Decimator (c++ decimator), now replaced by bmesh decimator. also remove CTR c++ classes that are no longer used. 2012-10-22 02:39:26 +00:00
Campbell Barton
f3ece5a108 style cleanup: trailing tabs & expand some non prefix tabs into spaces. 2012-10-21 05:46:41 +00:00
Campbell Barton
aeda5142ef style cleanup: make OSL follow our C style convention. http://wiki.blender.org/index.php/Dev:Doc/CodeStyle 2012-10-17 01:47:37 +00:00