Commit Graph

768 Commits

Author SHA1 Message Date
Dan Eicher
19c4ae50e4 Add datafiles/locale/languages to blender.spec.in for CPack 2012-12-28 23:30:34 +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
Thomas Dinges
b3dc1d585a Scons / Windows Release Builds:
* Don't put -release- string into the final .exe name.
blender-2.65-release-windows32.exe --> blender-2.65-windows32.exe
2012-12-20 08:54:37 +00:00
Bastien Montagne
10fdfb54b5 Minor enhancements to end message of build_deps.sh 2012-12-19 11:07:10 +00:00
Bastien Montagne
b481ec92e4 Minor tweaks to some UI messages... 2012-12-17 20:16:37 +00:00
Sergey Sharybin
e00e649063 SCons: clean up code which was commented out since 2007 2012-12-14 12:06:24 +00:00
Sergey Sharybin
7fe2ac8e9a SCons; cleanup linux-config.py from using deprecated libraries from svn
This was already done for CMake and mentioning this paths in scons only
messes things up.
2012-12-14 12:06:09 +00:00
Sergey Sharybin
d4cd823912 SCons: added static libs path for OIIO, OCIO and Boost
This should make it easier to write user-config.py

Still not sure how to deal with OSL and LLVM in a nice way, they're currently
using some hacks which didn't support specifying this libraries as static.
2012-12-13 16:55:54 +00:00
Jens Verwiebe
8af6721eb5 OSX: make cmake and scons both compile jack and ndof with newer sdk's 2012-12-12 19:54:14 +00:00
Sergey Sharybin
892d21631b Install dependencies used to always mark schro as used for suse.
Now it should respect all features option.

Also removed some duplicated entries.
2012-12-11 19:45:16 +00:00
Brecht Van Lommel
ea464b9659 OSL install deps script: set STOP_ON_WARNING to OFF to disable -Werror. 2012-12-11 08:13:56 +00:00
Campbell Barton
7376fb2913 make cppcheck run with quiet flag when QUIET env var is set, make bpy.ops.image.project_apply() only use local images. 2012-12-09 14:17:33 +00:00
Bastien Montagne
c2405353b8 Make installation of some libs off by default (use --with-all option to re-enable them). Currently affected libs:
*libspnav
*liblame
*libjack
*libscrhoedinger
*libvpx
*libxvid
2012-12-05 11:58:38 +00:00
Bastien Montagne
b095c31c87 Can't stress how much I hate bash... This should fix a bug with version comparison (at least under fedora, debian looked OK :/ ). 2012-12-04 22:03:39 +00:00
Bastien Montagne
eeece25d82 Add libjeack0 as (Debian and co) dep.
Also add --skip-foo args to command line.
2012-12-03 17:53:01 +00:00
Bastien Montagne
d6a09974e2 Exit when package manager fails (exit status >= 1). 2012-12-03 17:22:52 +00:00
Brecht Van Lommel
dbd44e3bf5 Fix scons not installing closure/ directory for runtime compiles of CUDA kernel. 2012-12-03 16:51:05 +00:00
Bastien Montagne
6213c6d69b Add --force-all option to force rebuild of all built libraries. 2012-12-03 13:28:35 +00:00
Bastien Montagne
f00a49baaa Add exhaustive command line options description in --help message... 2012-12-03 12:04:15 +00:00
Bastien Montagne
19e9571b1b Various "user-friendly" edits, mostly adding command-line args parsing... So now you can try to build OSL with just install_deps.sh --with-osl 2012-12-01 18:07:45 +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
40e75fd2eb Dependencies Builder: disable LINKSTATIC for OIIO
It'll likely give issues with system boost libraries in ubuntu/debian due
to this distros doesn't like static linking and not building static libs
with -fPIC flag.

