Commit Graph

207 Commits

Author SHA1 Message Date
Campbell Barton
45721499b3 Correct recent makefile OSX check 2018-08-21 20:27:36 +10:00
Campbell Barton
15acbbdc1e Merge branch 'master' into blender2.8 2018-08-21 19:25:49 +10:00
Campbell Barton
122ef17ab2 GNUmakefile: correct blender binary for macOS 2018-08-21 19:20:01 +10:00
Aaron Carlisle
12acf1e4f8 Cleanup: Update some links to new wiki 2018-08-13 21:55:30 -04:00
Aaron Carlisle
57e6359920 PyDoc: Remove hack to rename main doc from 'contents' to 'index' 2018-08-13 20:51:33 -04:00
Campbell Barton
5e2804a40b Merge branch 'master' into blender2.8 2018-07-13 18:20:10 +02:00
Campbell Barton
87535dd73d Makefile: add note about environment vars 2018-07-13 18:16:05 +02:00
Dalai Felinto
dfd82b18df Merge remote-tracking branch 'origin/master' into blender2.8 2018-04-25 09:31:25 +02:00
Dalai Felinto
5285de16f3 Fix string comparison in GNUMakefile for linux systems 2018-04-25 09:30:55 +02:00
Campbell Barton
24bde1ca43 Add "make icons_geom" convenience target
Generates icons from the blend file in lib.
2018-04-24 12:09:31 +02:00
6b3d85fa51 Build: auto detection of libraries built by "make deps" on Linux.
Use the libraries if they exist in ../lib/linux_x86_64 or similar, so
that you can run "make deps && make full" to get a full static build.
Note that install_deps.sh is still the only officially supported way to
build Blender dependencies on Linux, but this may be useful to some.

Differential Revision: https://developer.blender.org/D2980
2018-01-11 22:30:31 +01:00
Campbell Barton
04e8a09662 GNUmakefile: add back 'git pull'
Seems this was removed by accident.
2017-09-29 19:02:20 +10:00
c10ac1bb5c macOS: officially upgrade to 10.9 libraries from lib/darwin.
This removes a bunch of code that is no longer needed, and running
"make update" will now automatically download the new libraries.

Differential Revision: https://developer.blender.org/D2861
2017-09-28 20:53:06 +02:00
Campbell Barton
05be2a8c45 Cleanup: de-duplicate makefile OS checks 2017-08-10 22:37:35 +10:00
3c14f02eac Build: add scripts to build dependencies for Windows and macOS.
Note these are intended for platform maintainers, we do not intend to
support users making their own builds with these. For that precompiled
libraries from lib/ should be used.

Implemented by Martijn Berger, Ray Molenkamp and Brecht Van Lommel.

Differential Revision: https://developer.blender.org/D2753
2017-08-07 17:54:26 +02:00
Campbell Barton
b796ce0f26 CMake: Only set CMAKE_BUILD_TYPE_INIT when not set
Convenience makefile now uses CMAKE_BUILD_TYPE_INIT,
this means you can change the build type of an existing build
and it won't be overwritten when running `make`.

