bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity
52,325 Commits 2 Branches 0 Tags 745 MiB
a84bcea070
Commit Graph

957 Commits

Author SHA1 Message Date
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
Campbell Barton
2b4c68b902 CMake Build: option to compile without opennl/superlu. 2013-11-25 15:36:19 +11:00
Sergey Sharybin
50fbebe0a4 Buildinfo fixes 
- Use -M suffix if working tree does have uncommitted
  modifications.
- Local commits are considered local changes as well
 2013-11-19 22:22:21 +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
Sergey Sharybin
46684d1ad2 Initial tweaks to buildbot configuration 
Pretty much sure more tweaks would be needed,
but need this to get started.
 2013-11-19 15:01:00 +06:00
Jens Verwiebe
94416a493c OSX/scons: using ditto autocreates dirs, spares 2 steps of mkdir iterating over .mo files, faster bundling 2013-11-17 15:16:47 +01:00
Jens Verwiebe
c239baa0ba OSX/scons: small reorder and spelling 2013-11-16 22:13:51 +01:00
Jens Verwiebe
a05e90f5fc OSX/scons: fix msgfmt binary linking and locale files distribution 2013-11-16 21:46:55 +01:00
Sergey Sharybin
f2faebe9cf Fix compilation error with SCons when using BUILDINFO and git is not found 
Fallback to "no buildinfo" mode in this case.
 2013-11-17 00:45:46 +06:00
Sergey Sharybin
09ecfc318c Fixes for buildinfo of exported source tree 
- Better to set branch/hash to "unknown" so
  it's clear build is done from exported tree.
- SCons used to reference undefined variable.
 2013-11-17 00:02:27 +06:00
Sergey Sharybin
3e87abb4be Remove nested check for .git folder exists in buildinfo.cmake 
Title says it all :)

Pointer by IRIE Shinsuke in the ML, thanks!
 2013-11-16 19:40:26 +06:00
Sergey Sharybin
927dea436e Further tweaks to buildinfo 
Summary:
Old idea with changes since previous release tag
didn't work good enough. In most of the cases tag
was done in a branch hence not actually reachable
from the master branch.

Now change since release is gone, and date of
the latest commit is used instead.

The date is displayed in format YYYY-MM-DD HH:mm
in the splash.

New bpy.app fields:

- build_commit_timestamp is an unix timestamp of
  the commit blender was build from.
- build_commit_date is a date of that commit.
- build_commit_time is a time of that commit.

Reviewers: campbellbarton

Differential Revision: http://developer.blender.org/D5
 2013-11-15 18:05:27 +06:00
Sergey Sharybin
89e5c87538 Remove debug-only print from cmake macros 
Left it there by an accident.
 2013-11-15 12:19:47 +06:00
Sergey Sharybin
ac6d91b939 Be ready for changes in bf-translations repository 
Made it so if there's release/datafiles/locale/po
folder, then all the .po files will be converted
to .mo at blender compile time and installed to
an appropriate location.

Uses small own implementation msgfmt which is
based on msgfmt.py from Python project, but also
supports contexts.

There's no functional changes for until we've
switched to use source .po files instead of
pre-compiled .mo.

P.S. Well, there's one change which is msgfmt.cc
     being compiled even if it's not used, but
     would rather not clutter code with checks
     since pretty soon we'll use this program
     anyway.
 2013-11-08 20:44:48 +00:00