Disabling LINKSTATIC should be quite painless since blender requires the
same image libraries as oiio does.
2012-11-29 08:22:02 +00:00
Sergey Sharybin
777449029b Seems cmake in debian squeeze is broken and fails to handle BOOST_ROOT
I would recommend using debian-backports repo for cmake
2012-11-28 19:37:37 +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
8d4741b501 Dependency builder: reduce amount of needed sudo commands by checking permissions for $INST folder 2012-11-28 13:34:44 +00:00
Sergey Sharybin
406d680cee Dependency builder: fixed sources directory not creating in some cases 2012-11-28 13:27:12 +00:00
Campbell Barton
a7555a81c7 remove unmaintained eltopo, keeping scons/cmake entries, but commenting out user visible config to make branch merging less of a hassle. 2012-11-27 09:52:20 +00:00
Campbell Barton
0a5d44588c switch verious references from py3.2 -> 3.3 or just 3. 2012-11-26 13:58:06 +00:00
Sergey Sharybin
2d6402c10c Switch windows to python 3.3
Should affect on msvc2008 only, however scons with msvc2010 could still be broken.
2012-11-26 12:38:40 +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
Bastien Montagne
7503bd59e1 Fix two stupid mistakes... Btw, osl now compiles with Fedora17, once llvm-3.1 has been compiled! ;) 2012-11-21 15:42:12 +00:00
Bastien Montagne
7011d3cfe2 Enable llvm building for fedora too.
Unfortunately, this does not solve OSL compile problem in this distro (still the same errors, looks related to gnu c++... :/).
2012-11-21 13:13:50 +00:00
Bastien Montagne
dba4444cd8 Bring SUSE target to the same level as others.
Also add compile_LLVM func, needed by openSuse (which llvm package is
completly broken), and probably can help for OSL in Fedora17 too (will test soon).
2012-11-21 09:01:49 +00:00
Thomas Dinges
d7ff8855cb Mingw x64:
* Iconv libs have been removed from SVN, disable it. This hopefully fixes the buildbot.
2012-11-20 01:26:21 +00:00
Thomas Dinges
d19339a181 Windows / OSL:
* Enable OSL for Windows and Windows Buildbot.
2012-11-20 00:54:32 +00:00
Bastien Montagne
ade96d2840 Update to use new WITH_STATIC_LIBS CMake flag when ALL_STATIC is true. 2012-11-19 20:24:06 +00:00
Bastien Montagne
89bebee459 More tweaks:
* Prevent ocio from building its python binding, we don't use it, and it looks like OCIO's CMakeList is not robust here (i.e. can try to build it even when Python.h is not found :/ [irc report]).
* Do not build ffmpeg's player, server nor doc.
* Give right paths to static extra libs for ffmpeg when ALL_STATIC is true.
2012-11-19 19:11:01 +00:00
Jens Verwiebe
eebc9f4922 OSX/osl: link also boost_wave, cause we use its preprocessor now 2012-11-19 19:10:31 +00:00
Brecht Van Lommel
1e98e96f7c Windows Libs: move OpenEXR headers to same directory structure as other platforms. 2012-11-19 16:02:29 +00:00
Brecht Van Lommel
312abf8cb2 SCons: make OSL linking work on windows, and fix OSL compiler path issue to
properly expand to absolute path.
2012-11-19 14:54:35 +00:00
Bastien Montagne
7ecbc39610 Basic work for an ALL_STATIC option, to enable when you want to build blender in a portable way. Still WIP! 2012-11-19 11:12:30 +00:00
Bastien Montagne
063ca9b2a6 No boost system when we have own compiled version! 2012-11-19 10:45:03 +00:00
Jens Verwiebe
29fe8abf8d OSX/scons: migration to py 3.3 2012-11-19 10:14:55 +00:00
Bastien Montagne
67031c1712 Fix when statically linking with distro's boost: in this case, we most likely also need to statically link against icu, as most boost packages are built with it. Without that, you get a bunch of errors at link time (when using boost_locale, or, in freestyle branch, boost_regex).
So when you enable Boost_USE_STATIC_LIBS, you should also set Boost_USE_ICU to True. Will add a note about that in build doc too.
2012-11-19 08:51:35 +00:00
Bastien Montagne
509e178f72 Definitive fix for version_ge with equal versions like "1.0.0" and "1.0".
Also fixed DEB boost version checking, own fault.
And disabled building ocio's apps, else it would go searching for an oiio lib (and we have not yet built ours) - anyway, if users want them, they can build them on their own!
2012-11-19 08:48:21 +00:00
Bastien Montagne
0aadad0896 Partial fix to version_ge (greater or equal), was not working correctly with eaqual versions, now will do with exact same versions at least (yet have to fix case like comparing 1.0 and 1.0.0).
Also refactored a bit osl/llvm/etc. stuff for DEB (so that now all osl-deps are only installed when we do have a valid llvm and want to [try to!] build osl).

