Commit Graph

53 Commits

Author SHA1 Message Date
Nathan Letwory
899f2776db Shuffle some build code around to ensure debug builds on Windows actually run too.
* creator/SConscript is now empty, code is moved to an emitter function in Blender.py
* make sure COLLADA debug libs are used when BF_DEBUG=True
2011-06-08 11:53:07 +00:00
Brecht Van Lommel
06ca703737 BuildBot: various changes to support building branches. 2011-06-03 20:44:23 +00:00
Brecht Van Lommel
7b4aac3e34 Fix #27481: windows uninstaller could remove files unrelated to blender
when installing to a folder that already existed. Now the uninstaller
will remove only the files it has installed, and leave any other files
in the installation directory intact.
2011-06-01 13:13:55 +00:00
Brecht Van Lommel
d369a6aaaf Windows installer and Path changes, fixing various issues:
* Windows installer not working for non-admin users and multiple users
* Addon scripts not installing next to user configuration
* Portable install not being taken into account in all places

The main problem was the windows installer was installing system scripts in
AppData next to the user configuration directory, which is not shared between
users. Now these are installed in ProgramFiles, and only addon scripts added
by the users go to AppData.

On all platforms, addon scripts were sometimes getting installed between
system scripts, because the scripts folder in the executable directory was
given precedence over the user configuration folder, that is no longer done
now. So addons now behave like user configuration, they are preserved even
if you download a newer build of the same blender version.

If you have an installation of 2.57 on windows, the addon install location
will not change until we do the version bump to 2.58, to avoid conflicts with
the existing the installed 2.57 version.

The old behavior of giving precedence to the local folder was done to support
portable install, where all configuration is written to the local folder. This
is now implemented differently: if and only if a "config" folder exists in the
local folder, portable install will be assumed, and files will only be written
to that local folder.
2011-05-27 09:57:53 +00:00
Campbell Barton
514de547ac update to build system excluding parts of the python bundle. 2011-05-26 11:45:25 +00:00
Brecht Van Lommel
b434e7f933 LCMS code removed, was an experiment but never finished. 2011-05-16 13:34:42 +00:00
Sergey Sharybin
8941cc626a Option to use jemalloc when building with scons under linux.
Disabled by default.
2011-05-13 12:08:34 +00:00
Joseph Eagar
088899236b =trunk=
Recommitted eltopo collision code (but disabled by default)
with Genscher's permission.

To use, you need to install liblapack and libblas
2011-05-01 21:39:13 +00:00
Campbell Barton
a42bf45333 revert Joseph Eagar's eltopo commits r36073, 36075 (& some minor edits)
discussed with Janne, Ton, Nathan and we agreed this kind of change at least needs discussion with module owners.

Its also too close to release to be making these kinds of changes.

commands used:

  # reverse merge
  svn merge -r36073:36072 .
  # for some reason this gave a lot of property changes
  svn revert `svn st | grep "^ M" | awk '{print $2}'`
  # reverse merging didn't work here, removing while dir.
  svn rm extern/eltopo/


  # manually fixed conflict in
  # ./source/blenderplayer/CMakeLists.txt
  #
  # also manually removed 2 lines from
  # ./CMakeLists.txt