Useful if you want to add debug info to a release build for profiling.
2017-06-27 09:50:35 +10:00
Campbell Barton
5be8adf8c0 Makefile: set tab width=4 2017-03-11 20:48:12 +11:00
Campbell Barton
7faf76a618 Cleanup: line length 2016-07-15 01:26:26 +10:00
Campbell Barton
79d69bb9e3 Makefile: Use hidden FORCE target 2016-05-21 05:48:10 +10:00
d09a372acb Fix T48078: incorrect OS X command for retrieving number of CPUs on in Makefile. 2016-04-09 00:25:18 +02:00
Campbell Barton
236fabcc41 Minor edits to sync make.bat & makefile 2016-01-04 20:42:00 +11:00
Campbell Barton
e4d016ce48 Makefile: show build dir when configuring 2015-09-22 00:16:53 +10:00
Campbell Barton
81b37f5e92 CMake: use functions instead of macros
Reduces issues with vars leaking into the parent scope.
2015-06-17 09:38:24 +10:00
Campbell Barton
208a917b73 CMake: note env var 2015-06-14 10:05:03 +10:00
Campbell Barton
424e5be046 Makefile support for using NPROCS as an env var 2015-06-14 08:27:29 +10:00
Campbell Barton
f167f434d9 Support alternate python command 2015-06-11 04:14:43 +10:00
Campbell Barton
0737f59f62 tweaks to packman build
remove --asroot arg to makepkg
2015-03-24 07:49:17 +11:00
Campbell Barton
0025d90b98 Cleanup: use tabs 2015-03-21 16:40:43 +11:00
Campbell Barton
93c4ba7b70 Force phony targets to build (even if file exists)
This is a convenience makefile only,
files if they exist by accident shouldn't ever be used.
2014-12-20 02:15:14 +01:00
Campbell Barton
4e4ef13734 CMake: add 'full' to 'make help' 2014-11-14 00:19:53 +01:00
Campbell Barton
4b106ac1c9 Add 'help_features' make target (prints WITH_*** options) 2014-11-13 19:41:33 +01:00
Campbell Barton
b1ca5b30cf CMake: add 'make full' target 2014-11-13 19:41:33 +01:00
Campbell Barton
13c5b0d546 Utility script to create release archive
- only include files known to git.
- includes all submodules.
- version extracted from BKE_blender.h for naming.
- MD5 checksum generated.
- 'make tbz' convenience target.