And added osl/llvm/etc. code for RPM (osl does not compile under fedora currently, though :/ ).
2012-11-18 20:31:58 +00:00
Bastien Montagne
00c194718a More cleanup/deduplication. Also explicitly using gawk (so system without it should print a much comprehensive error message!).
Note: RPM-related edits not yet tested.
2012-11-18 17:47:26 +00:00
Bastien Montagne
76c901d342 Better handing of llvm version (now we can be sure to use the same for osl and blender - and the latest one available!).
And more cosmetic cleanups...
2012-11-18 17:27:29 +00:00
Bastien Montagne
03f4e7fba4 Fix own stupid mistake for threads count, and edits to user messages (mostly adding the ldconfig trick for dynamic boost libs). 2012-11-18 14:27:19 +00:00
Campbell Barton
d3d5c57c32 move source/darwin into release/darwin since these files are for osx packaging. 2012-11-18 07:41:38 +00:00
Thomas Dinges
6810813068 OSL / Windows:
* Some fixes for scons, kernel/osl compiles now. 
* Still disabled per default, as relative path to oslc.exe does not work and linking fails.
2012-11-18 03:56:53 +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
Brecht Van Lommel
0c12ea0939 Buildbot: show OS X target version in buildbot zip filename. 2012-11-17 23:00:04 +00:00
Sergey Sharybin
ecb11b43fc Install dependencies: added check for minimal version of x264
Also fixed parsing of package version with epoch
2012-11-17 17:58:15 +00:00
Bastien Montagne
f55b9b6e2f Mono-core platform seem to not output the cores field in /proc/cpuinfo :/
Also adding gawk packages (gnu awk), looks like some distro do not have that one by default!
2012-11-17 14:41:18 +00:00
Sergey Sharybin
13ea663590 Install dependencies: workaround for SHA linking issues 2012-11-17 12:59:24 +00:00
Sergey Sharybin
fd15b39438 Install dependencies: abort script if compilation of some component failed 2012-11-17 12:10:35 +00:00
Sergey Sharybin
eae0174b04 Install dependencies: disable OSL for now
It's really horror even for me to compile it on release environment,
i do not want anybody to spend time trying to support this lib in
automatic script or make it so user's are easily frustrated by some
hack added to OSL repository.

If you REALLY want to build OSL with this script, set BUILD_OSL to
truth (it's in the top of the script).
2012-11-17 11:57:10 +00:00
Sergey Sharybin
d00e6dcc3a Install dependencies: dead links should not occur 2012-11-17 11:42:37 +00:00
Sergey Sharybin
70308d51f1 Install dependencies: use OIIO 1.1.1 where SHA crap seems to be solved 2012-11-17 11:35:13 +00:00
Sergey Sharybin
b20cb61607 Made sure open OIIO does not use system's boost in cases it was compiled from sources 2012-11-17 11:28:12 +00:00
Sergey Sharybin
c98be502cd Install dependencies: made it sure llvm-3.1 or llvm-3.0 is installing
llvm-dev could be a meta-package for older version of llvm
2012-11-17 11:23:53 +00:00
Campbell Barton
38eee0104b quiet scons deprecation warnings and correct --with_filesystem --> --with-filesystem in install_deps.sh 2012-11-17 05:16:54 +00:00
Bastien Montagne
abc122205a More fixes and cleanup...
Now OSL should work for DEB-like systems with CMake (not yet tested with scones, nor fedora).
Fedora version-checking bug should be fixed.
Also simplified a bit compile_FOO funcs code.
2012-11-16 17:14:01 +00:00
Jens Verwiebe
d017f34c5d OSX/scons/osl: working but not optimally designed atm 2012-11-16 14:42:04 +00:00
Bastien Montagne
366b60c6cb First atempt to add OSL.
DEB only for now: installs needed deps (LLVM & co), downloads OSL source and compiles the lib. However, blender linking fails currently... :/
2012-11-16 12:42:01 +00:00
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