Commit Graph

83 Commits

Author SHA1 Message Date
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
Brecht Van Lommel
309bb2937d Forgot to mention that for scons, I've disabled install of the texture and
sequence plugins, as was already done for cmake, they don't work in 2.5.

This is a fix for last commit, this file shouldn't have been included.
2011-05-06 20:21:20 +00:00
Brecht Van Lommel
cb12337363 Code cleanup: remove source/kernel module, this wasn't really the kernel of
anything, only contained a hash map and functions to pass command line args
to the game engine. Moved those to container and BlenderRoutines modules.
2011-05-06 20:18:42 +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
Campbell Barton
161927e27e remove -mwindows flag for scons/mingw, enable manifest & winblender.rc for all windows builds except for msvc2010 2011-04-09 00:10:29 +00:00
Nathan Letwory
a0b172215d Clean up linking flags for win32. 2011-04-08 14:56:31 +00:00
Nathan Letwory
4d2562fb47 Clean up linking flags for win64. 2011-04-08 14:40:43 +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
42e9796c04 builder reports MSVC was setting stack size to 2gig. 2011-03-12 04:31:28 +00:00
Campbell Barton
c786a2c805 edit scons to use py3.2 on all os's and use 'm' abiflag on linux since this is the most common. 2011-03-12 01:03:15 +00:00
Campbell Barton
a001b3f072 set 2mb stack for mingw too. 2011-03-12 00:50:34 +00:00
Nathan Letwory
92665b0a51 Fix [#25659] crash when unwrapping specific mesh
Reported by Jan Hohoho

Running the unwrap causes stack to overflow. Double the size from default 1MB.
2011-03-11 23:27:15 +00:00
Campbell Barton
1eb57bcbc7 disable openexr and collada for mingw, give linking errors. 2011-03-08 23:12:45 +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
Ervin Weber
98d444109e change mingw-scons to use python 3.2 2011-03-04 10:19:02 +00:00
Nathan Letwory
a97f920e2f Bump OSX SCons to use Python 3.2. Remember to update your lib/darwin* directory. 2011-03-04 09:08:47 +00:00
Nathan Letwory
f7ed83647d Move Windows SCons system to build Blender against the new Python 3.2 libs committed in r35340 and r35341.
Platform maintainers and release builders, please update your systems also to Python 3.2.
2011-03-04 00:59:45 +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
bc15e0e295 add NDEBUG to scons release flags + some pep8 cleanup for examples. 2011-02-25 16:19:50 +00:00
Campbell Barton
f2ab4dd6a7 use flag _DEBUG, not DEBUG. 2011-02-25 15:46:43 +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
71cb745941 Commit to cope with API changes in OpenCOLLADA (latest for Windows right now r827). 2011-01-27 19:39:06 +00:00
Campbell Barton
6a2e5ad599 [#25815] Patch gcc 4.6
with minor edits, made sure it works in CMake too.
2011-01-27 00:02:25 +00:00
Nathan Letwory
730634ca51 Enable sndfile by default on win64 2011-01-05 09:00:28 +00:00
Nathan Letwory
c5613de2d5 Remove redundant VC_REDIST code, since it's not used anymore. 2010-12-07 08:37:00 +00:00
Campbell Barton
cd97253502 - added GCC warning -Wstrict-prototypes
- fixed bug in paste material, exposed by stricter warnings.
- removed/renamed various shadowed vars.
- removed BGE lamp.colour, only allow lamp.color attribute.
2010-12-03 12:30:59 +00:00
Campbell Barton
3e173f4d21 disable redcode support for cmake & scons-freebsd 2010-12-01 07:25:59 +00:00
Sergey Sharybin
228ed6f086 Global definition of _LARGEFILE_SOURCE, _FILE_OFFSET_BITS and _LARGEFILE64_SOURCE at linux and win32/mingw platforms
Needed to work properly with large files at 32bit system (display correct size in file browser, i.e.)

This will also fix compilation with zlib 1.2.5
2010-11-04 17:02:25 +00:00
Nathan Letwory
f875777212 Change /WX away for now, some odd thing going on between cloned environments. Need to check after release. 2010-10-26 23:32:59 +00:00
Nathan Letwory
db74070778 Make C4013 throw a warning
-> 'function' undefined; assuming extern returning int
2010-10-19 05:42:31 +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
Campbell Barton
3498e22468 Disable LCMS by default for scons. 2010-10-19 02:50:00 +00:00
Nathan Letwory
6e77dc1942 whitespace commit, AKA commit count bump. 2010-10-18 20:33:04 +00:00