griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
53,109 Commits 1 Branch 0 Tags
bd57ec686c7ec00a9a01e30f32bbcfd3c21a41fb
Commit Graph

415 Commits

Author SHA1 Message Date
Sergey Sharybin
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
Jens Verwiebe
4acff9d6f1 OSX/scons: according to last commit, , use the version variable 2014-03-04 21:08:49 +01:00
Campbell Barton
5d74cac463 Build system: option to copy 'requests' from scons. 2014-03-05 06:43:47 +11:00
Jens Verwiebe
976fd68082 OSX/scons: copy release/site-packages for OSX ( static py for now ) 2014-03-04 18:41:19 +01:00
Campbell Barton
add6384213 Build system: use lstrip with scons 2014-03-05 04:19:55 +11:00
Campbell Barton
2c4c4a56b8 Build system copy release/site-packages for windows 2014-03-05 04:13:35 +11:00
Campbell Barton
c436c78de1 Build system support for numpy on ms-windows 2014-03-05 00:22:51 +11:00
Campbell Barton
13290d5a16 Scons: remove lcms reference 2014-03-04 12:42:17 +11:00
Martijn Berger
4903544cad On MSVC 2013 64 bit set the default to build a vista API targetted binary. 2014-02-24 23:14:12 +01:00
Jens Verwiebe
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
Jens Verwiebe
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
Sergey Sharybin
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
Campbell Barton
a6b87853cb MSVC: add more warnings to match OSX/Linux 2014-02-19 18:05:37 +11:00
Campbell Barton
d76bcf98a3 MSVC: improve warnings for scons and cmake 
Some int/float conversion warnings were disabled by buildsystems but
re-enabled by BLI_winstuff.h, the warnigns relate to conversions not
considered issues on other systems so better just quiet them.
 2014-02-19 17:37:02 +11:00
Martijn Berger
ace071f99e prepare 32bit build msvc2013 scons/buildbot 2014-02-18 23:15:40 +01:00
Jens Verwiebe
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
Martijn Berger
727ef0dfde win32 MSVC 2013 add scons support 2014-02-13 19:15:43 +01:00
Jens Verwiebe
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
Lawrence D'Oliveiro
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
Lawrence D'Oliveiro
eeefbbcc78 SCons: Simplify Endian determination 
Differential Revision: https://developer.blender.org/D252
 2014-01-31 13:20:26 +01:00
Jens Verwiebe
74ae93d1cd Scons: Fix cycles OpenCL kernelcompile by distributing util_half.h 2014-01-17 00:33:32 +01:00
Thomas Dinges
5d88f7c7db Cycles: Build SSE41 kernel per default, remove build option. This hopefully also fixes some compile errors on various systems. 2014-01-14 22:04:32 +01:00
Martijn Berger
62c8bae872 Added scons option to actually build the sse41 kernel. CMake already has it 2014-01-06 21:38:56 +01:00
Martijn Berger
cb4d32cba3 one more msvc 2013 change 2013-12-30 22:25:56 +01:00
Martijn Berger
21d587d9fc Added option to have a seperate environment for executing nvcc 
This can be used to compiler cuda kernels with Visual Studio 2010 while
the rest of blender is compiled with MSVC 12.0 / 2013
 2013-12-29 14:57:21 +01:00
Martijn Berger
42044a96e4 Basic scons support for building with Visual Studio 2013 although full MSVC 2013 support still needs more work in scons itself 2013-12-27 19:46:55 +01:00
Jens Verwiebe
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
Jens Verwiebe
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
Jens Verwiebe
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
Sergey Sharybin
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
Jens Verwiebe
f359b931f9 Better removal of \n in hash with rstrip 2013-11-29 17:27:29 +01:00
Jens Verwiebe
3bf77c34eb Fix scons compile after last commit ( unwanted new line ) 2013-11-29 17:04:29 +01:00
Sergey Sharybin
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
Brecht Van Lommel
683093b5c8 CMake/Scons Build: disable explicit linking to libstdc++ on Linux/Unix. 
It's not needed, this should happen automatically already, and if you build
against libc++ instead (as on recent FreeBSD), this would give build errors.

Ref T37477.
 2013-11-28 18:07:57 +01:00
Sergey Sharybin
764204baf2 Remove debug prints from SCons' python module 
Seems to be left by accident in rB9a79e03752509997e99094763f9183e6e5ce3637

If not, please do prints more verbose :)
 2013-11-28 19:46:23 +06:00
Sergey Sharybin
af7a2a3b6a Fix buildinfo hash for cases there's no upstream set for the branch 2013-11-28 02:25:09 +06:00
Sergey Sharybin
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
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
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
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
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
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