fa821a969e
OSX/buildsystems: unify openmp handling by changing iomp5 id to @loader_path/../Resources/lib/libiomp5.dylib
...
This makes install_name_tool usage obsolete here and also assures cmake builds can be codesigned.
IMPORTANT: update lib (darwin-9.x.universal/openmp)
2014-11-16 17:03:44 +01:00
5e6d878318
Revert "Scons/funstuff: notify when the binaries are compiled"
...
This reverts commit cdf5370159
2014-10-31 10:41:12 +01:00
cdf5370159
Scons/funstuff: notify when the binaries are compiled
2014-10-23 19:19:02 +02:00
feba2d3edf
Attempt to fix compilation error on ubuntu linux
2014-09-08 14:29:34 +06:00
a4c287ed7d
OSX/scons: Change Blender bundle datastructures + referennces to match the upcoming codesigning needs
...
- i used deprecated rules up to now which will break in OSX > 10.9.5 and 10.10 > dp4
- todo: adapt cmake due it will break with this commit
2014-08-01 00:57:17 +02:00
42615d88b6
Fix compilation error with scons when building from detached head
2014-07-10 16:23:48 +06:00
283abdf3b2
Fix compilation error with scons and older pythons
2014-06-26 16:03:52 +06:00
9b987103f6
Use specified exception mask for buildinfo
...
This way we only catch exceptions which we're intended to
and if something bad happens (like missing import due to
refactor or so) we'll see them instantly.
2014-06-23 15:46:41 +06:00
9b83ceb6f2
Fix scons building in case git is not available.
...
Not so nice to use try/except here, but simplest solution to avoid failing in case
git commands fail for some reason...
2014-06-20 18:13:20 +02:00
2dce13d213
Python: Remove deprecated uses of os.popen
...
T40415 by Lawrence D'Oliveiro
2014-06-20 02:00:46 +10:00
38d6841687
Need to consider blender-v* a release branch, not just blender-
...
This is because of blender-tiles branch we've got..
2014-06-16 15:16:18 +06:00
be553273b8
Make blender-* branches not being displayed on the splash
2014-06-16 14:58:56 +06:00
c590b2a4b3
OSX: Set Blender.app and Blenderplayer.app creation and modification date to compiletime, else we would always have the time from checkout here
2014-06-02 14:20:07 +02:00
d1009bdad5
Windows: Disable Numpy for now, we miss the libs for Python 3.4.
...
Also make the flag WITH_BF_PYTHON_INSTALL_NUMPY flag actually work on Windows.
2014-04-30 16:49:49 +02:00
8ff74bed9b
Scons/cycles: fix header distribution for geom
2014-04-04 13:07:32 +02:00
43b5f0af2d
tweaks to buildinfo
...
We wouldn't really have release branches, building will happen
from annotated tags.
Made it so building tag revision equals to a master branch.
2014-03-07 18:27:16 +06:00
4acff9d6f1
OSX/scons: according to last commit, , use the version variable
2014-03-04 21:08:49 +01:00
5d74cac463
Build system: option to copy 'requests' from scons.
2014-03-05 06:43:47 +11:00
976fd68082
OSX/scons: copy release/site-packages for OSX ( static py for now )
2014-03-04 18:41:19 +01:00
add6384213
Build system: use lstrip with scons
2014-03-05 04:19:55 +11:00
2c4c4a56b8
Build system copy release/site-packages for windows
2014-03-05 04:13:35 +11:00
c436c78de1
Build system support for numpy on ms-windows
2014-03-05 00:22:51 +11:00
9e924c8ffe
OSX/scons: cp needs the targetdir to be created ( ditto does it itself ),
...
changing the order of commands let us use cp again
2014-02-24 12:09:55 +01:00
056d86ec83
OSX/scons: Fix language menu not showing up in prefs:
...
The languages file was not installed to locale due it has
no extension, using ditto now
2014-02-23 23:17:30 +01:00
28f3cc3eb7
Fixes for buildinfo hash/branch detection
...
Branch name and hash didn't work properly when having disconnected
HEAD or when having current HEAD below upstream.
2014-02-20 21:43:30 +06:00
c987bcc416
OSX: more futurework for clang-openmp:
...
- moved assumed location of omp lib to blender libs
- prepared libiomp5 to link out of the box with cmake
- changed according in scons
- introduced a local var C_VENDOR, cause Apple clang 3.4 may not include omp support yet
- added a linklibs for msgfmt ( may not be needed for other than OSX )
2014-02-18 17:18:35 +01:00
a84bcea070
OSX/scons: allow for compiling with clang-openmp-3.4
...
See: http://clang-omp.github.io
+ fix a longstanding bad include in darwin-config
2014-02-09 18:03:13 +01:00
cb0a5adc56
SCons: cleaner determination of 32-bit/64-bit builds
...
Try not to be x86-centric, remove unneeded blenderdeps variable.
Reviewed By: brecht
Differential Revision: https://developer.blender.org/D240
2014-02-04 19:01:10 +01:00
74ae93d1cd
Scons: Fix cycles OpenCL kernelcompile by distributing util_half.h
2014-01-17 00:33:32 +01:00
901ebbd94a
Scons: as requested by Ideasman, make MACOSX_COMPILER -> C_COMPILER_ID,
...
leave env set for OSX exclusive for now”
2013-12-08 15:35:21 +01:00
c167d7b79a
OSX/scons: Introduce a new env var 'MACOSX_COMPILER'
...
This is needed to resolve the real used compiler from the compatibility shim’S or symlinks.
Also set the real CCVERSION as scons CCVERSION would only read the default one, which
is not useful for OSX
2013-12-06 17:06:51 +01:00
df2f604af2
OSX/scons: fix misdesigned version detection of compiler ( todo: do with submodule ), fix a compiler warning with clang < 5”
2013-12-04 23:15:29 +01:00
6a6c7b10de
Correction to previous commit
...
Better just use "strip", to be sure \r\n is also stripped.
This also corresponds to what happens with popen() results.
2013-11-29 22:41:01 +06:00
f359b931f9
Better removal of \n in hash with rstrip
2013-11-29 17:27:29 +01:00
3bf77c34eb
Fix scons compile after last commit ( unwanted new line )
2013-11-29 17:04:29 +01:00
5f2400414a
Buildinfo: suppress error prints when building local branches
...
Before this console output contained messages about branch is not
configured to use any upstream branch which is not useful information
at all.
2013-11-29 18:44:45 +06:00
af7a2a3b6a
Fix buildinfo hash for cases there's no upstream set for the branch
2013-11-28 02:25:09 +06:00
551f3eef74
Show hash from latest pushed commit in buildinfo
...
Before this hash of latest local commit was used,
which is not so much useful since nobody can access
that commit hash.
2013-11-25 16:25:35 +06:00
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
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
c239baa0ba
OSX/scons: small reorder and spelling
2013-11-16 22:13:51 +01:00
a05e90f5fc
OSX/scons: fix msgfmt binary linking and locale files distribution
2013-11-16 21:46:55 +01:00
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
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
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
e572a433a8
OSX/scons: make gcc version detection more futureproof
2013-11-07 15:05:59 +00:00
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
4ef6f82a10
OSX/codesigning: add the signing rules used for releases
2013-10-28 17:08:07 +00:00
01da2c0e53
fix [ #37195 ] particles crash with viewport render
2013-10-26 22:38:12 +00:00
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