Jens Verwiebe
a3ec6edc05 OSX/scons: make MACOSX_SDK_CHECK a local var is sconstruct and remove from env, also fix a longstanding misuse of MACOSX_SDK_CHECK in ceres, use MACOSX_SDK instead 2013-11-08 13:44:10 +00: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
e572a433a8 OSX/scons: make gcc version detection more futureproof 2013-11-07 15:05:59 +00:00
Jens Verwiebe
463b65bf0a OSX/scons: ARCH_FLAGS where not prperly added to CPPFLAGS 2013-11-07 13:56:40 +00:00
Jens Verwiebe
ec470d731e OSX/scons: for completeness, added WITH_BF_OPENMP switch 2013-11-06 23:19:01 +00:00
Jens Verwiebe
f392ebd77e OSX/scons: huge change, now you can set a user-config.py just with the desired variables changed 2013-11-06 20:59:04 +00:00
Jens Verwiebe
480d4317de OSX/scons: remove obsolete compile flag 2013-11-06 15:46:57 +00:00
Jens Verwiebe
c81c0859ee OSX/scons: remove obsolete compile flags and silence warnings same time 2013-11-06 15:42:01 +00:00
Jens Verwiebe
5557332488 OSX/scons: remove another outdated conditional 2013-11-06 15:37:14 +00:00
Jens Verwiebe
3e6c369888 OSX/scons: remove local MAC_MIN_VERS var and use the always identical MACOSX_DEPLOYMENT_TARGET instead 2013-11-06 14:03:51 +00:00
Jens Verwiebe
96aaea414b OSX/scons: more cleanup of redundant vars, preparation to remove local vars to not need to cp whole config as user-config later 2013-11-06 13:56: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
864920ee41 OSX/scons: make 10.5 our lowest env and remove older conditionals 2013-11-05 18:17:02 +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
Jens Verwiebe
78d8a14174 OSX: complety remove the cocoa options, definitions and conditionals now 2013-11-05 15:37:59 +00:00
Jens Verwiebe
d278b59032 OSX/scons: remove obsolete cocoa conditionals from config 2013-11-05 14:38:18 +00:00
Jens Verwiebe
52588bf014 OSX: preparing carbon and quicktime dropping, make QTKit also default for i386 2013-11-05 12:52:51 +00:00
Jens Verwiebe
dd697f8bd4 OSX: preparing carbon and quicktime dropping, make 64bit and QTKit default, make 10.8sdk default for xcode >= 4.4 2013-11-05 12:48:32 +00:00
Sergey Sharybin
2010c6ad6c Made buildinfo aware of builds from GIT 
- Use commit number since last annotated tag as a
  revision number replacement. It'll eb followed
  by 'M' symbol if there're local modification in
  the source tree.

- Commit short SHA1 is included. Helps getting
  information about commit used to build blender
  with much faster.

- If build is not done from master branch, this also
  will be noticed in the splash screen.

This commit also replaces revision stored in the
files with git-specific fields (change and hash).
This is kind of breaks compatibility, meaning
files which were saved before this change wouldn't
display any information about which revision they
were saved with. When we'll finally switch to git,
we'll see proper hash and change number since
previous release in the files, for until then
svn version will be used as a change number and
hash will be empty.

Not a huge deal, since this field was only used
by developers to help torubleshooting things and
isn't needed for blender itself.

Some additional tweaks are probably needed :)
 2013-11-04 13:21:39 +00:00
Bastien Montagne
bdc3e1e5de Minor update to r60953. 2013-10-31 13:11:01 +00:00
Jens Verwiebe
4ef6f82a10 OSX/codesigning: add the signing rules used for releases 2013-10-28 17:08:07 +00:00
Bastien Montagne
e293a0b153 Update OpenEXR to 2.0.1, this seems to fix some issues. 
I *really* have to go back over all our patches in this script and try to port them back in respective projects!
 2013-10-27 08:19:08 +00:00