Script by Dan McGrath with own minor edits.
2014-09-16 11:44:00 +10:00
Campbell Barton
e5adeed40b Makefile: add 'update' convenience target 2014-09-15 14:11:14 +10:00
Campbell Barton
2dc139cd89 Source Checkers: Include intern/ libs we maintain in spelling checks 2014-07-25 15:17:29 +10:00
Campbell Barton
0eb060c7b4 Move tests into tests/ top-level dir 2014-06-18 22:03:46 +10:00
Jens Verwiebe
75135cfa9b OSX: fix T40413, automatic threads for compile throw wrong output 2014-05-29 11:15:32 +02:00
Campbell Barton
06a05e4dae BSD's was using too many build threads for convenience makefile
D431 from Aaron Peterson
2014-05-27 09:47:11 +10:00
Lawrence D'Oliveiro
49e21f6978 Found another place where nproc can be used
/proc/cpuinfo is a Linux-specific thing. Using GNU [[ http://www.gnu.org/software/coreutils/manual/html_node/nproc-invocation.html | nproc ]] should be more portable.

Reviewers: mont29

Reviewed By: mont29

Differential Revision: https://developer.blender.org/D377
2014-03-02 10:29:40 +01:00
Thomas Dinges
21264f89ac Cycles: Add a cmake config to easily compile Cycles Standalone.
On Linux/Mac OS X, simply type "make cycles" inside the Blender source directory, to get a standalone build of the engine.

Reviewed by: Brecht
Differential Revision: https://developer.blender.org/D228
2014-01-20 20:44:39 +01:00
Campbell Barton
4c9a3a53bd UI Icons: store icons in git as uncompressed pixmaps (D196)
this allows for updating icons without committing a new PNG each time
(which is inefficient with git). The data files are converted into a
PNG at builds time and used just as they were before.
2014-01-14 00:14:03 +11:00
Campbell Barton
64fc94e93f Code Cleanup: osl style 2014-01-06 13:58:33 +11:00
Campbell Barton
c3788b60f4 Convenience Makefile: spaces in the build path would fail still. 2013-11-17 21:16:39 +11:00
Campbell Barton
4882cb6f28 convenience makefile: support spaces in paths
also update for new source/tools paths.
2013-11-17 18:54:03 +11:00
Campbell Barton
825b0e8bc4 support for paths with spaces in makefile 2013-11-15 18:59:50 +11:00
Campbell Barton
b21b24573d lots of operator descriptions were incorrectly copy/pasted.
update some descriptions, others were removed and operators tagged as internal.

add a script to detect duplicate operator descriptions.
2013-09-30 05:50:41 +00:00
Campbell Barton
d90d25ec78 add icons utility make target. 2013-08-27 10:03:37 +00:00
Bastien Montagne
df059ac4c0 Fix a mismatch in help message (check_spelling_osl obviously checks OLS, and check_spelling_c, C code! :P ) 2013-05-14 14:37:51 +00:00
Campbell Barton
c7e2a31bf2 correct too-big allocation in mesh beautify. 2013-04-01 07:57:33 +00:00
Campbell Barton
68e9fdeb81 code cleanup: comment unused members of bmesh operator slots and some osl style edits. 2012-11-20 14:31:58 +00:00
Campbell Barton
cf6994b910 code cleanup: spelling,
also initialize bmesh-bevel settings struct to zero to avoid possible uninitialized memory later.
2012-11-12 07:33:01 +00:00
Campbell Barton
fa06aab433 code cleanup: add check spelling osl 2012-10-17 01:53:29 +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
Campbell Barton
57004cfb5a style cleanup:
also add helper makefile targets:
* tbz - makes a tar.bz2 of an svn export
* test_style_qtc - outputs style checks in qtc task format.
2012-10-10 23:44:07 +00:00
Campbell Barton
1e2f475512 added simple checker for array sizes, uses clang to parse C/C++,
Warns if an array is passed to a function where the array is declared larger, eg float[2] argument is passed function defined as float[3], (or a greater size).

Existing free static checkers dont do this from what I can tell.
2012-10-06 12:36:21 +00:00
Campbell Barton
c2a1dcf621 fix for error in recent commit (made function static that shouldn't have been), add extra gcc warnings to cmake. 2012-09-16 01:35:00 +00:00
Campbell Barton
b31a88ccf0 add checking target check_smatch 2012-09-14 05:08:48 +00:00
Campbell Barton
121fd266b0 for the default make/cmake wrapper, use ../build_os rather then ../build/os 2012-08-15 22:59:23 +00:00
Bastien Montagne
558721ab59 More spell checking. 2012-07-04 15:04:38 +00:00
Campbell Barton
9978f97b12 cmake edits
- only show mingw option when building with mingw
- always run cmake configure with convenience build targets so failed configurations stop re-configuring.
- disable WITH_GHOST_XDND in 'make lite'
2012-05-27 10:03:13 +00:00
Campbell Barton
4f2c83f573 style cleanup: imbuf & icons 2012-05-13 22:05:51 +00:00
Campbell Barton
c6051ea87b replace python3 command with python3.2, python3 isnt available on ubuntu. 2012-05-01 20:45:16 +00:00
Campbell Barton
4cfa761951 source code style checker to, (similar to pythons pep8 checker)
currently checks for brace placement and some whitespace use.

can be accessed with:
  make test_style
or...
  source/tools/check_style_c.py  source/blender

also style cleanup on bmo_primitives.c
2012-05-01 20:36:39 +00:00
Campbell Barton
ea13ec1699 Spelling Cleanup 2012-03-01 12:20:18 +00:00
Campbell Barton
d2cab3e8b0 move bmesh wiki docs into bmesh header and update doxygen.
also have doxygen ignore *.py files and fix some warnings.
2012-02-27 20:27:19 +00:00
Campbell Barton
1f74789d12 Correct mathutils documentation, also correct some python spelling errors and add makefile target check_spelling 2012-02-08 04:37:37 +00:00
Campbell Barton
28fb329419 minor changes
- avoid duplicate image enum definitions.
- move image UI format & bw/rgb/rgba onto 1 line.
- add 'make config' convenience target to run ccmake or cmake-gui
2011-11-23 17:14:29 +00:00
Campbell Barton
64ca81ef0f allow passing vars to cmake from our makefile 2011-11-13 14:29:17 +00:00
Campbell Barton
2a7ade9de2 remove po/ since the workflow for translations uses branches which isnt that useful to have within blenders source dir.
For now treat translations as binary files - just access from 'release/datafiles/locale'
2011-11-05 14:26:18 +00:00
Campbell Barton
885d1e6ed3 update path loactions for external po/ 2011-11-05 13:21:03 +00:00
Campbell Barton
057bf2a02b misc doc edits
- remove recently added sphinx reference workaround.
- tested doxygen, correct some warnings, set tab width and added pymathutils group.
- added convenience target 'make doc_doxy'
2011-11-05 01:48:10 +00:00
Bastien Montagne
c49cdf5eec Another set of UI messages fixes and tweaks! No functional changes. 2011-10-23 19:54:06 +00:00
Guillermo S. Romero
6105199668 Remove the svn:keywords property. 2011-10-23 18:38:16 +00:00
Campbell Barton
4a04f72069 remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n 2011-10-23 17:52:20 +00:00
Campbell Barton
617d3cb852 pass -noaudio when running blender for various utilities - doc-gen and tests. 2011-10-19 21:55:27 +00:00
Campbell Barton
a575abf37e allow passing BUILD_DIR to convenience makefile as an argument incase you dont want to build in the default path. 2011-10-16 13:10:14 +00:00
Campbell Barton
92bc72dca1 convenience targets for make doc_py, doc_dna, doc_man 2011-10-16 11:09:15 +00:00
Campbell Barton
febcb91b82 - add template for defining custom driver functions.
- comment unused assignments.
2011-10-15 07:19:34 +00:00
Campbell Barton
c40b976ea8 py docs - gpu module wasn't included in docs.
also added convenience target to build sphinx api docs:
 make doc_py
2011-10-13 06:59:09 +00:00
Campbell Barton
265c113820 fix for crash generating messages.txt, I wasn't getting this crash because I had 'WITH_PYTHON_SAFETY' enabled which was using different iterators (which dont crash), now there on by default.
made headless and no-python configurations work again and added --factory-startup to doc building command.
2011-09-30 07:47:45 +00:00
Campbell Barton
0af633a36c move message.txt generator out of wm.py (which was loaded with blender always), into it own py script which runs on its own, also added this to 'make translations' target. 2011-09-20 17:44:45 +00:00
Campbell Barton
8cf8fd7326 - translation scripts now run with py3.x
- added convenience make target 'make translations'
- some MEM_malloc strings were not unique enough, expanded them.
2011-09-20 17:07:33 +00:00
Campbell Barton
78d4260144 committed change to transforms THRESHOLD by accident, also update convenience makefile to regenerate real makefiles before static checking. 2011-09-20 10:15:57 +00:00
Campbell Barton
0849eaebbf new convenience makefile targets for static source code cheching: check_splint/check_sparse/check_cppcheck 2011-09-16 06:58:20 +00:00
Campbell Barton
6b1fd66e3b turns out recent commit made 'make' on its own fail. 2011-08-16 13:45:17 +00:00
Campbell Barton
b7302f9d5a Convenience targets for project files:
Project Files for IDE's
  * project_qtcreator - QtCreator Project Files
  * project_netbeans  - NetBeans Project Files
  * project_eclipse   - Eclipse CDT4 Project Files
2011-08-16 10:34:52 +00:00
Campbell Barton
989f67f522 'make help' message for the convenience makefile which lists optional targets. 2011-08-16 10:01:19 +00:00
Campbell Barton
93f135cfda added cmake configureation presets, so on *nix systems you can do...
# minal blender with debug info
 make debug lite

 # blender with no ui
 make headless

 # blender as a python module
 make bpy
2011-08-16 09:36:15 +00:00
Campbell Barton
74219d2704 patch [#28031] Minor typo in Blenlib
from Scott Giese (sgiese)
2011-07-20 06:05:47 +00:00
Campbell Barton
35ce13562d script to report deprecated functions of text and their age in days. 2011-07-18 09:49:26 +00:00
Campbell Barton
a961d62653 initialize cmake's CMAKE_BUILD_TYPE to 'Release'
add reference to cmake cache for convenience GNUMakefile
2011-06-27 13:18:08 +00:00
Campbell Barton
0c1298f972 avoid cd'ing with the makefile stub 2011-06-06 16:00:32 +00:00
Campbell Barton
dbd3009108 - background job style cleanup.
- assert if material assignment is called with lib. (so the callers can be corrected).
- correct example docs
2011-04-10 15:24:05 +00:00
Campbell Barton
28594bc742 minor pep8 edits, also added 'test_pep8' & 'test_cmake' to the GNUmakefile for convenience. 2011-04-10 10:45:56 +00:00
Brecht Van Lommel
f0d7fbc4b7 CMake package_archive target to create a .zip/.tar.bz2 package on mac/unix,
to be used by buildbot.
2011-03-21 16:42:21 +00:00
Brecht Van Lommel
bcee2343ea Mac OS X cmake changes and bundle fixes
For cmake users, you should now use "make install" instead of "make". This was
already changed for Linux and Windows. Same for Xcode, use the install target.

Changes:
* CMake install mechanism, resulting bundle was verified to be indentical here.
* For cmake, include Info.plist in bundle using builtin mechanism for that.
  There was some code in packaging.cmake, but it wasn't correct as these
  properties need to be set on the executable.
* For scons, fix app bundle version, was still using removed release/VERSION.
* Remove unused blendercreator.app and blenderpublisher.app.
* Fix Info.plist being set as a binary file in svn, should be plain text.
2011-03-16 15:44:17 +00:00
Brecht Van Lommel
1c952cd933 GNUmakefile: do number of cores detection same as BSD, system_profiler apparently changed between versions. 2011-03-14 16:11:56 +00:00
Brecht Van Lommel
c13947fe33 Fixes for GNUmakefile on Mac:
* Don't use "make install", doesn't work yet.
* Use total number of cores rather than number of processors.
* Quicker number of cores query, by not asking for all system info.
2011-03-14 15:40:07 +00:00
Campbell Barton
a803fb095c update 'make' GNUmakefile stub to run 'make install'
update packman and debian for to disable portable install option.
2011-03-06 12:04:59 +00:00
Campbell Barton
44e33571ca part of a patch from Dan Eicher with some edits.
- clean svn string: 35042:35051M -> 35051
- debian and pacman build with threads by default.
2011-02-22 05:49:21 +00:00
Campbell Barton
e1575e5b58 add 'make debug' option for stub cmake makefile. 2011-02-19 13:46:08 +00:00
Campbell Barton
44be05f7f9 convenience targets for makefile
clean, test, package_debian, package_pacman
2011-02-14 06:15:23 +00:00
Campbell Barton
ad8c79405a Type checks for internal ID-Property UI min/max/tip & use defines to get values from ID-Props.
Probably wouldn't cause a problem but manually editing these types through python could easily crash blender.

also changed cmake, stub-makefile default build dir to be lower case and leave out architecture string, easier for documentation.
Use ../build/linux/ rather then ../build/Linux_i686/
2011-02-07 05:05:41 +00:00
Campbell Barton
c9acbc6404 - own error with sound unpack operator using NULL pointer
- make stub now creates 'Release' build by default.
2011-02-07 01:13:21 +00:00
Campbell Barton
ce5dc02c8c fix for make stub, readlink was used incorrectly and building didn't work on BSD because of CPU detection. 2011-02-04 04:12:24 +00:00
Guillermo S. Romero
9d24a17422 SVN maintenance. 2011-02-03 18:57:53 +00:00
Campbell Barton
07e688125a Makefile for convenience on *nix systems.
Running 'make' starts an out of source build with CMake in ../build/OS_CPU, creating the dir and configuring CMake if necessary.

So casual users can just run this without changing dirs:
 'svn up ; make'
2011-02-03 10:07:15 +00:00