2011-04-12 11:09:10 +00:00
Joseph Eagar
0a60bc14d6 =cloth collisions=
Plugged the eltopo library into the cloth solver.
I was playing with it earlier, and it's so easy to
use I decided to quickly put it in (trunk's) cloth.

See http://www.cs.ubc.ca/labs/imager/tr/2009/eltopo/eltopo.html
.  The authors are on the bleeding edge of continuous collision
detection (one of them did ILM's cloth sim).  
I
don't really have to time to plug it into softbody, particles,
bullet, fluid, etc, but doing so would be pretty straightforward.
I'll leave that up to someone else.

To use, turn on USE_ELTOPO (in cmake) or WITH_BF_ELTOPO in scons.
2011-04-09 23:19:11 +00:00
Sergey Sharybin
90326c4c6e buildbot:
- Remove packed to buildbot_archive.zip archive file to keep scons install
  directory as clean as possible (if i understood correct, this file isn't
  actually needed in the future, so we could remove it just after packing rather
  than cleaning install directory before packing as it's done for cmake)
- No need in scripts installation for linux slaves when preparing archive
2011-04-02 21:11:22 +00:00
Sergey Sharybin
485229b7db Initial support of linux 32/64 bit for buildbot:
- Use the same config as we're using for release builds
- Added stipping (maybe it should be generalized)
- Not software gl packing, bot would be easy to add

Note, that you should have special environment to create
proper linux builts (which would work for everybody)
2011-04-01 21:22:19 +00:00
Nathan Letwory
5b19ec3559 Apply patch [#26660] Scons build on OSX fails to create Info.plist file fix
provided by Mike Sloman

from the patch report:

When building on Mac OSX with SCONS the Info.plist file is zero length and thus OSX cannot identify icons and file type associations.

The problems was in the execution of the "date" command to add times in the modified bundle name strings passed to sed. This failed and thus the info.plist file was overwritten with 0 length file.
2011-03-30 05:44:01 +00:00
Nathan Letwory
e4ef822ecd build target was changing into wrong directory. 2011-03-29 12:10:41 +00:00
Nathan Letwory
e8dc841199 Version and platform name were in wrong order. 2011-03-22 12:54:13 +00:00
Nathan Letwory
d2a721cfd5 Add buildslave target for builder.blender.org integration 2011-03-22 10:26:53 +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
Ken Hughes
f4e16def46 Build system
------------
Allow BF_PYTHON_ABI_FLAGS to be specified on the command line for scons.
2011-03-14 16:10:35 +00:00
Sergey Sharybin
cf8cc39d4c Make BF_PYTHON_ABI_FLAGS a scons option. Default flags are empty.
Made changed to linux2-config and freebsd*-config. Windows/MacOS are kept
unchanged.

I'm not sure which flags should be used for freebsd systems, so flags for
them also kept empty. Maintainers of this platform, please check which
flags should be used and make changes to rules.
2011-03-13 09:29:47 +00:00
Campbell Barton
a9f08f6310 use tar.gz for windows python zipfiles rather then .zip,
since cmake can only extract tar's
2011-03-06 11:18:57 +00:00
Campbell Barton
e8c322ee85 Py/RNA API: WITH_PYTHON_SAFETY
compile time option which enables extra safety checks.
since this is noticeably slower I rather not enable by default yet.
2011-03-03 12:00:35 +00:00
Nathan Letwory
9234cb6e30 Make sure python.zip is extracted only once. This prevents erroring build on the unzip stage. 2011-02-28 13:18:00 +00:00
Campbell Barton
5ef65a0a3b build system now exclude config-*, turtledemo when copying system python.
also remove __pycache__ dirs when cleaning (new in python 3.2)
2011-02-28 05:59:44 +00:00
Campbell Barton
848d60caee Move blender version info into BKE_blender.h so we only have the info in one place and so package building scripts can extract it in a more usable way.
this also means we can have a version string like '2.56a-beta' without using buildinfo.

release/VERSION was only used by scons, NSIS installer.

Possibly helps to fix bug [#26062] too.
2011-02-21 04:45:47 +00:00
Nathan Letwory
708df39935 Check the os.environ at the start of the build process.
Print any variable that contains a value with non-ascii
characters, then abort build.
2011-02-18 09:39:15 +00:00
Nathan Letwory
c5613de2d5 Remove redundant VC_REDIST code, since it's not used anymore. 2010-12-07 08:37:00 +00:00
Nathan Letwory
62aacd1aa7 Set defaults for compile and link flags to lists. 2010-10-19 05:21:28 +00:00
Nathan Letwory
2a89fb887e * Enable compile and link flags to build info also on Windows and in SCons.
* Added build_system SCons or CMake
* Write the new build info also to system-info.txt
2010-10-19 05:00:36 +00:00
Nathan Letwory
663ce490e0 Enable CXX_GUARDEDALLOC support through SCons. 2010-10-08 20:39:56 +00:00
Sergey Sharybin
5bab95fc58 Scons options for static linking to libsamplerate, sndfile and fftw3 2010-10-05 16:43:01 +00:00
Nathan Letwory
31ff2a6da2 Enable lcms support on Windows. 2010-10-05 13:39:45 +00:00
Campbell Barton
c5086987ec fix for scons with recent buildinfo change 2010-10-03 11:33:44 +00:00
Nathan Letwory
4418396a45 Change <UNKNOWN> to -UNKNOWN- so exporters can be happy too, when a build was created without svnversion (or from export). 2010-10-01 08:29:27 +00:00
Ken Hughes
d0451fea58 Changes to scons for building with static zlib and tiff libraries. 2010-09-21 21:10:49 +00:00
Campbell Barton
6963574a55 scons now gets the blender version from BKE_blender.h. 2010-09-18 10:37:51 +00:00
Ton Roosendaal
40bf22e955 Part 4 of 2.54 beta commits (last) 2010-09-10 16:39:08 +00:00
Joshua Leung
88f657f251 scons compiling fix:
When "svnversion" can't be found (as is usual for anyone running TortoiseSVN), build_revision info will be "", which breaks compiling. Worked around this for now by using "<UNKNOWN>" as this
2010-08-30 00:49:23 +00:00
Nathan Letwory
cb786f0022 Remove unnecessary \''s. This cleans up also printouts in splash and bpy.app (no more unnecessary quotes). 2010-08-29 21:53:12 +00:00
Nathan Letwory
c29b5df739 Changing representation, so there's no space between the words. 2010-08-29 21:49:50 +00:00
Nathan Letwory
6c113b54b3 Finally change SConscript tabs to spaces. 2010-08-29 20:52:05 +00:00
Nathan Letwory
999bb69c70 Properly set build type: Release or Debug 2010-08-29 19:47:26 +00:00
Nathan Letwory
57aee2ecf4 Tell what platform and its bitness in BUILD_PLATFORM 2010-08-29 19:44:50 +00:00
Nathan Letwory
cc70bffb62 Make sure correct python31 zip is unpacked when BF_DEBUG=True 2010-08-27 21:42:33 +00:00
Nathan Letwory
f647ba1ce5 Patch [#5429] SCons patch for linux: support more libs to be linked statically
Contributed by Rui Campos, adapted for current trunk

This was a very ancient patch on my todo list (mid-December 2006). Some things already were done, so I
added now ffmpeg and freetype support for linking statically. FFMPEG part is untested further from my part
so if you run into problems with that, please report.
2010-08-26 08:04:58 +00:00
Nathan Letwory
92422ba452 Patch [#23389] Add authorship information to exported COLLADA files
Contributed by Imran Syed (freakabcd).

This adds basic authoring tool and author info ("Blender User" for now).

NOTE: Linux and OSX users need now to update their OpenCOLLADA libs - Blender should now compile fine with their latest revision.

Made some changes to the original patch to ensure linking is done correctly.
Some small cleanups for scons too.
2010-08-26 06:58:32 +00:00
Nathan Letwory
446122d112 == SCons ==
Make it possible to link statically against libgettext. Set WITH_BF_GETTEXT_STATIC to True and put static lib in BF_GETTEXT_LIB_STATIC (absolute path works probably best). BF_GETTEXT_LIB will be ignored.
2010-08-24 13:08:14 +00:00
Stefan Gartner
2f8f86e4f6 fix path to release/python.zip for scons and cmake
I hope this doesn't break anything
2010-08-04 11:07:14 +00:00
Campbell Barton
957976882d build options to disable image formats WITH_CINEON, WITH_HDR.
- updated cmake, make & scons.
- renamed CMake build options WITH_TIFF -> WITH_IMAGE_TIFF, same for DDS, OPENJPEG etc.
2010-08-03 11:25:34 +00:00
Campbell Barton
ec2c52c9c8 SCons
- remove scons option WITH_BF_FHS, its not needed anymore.
- comment WITH_BF_DOCS, was using epydocs which we dont use now.
- blenderlite target was broken, always using openmp.
- building without python wasnt working.

- fixed some warnings.
2010-08-02 16:27:41 +00:00
Campbell Barton
bed40ed8e3 move directories:
dlltool --> build_files/make/dlltool
 bin --> release/bin
 
Since dlltool is only used make + mingw and ./bin is misleading because it would seem the blender binary would be copied there, but its just used for home directory files.

updated scons/cmake/make
2010-07-26 11:47:33 +00:00