Campbell Barton
01da2c0e53 fix [#37195] particles crash with viewport render 2013-10-26 22:38:12 +00:00
Campbell Barton
93edbf3510 add check for cmake that source files are not included multiple times 2013-10-25 06:21:38 +00:00
Campbell Barton
b6db417ee4 code cleanup: use const's for vector args. 2013-10-12 02:19:37 +00:00
Dalai Felinto
6549c1bf29 scons file for OIIO (needed for psd) 
based on patch by Shinsuke Irie

note: scons is not working for me at the moment so I did not test this
patch. It should work fine though.
 2013-10-11 16:38:31 +00:00
Bastien Montagne
58af8d4387 Fix for conf instructions for scons... 2013-10-07 07:42:00 +00:00
Jens Verwiebe
f418097bc6 OSX/Scons/OMP: 1. Allow for compile with gnu gcc 4.8.1, 2. fix compiling with sdk > 10.7 by using libgomp dynamic, which includes proper errorhandling vs. static. Before xtra linking to system libstdc++.6.dylib was needed, which then caused incompatibilities 2013-09-28 18:42:14 +00:00
Bastien Montagne
60e1fc70d2 install_deps.sh fix: add explicit OGG lib handling, we need it to pass correct values for ffmpeg libraries (at least for static builds). 
I’m not close to understand why this has worked fine until today... :/

Only tested with Debian, but I would not expect any issue with Fedora/Suse/Arch, this is a quite simple change!
 2013-09-27 13:56:16 +00:00
Campbell Barton
124f32a206 rename LLVM_LIB_DIR to LLVM_LIBPATH to match other cmake vars. 2013-09-25 16:31:54 +00:00
Campbell Barton
203c6effd5 code cleanup: quiet rna warnings, remove remove_strict_flags() for cmake/rna. 
also set_source_files_properties() wasn't working for rna_*_gen.c files,
set dna.c and generated data files with generated property too.
 2013-09-20 06:35:28 +00:00
Bastien Montagne
67ae8cfcf5 Fix own stupid error in previous commit... :/ 2013-09-19 20:27:26 +00:00
Bastien Montagne
0be2e21e2d Potential fix for install_deps.sh OSL build issues reported by users: run ldconfig immediately after lib compile (looks like OSL compile process needs boost libs...). 2013-09-19 11:25:47 +00:00
Bastien Montagne
b35f1eaa84 Fix py/numpy build under Suse, and minor other fixes/enhancements. 
Also switch to python3.3.2
 2013-09-17 11:01:52 +00:00
Sergey Sharybin
4478197ef6 Somplify one-liner for CPU cores detection and make it aware of multi-CPU computers 2013-09-17 09:17:10 +00:00
Bastien Montagne
31b84c9c28 Grrr, forgot to update getopt command for updated args... 2013-09-16 15:48:37 +00:00
Bastien Montagne
01747a9cf0 Add --required-numpy to force compilation of both py3.3 and numpy1.7 in case you really need numpy and 1.7 is not available! 2013-09-16 15:22:10 +00:00
Daniel Salazar
0732375d35 Making install_deps.sh correctly see hyperthreading 2013-09-16 14:38:33 +00:00
Bastien Montagne
fa1683e713 Install_deps.sh updates: 
* Raise OpenCOLLADA version to 18da7f4109a8eafaa290a33f5550501cc4c8bae8 as requested by Gaia.
* Made OSL build/install ON by default (no more an experimental feature!).
* Use default LLVM version under Debian (specifying a version does not work with OSL when you have more that one installed :( ).
 2013-09-16 13:02:49 +00:00
Jens Verwiebe
13263541ec OSX/scons: take xcode-select path into account, to work well with different xcode versions 2013-09-13 15:41:18 +00:00
Jens Verwiebe
97e823488c OSX/Scons/clang: restrict the ftemplate fix to clang only 2013-09-10 12:31:21 +00:00
Jens Verwiebe
d638c4c064 OSX/Scons/clang: compilefix for libmv, as discussed with brech just globally 2013-09-09 17:26:09 +00:00
Campbell Barton
648f2102d8 update bmesh doxy docs, remove double-promotion warnings in remove-strict-flags cmake macro. 2013-09-08 06:55:58 +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
6d87f2749d remove freebsd7 config. its fairly old and not maintained. 2013-09-04 23:44:41 +00:00
Campbell Barton
90b9fa3608 fix [#36459] Official blenderplayer can not go fullscreen on Linux 
use modified patch from Alex Fraser (z0r)
 2013-09-04 23:43:25 +00:00
Campbell Barton
427317d8d8 use CMAKE_DL_LIBS rather then linking libdl directly. 
added to cycles standalone too.
 2013-08-30 20:26:57 +00:00
Campbell Barton
f75711db7f cmake: set python, llvm and osl libs as advanced. 2013-08-28 04:32:39 +00:00
Brecht Van Lommel
11cfc97e29 Fix cmake Inkscape auto generate of SVG on OS X giving an error popup, the binary 
that is found by find_program is a shim that doesn't take command line arguments.
 2013-08-26 14:13:04 +00:00
Bastien Montagne
e61c3beb48 Remove (comment out) auto-generating png form svg (r59382) in CMake, handy but gives nasty "false changes" in svn. Let's try not to forget to update PNGs when needed, then! 2013-08-26 12:16:23 +00:00
Bastien Montagne
29c8d3e20d Automatically re-generate png icon files from svg ones (CMake only for now)... Expects Inkscape program. 2013-08-22 13:51:00 +00:00
Bastien Montagne
4c38db307e Fix [#36534] Errors in install_deps.sh script when running on Arch Linux 
Patch provided by Darren Beck, thanks!
 2013-08-22 06:05:40 +00:00
Sergey Sharybin
db01d290e7 Compilation error fix when using scons 
OpenEXR libraries shall go after OpenImageIO,
otherwise it'll fail to find symbols needed
for OIIO.
 2013-08-15 12:05:42 +00:00
Campbell Barton
a62163ada3 remove unused auto-key struct-member from uiAfterFunc, add compiler defines to cppcheck utility script. 2013-08-10 23:27:42 +00:00
Bastien Montagne
65b4f41342 Linux install_deps: update OpenCOLLADA to 828b60384552b83e55d2af7055f07d2c40b4d3f4 repo UID. 2013-08-10 11:06:46 +00:00
Campbell Barton
7cb1415530 pass compiler defines such as __FLT_MIN__ to smatch and sparse (they fail without them). 2013-08-08 01:53:02 +00:00
Campbell Barton
02ba328ca8 clang/cmake - quiet warnings for external libs and reference moto as a system include. 2013-07-15 08:26:16 +00:00
Campbell Barton
6ebfdd8dc3 remove reference to wrong python version in comments & pedantic style edit. 2013-07-10 09:40:49 +00:00
Bastien Montagne
2c506fd70c Patch [#35897] install_deps: add OpenEXR to ldconfig by Gavin Howard, thanks. 2013-06-30 16:20:59 +00:00
Bastien Montagne
ba2ee5f5f3 Update osl magic number when updating version ;) 2013-06-26 12:37:48 +00:00
Thomas Dinges
d5fd3b3688 Install Deps script: 
* Use recent OSL 1.3.2 release.
 2013-06-26 11:30:37 +00:00
Campbell Barton
a5b78bb6bd replace use of 'a.find(b) != -1' --> 'b in a' 2013-06-24 05:55:05 +00:00
Jürgen Herrmann
86bebb3380 Fix for #35851: 
- Make scons work for non western CL.exe.
 2013-06-24 05:45:03 +00:00
Jürgen Herrmann
d7b99389ba prevent cycles sm_35 kernel to be built on win32 with vs2012 because of ptxas crashes. 
Workaround to keep buildbot running.
I filed a bug report to NVidia, will remove this as soon as the problem is fixed.
 2013-06-23 19:07:46 +00:00
Sergey Sharybin
4acd963860 Switch buildbot to use OpenEXR-2.0 2013-06-23 11:31:54 +00:00
Brecht Van Lommel
2df82a2a2b Code cleanup: fix some vs2012 compiler warnings 2013-06-21 12:33:19 +00:00
Daniel Salazar
b2e01fa6bb Updating suse packman repo url, name and alias to go in line with what suse does right now. At least this should avoid duplicate packman repos on 12.3 2013-06-20 21:36:30 +00:00
Bastien Montagne
6a269e2a8e Install_deps.sh: ask suse users whether they want to install packman or not (can be already installed/enabled from a different URL, Suse repositories management is to complex to be handled automatically at this point). 2013-06-20 19:19:11 +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
eae9519f9d VS 2012 x86 SCons update. 2013-06-18 20:11:58 +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
Campbell Barton
970e9123b4 cmake: remove set_lib_path macro 2013-06-17 18:15:56 +00:00
Thomas Dinges
91d7df12ee CMake / vc2010: 
* Remove vc2010 support from cmake. 

There is some "if(MSVC10)" left in extern - ceres, but will leave that for Sergey. :)
 2013-06-17 18:00:38 +00:00
Nathan Letwory
9dd639f169 Only printing errors. 
(No news is good news).
 2013-06-16 20:36:34 +00:00
Bastien Montagne
8e5cd99e0b Fix for building Blender with OSL, and no OpenEXR headers in standard paths (like /usr/include/OpenEXR). 
As OSL headers mix #include <OpenEXR/foo.h> and #include <foo.h>, we need both /path/to/openexr/include and /path/to/openexr/include/OpenEXR include paths... :/

Issue investigated by doug65536 on IRC, thanks.
 2013-06-16 18:59:50 +00:00
Nathan Letwory
fc4f6a7bad Set up OurSpawn for MinGW compile environment on Windows. 2013-06-15 21:20:06 +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
Bastien Montagne
0794c2722d Add USE_PYTHON=OFF and USE_OCIO=OFF to OIIO compilation (we do not need either of those). 2013-06-15 08:56:04 +00:00
Campbell Barton
412c043474 Python script auto-execution changes: 
- script execution is off by default

- if a blend file attempts to execute a script
  this shows a message in the header with the action
  that was suppressed (script/driver/game-autostart) and 2 buttons to either reload the file trusted, or to ignore the message.

- the file selector will always default to use the trust setting in the user preferences,
  but reloading an open file will keep using the current setting (whatever was set before or set on the command-line).

- added SCons setting WITH_BF_PYTHON_SECURITY, this sets the default state for the user prefereces not to trust blend files on load.
  ... this option was in CMake before, but always off, now its enabled by default for SCons and CMake, and forced on in CMake for now.
 2013-06-10 00:42:16 +00:00