Revision: 36948 http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36948 Author: jwilkins Date: 2011-05-27 11:02:36 +0000 (Fri, 27 May 2011) Log Message: ----------- Merge Cleanup. Second attempt to make sure branch is a copy of trunk revision 36905. Just missed a few files.
Revision Links: -------------- http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36905 Modified Paths: -------------- branches/soc-2010-jwilkins/build_files/scons/tools/Blender.py branches/soc-2010-jwilkins/extern/SConscript branches/soc-2010-jwilkins/extern/glew/src/glew.c branches/soc-2010-jwilkins/release/bin/blender-thumbnailer.py branches/soc-2010-jwilkins/release/windows/installer/00.sconsblender.nsi branches/soc-2010-jwilkins/source/CMakeLists.txt branches/soc-2010-jwilkins/source/blender/blenkernel/BKE_brush.h branches/soc-2010-jwilkins/source/blender/blenkernel/BKE_paint.h branches/soc-2010-jwilkins/source/blender/blenkernel/intern/brush.c branches/soc-2010-jwilkins/source/blender/blenkernel/intern/colortools.c branches/soc-2010-jwilkins/source/blender/blenkernel/intern/icons.c branches/soc-2010-jwilkins/source/blender/blenkernel/intern/image.c branches/soc-2010-jwilkins/source/blender/blenkernel/intern/material.c branches/soc-2010-jwilkins/source/blender/blenkernel/intern/paint.c branches/soc-2010-jwilkins/source/blender/blenlib/intern/pbvh.c branches/soc-2010-jwilkins/source/blender/blenloader/intern/readfile.c branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/sculpt_intern.h branches/soc-2010-jwilkins/source/blender/editors/space_view3d/space_view3d.c branches/soc-2010-jwilkins/source/blender/gpu/intern/gpu_codegen.c branches/soc-2010-jwilkins/source/blender/gpu/intern/gpu_draw.c branches/soc-2010-jwilkins/source/blender/gpu/intern/gpu_material.c branches/soc-2010-jwilkins/source/blender/ikplugin/CMakeLists.txt branches/soc-2010-jwilkins/source/blender/makesdna/DNA_scene_types.h branches/soc-2010-jwilkins/source/blender/makesdna/DNA_userdef_types.h branches/soc-2010-jwilkins/source/blender/makesdna/DNA_view3d_types.h branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_brush.c branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_sculpt_paint.c branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_space.c branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_texture.c branches/soc-2010-jwilkins/source/blender/modifiers/CMakeLists.txt branches/soc-2010-jwilkins/source/blender/modifiers/SConscript Removed Paths: ------------- branches/soc-2010-jwilkins/extern/make/ branches/soc-2010-jwilkins/intern/audaspace/make/ branches/soc-2010-jwilkins/release/scripts/modules/rigify_utils.py branches/soc-2010-jwilkins/source/blender/blenlib/intern/BLI_bfile.c branches/soc-2010-jwilkins/source/blender/editors/space_console/console_report.c branches/soc-2010-jwilkins/source/blender/editors/space_file/writeimage.c branches/soc-2010-jwilkins/source/blender/imbuf/intern/anim.c branches/soc-2010-jwilkins/source/tests/ Modified: branches/soc-2010-jwilkins/build_files/scons/tools/Blender.py =================================================================== --- branches/soc-2010-jwilkins/build_files/scons/tools/Blender.py 2011-05-27 09:57:53 UTC (rev 36947) +++ branches/soc-2010-jwilkins/build_files/scons/tools/Blender.py 2011-05-27 11:02:36 UTC (rev 36948) @@ -60,206 +60,206 @@ vcp = [] def getresources(): - return resources + return resources def init_lib_dict(): - for pt in possible_types: - libs[pt] = {} + for pt in possible_types: + libs[pt] = {} # helper func for add_lib_to_dict def internal_lib_to_dict(dict = None, libtype = None, libname = None, priority = 100): - if not libname in dict[libtype]: - done = None - while not done: - if dict[libtype].has_key(priority): - priority = priority + 1 - else: - done = True - dict[libtype][priority] = libname + if not libname in dict[libtype]: + done = None + while not done: + if dict[libtype].has_key(priority): + priority = priority + 1 + else: + done = True + dict[libtype][priority] = libname # libtype and priority can both be lists, for defining lib in multiple places def add_lib_to_dict(env, dict = None, libtype = None, libname = None, priority = 100): - if not dict or not libtype or not libname: - print "Passed wrong arg" - env.Exit() + if not dict or not libtype or not libname: + print "Passed wrong arg" + env.Exit() - if type(libtype) is str and type(priority) is int: - internal_lib_to_dict(dict, libtype, libname, priority) - elif type(libtype) is list and type(priority) is list: - if len(libtype)==len(priority): - for lt, p in zip(libtype, priority): - internal_lib_to_dict(dict, lt, libname, p) - else: - print "libtype and priority lists are unequal in length" - env.Exit() - else: - print "Wrong type combinations for libtype and priority. Only str and int or list and list" - env.Exit() + if type(libtype) is str and type(priority) is int: + internal_lib_to_dict(dict, libtype, libname, priority) + elif type(libtype) is list and type(priority) is list: + if len(libtype)==len(priority): + for lt, p in zip(libtype, priority): + internal_lib_to_dict(dict, lt, libname, p) + else: + print "libtype and priority lists are unequal in length" + env.Exit() + else: + print "Wrong type combinations for libtype and priority. Only str and int or list and list" + env.Exit() def create_blender_liblist(lenv = None, libtype = None): - if not lenv or not libtype: - print "missing arg" + if not lenv or not libtype: + print "missing arg" - lst = [] - if libtype in possible_types: - curlib = libs[libtype] - sortlist = curlib.keys() - sortlist.sort() - for sk in sortlist: - v = curlib[sk] - if not (root_build_dir[0]==os.sep or root_build_dir[1]==':'): - target = os.path.abspath(os.getcwd() + os.sep + root_build_dir + 'lib' + os.sep +lenv['LIBPREFIX'] + v + lenv['LIBSUFFIX']) - else: - target = os.path.abspath(root_build_dir + 'lib' + os.sep +lenv['LIBPREFIX'] + v + lenv['LIBSUFFIX']) - lst.append(target) + lst = [] + if libtype in possible_types: + curlib = libs[libtype] + sortlist = curlib.keys() + sortlist.sort() + for sk in sortlist: + v = curlib[sk] + if not (root_build_dir[0]==os.sep or root_build_dir[1]==':'): + target = os.path.abspath(os.getcwd() + os.sep + root_build_dir + 'lib' + os.sep +lenv['LIBPREFIX'] + v + lenv['LIBSUFFIX']) + else: + target = os.path.abspath(root_build_dir + 'lib' + os.sep +lenv['LIBPREFIX'] + v + lenv['LIBSUFFIX']) + lst.append(target) - return lst + return lst ## TODO: static linking def setup_staticlibs(lenv): - statlibs = [ - #here libs for static linking - ] + statlibs = [ + #here libs for static linking + ] - libincs = [] + libincs = [] - if lenv['WITH_BF_FFMPEG']: - libincs += Split(lenv['BF_FFMPEG_LIBPATH']) + if lenv['WITH_BF_FFMPEG']: + libincs += Split(lenv['BF_FFMPEG_LIBPATH']) - libincs.extend([ - lenv['BF_OPENGL_LIBPATH'], - lenv['BF_JPEG_LIBPATH'], + libincs.extend([ + lenv['BF_OPENGL_LIBPATH'], + lenv['BF_JPEG_LIBPATH'], lenv['BF_ZLIB_LIBPATH'], - lenv['BF_PNG_LIBPATH'], - lenv['BF_LIBSAMPLERATE_LIBPATH'], - lenv['BF_ICONV_LIBPATH'] - ]) + lenv['BF_PNG_LIBPATH'], + lenv['BF_LIBSAMPLERATE_LIBPATH'], + lenv['BF_ICONV_LIBPATH'] + ]) - libincs += Split(lenv['BF_FREETYPE_LIBPATH']) - if lenv['WITH_BF_PYTHON']: - libincs += Split(lenv['BF_PYTHON_LIBPATH']) - if lenv['WITH_BF_SDL']: - libincs += Split(lenv['BF_SDL_LIBPATH']) - if lenv['WITH_BF_JACK']: - libincs += Split(lenv['BF_JACK_LIBPATH']) - if lenv['WITH_BF_SNDFILE']: - libincs += Split(lenv['BF_SNDFILE_LIBPATH']) - if lenv['WITH_BF_OPENEXR']: - libincs += Split(lenv['BF_OPENEXR_LIBPATH']) - if lenv['WITH_BF_STATICOPENEXR']: - statlibs += Split(lenv['BF_OPENEXR_LIB_STATIC']) - if lenv['WITH_BF_TIFF']: - libincs += Split(lenv['BF_TIFF_LIBPATH']) + libincs += Split(lenv['BF_FREETYPE_LIBPATH']) + if lenv['WITH_BF_PYTHON']: + libincs += Split(lenv['BF_PYTHON_LIBPATH']) + if lenv['WITH_BF_SDL']: + libincs += Split(lenv['BF_SDL_LIBPATH']) + if lenv['WITH_BF_JACK']: + libincs += Split(lenv['BF_JACK_LIBPATH']) + if lenv['WITH_BF_SNDFILE']: + libincs += Split(lenv['BF_SNDFILE_LIBPATH']) + if lenv['WITH_BF_OPENEXR']: + libincs += Split(lenv['BF_OPENEXR_LIBPATH']) + if lenv['WITH_BF_STATICOPENEXR']: + statlibs += Split(lenv['BF_OPENEXR_LIB_STATIC']) + if lenv['WITH_BF_TIFF']: + libincs += Split(lenv['BF_TIFF_LIBPATH']) if lenv['WITH_BF_STATICTIFF']: statlibs += Split(lenv['BF_TIFF_LIB_STATIC']) if lenv['WITH_BF_ZLIB'] and lenv['WITH_BF_STATICZLIB']: statlibs += Split(lenv['BF_ZLIB_LIB_STATIC']) - if lenv['WITH_BF_FFTW3']: - libincs += Split(lenv['BF_FFTW3_LIBPATH']) + if lenv['WITH_BF_FFTW3']: + libincs += Split(lenv['BF_FFTW3_LIBPATH']) if lenv['WITH_BF_STATICFFTW3']: statlibs += Split(lenv['BF_FFTW3_LIB_STATIC']) if lenv['WITH_BF_FFMPEG'] and lenv['WITH_BF_STATICFFMPEG']: statlibs += Split(lenv['BF_FFMPEG_LIB_STATIC']) - if lenv['WITH_BF_INTERNATIONAL']: - libincs += Split(lenv['BF_GETTEXT_LIBPATH']) + if lenv['WITH_BF_INTERNATIONAL']: + libincs += Split(lenv['BF_GETTEXT_LIBPATH']) if lenv['WITH_BF_GETTEXT_STATIC']: statlibs += Split(lenv['BF_GETTEXT_LIB_STATIC']) if lenv['WITH_BF_FREETYPE_STATIC']: statlibs += Split(lenv['BF_FREETYPE_LIB_STATIC']) - if lenv['WITH_BF_OPENAL']: - libincs += Split(lenv['BF_OPENAL_LIBPATH']) - if lenv['WITH_BF_STATICOPENAL']: - statlibs += Split(lenv['BF_OPENAL_LIB_STATIC']) - if lenv['WITH_BF_STATICOPENGL']: - statlibs += Split(lenv['BF_OPENGL_LIB_STATIC']) - if lenv['WITH_BF_STATICCXX']: - statlibs += Split(lenv['BF_CXX_LIB_STATIC']) + if lenv['WITH_BF_OPENAL']: + libincs += Split(lenv['BF_OPENAL_LIBPATH']) + if lenv['WITH_BF_STATICOPENAL']: + statlibs += Split(lenv['BF_OPENAL_LIB_STATIC']) + if lenv['WITH_BF_STATICOPENGL']: + statlibs += Split(lenv['BF_OPENGL_LIB_STATIC']) + if lenv['WITH_BF_STATICCXX']: + statlibs += Split(lenv['BF_CXX_LIB_STATIC']) - if lenv['WITH_BF_PYTHON'] and lenv['WITH_BF_STATICPYTHON']: - statlibs += Split(lenv['BF_PYTHON_LIB_STATIC']) + if lenv['WITH_BF_PYTHON'] and lenv['WITH_BF_STATICPYTHON']: + statlibs += Split(lenv['BF_PYTHON_LIB_STATIC']) if lenv['WITH_BF_SNDFILE'] and lenv['WITH_BF_STATICSNDFILE']: statlibs += Split(lenv['BF_SNDFILE_LIB_STATIC']) - if lenv['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'): - libincs += Split(lenv['BF_PTHREADS_LIBPATH']) + if lenv['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'): + libincs += Split(lenv['BF_PTHREADS_LIBPATH']) - if lenv['WITH_BF_COLLADA']: - libincs += Split(lenv['BF_OPENCOLLADA_LIBPATH']) - if lenv['OURPLATFORM'] not in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'): - libincs += Split(lenv['BF_PCRE_LIBPATH']) - libincs += Split(lenv['BF_EXPAT_LIBPATH']) + if lenv['WITH_BF_COLLADA']: + libincs += Split(lenv['BF_OPENCOLLADA_LIBPATH']) + if lenv['OURPLATFORM'] not in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'): + libincs += Split(lenv['BF_PCRE_LIBPATH']) + libincs += Split(lenv['BF_EXPAT_LIBPATH']) - if lenv['WITH_BF_OPENMP']: - if lenv['OURPLATFORM'] == 'linuxcross': - libincs += Split(lenv['BF_OPENMP_LIBPATH']) + if lenv['WITH_BF_OPENMP']: + if lenv['OURPLATFORM'] == 'linuxcross': + libincs += Split(lenv['BF_OPENMP_LIBPATH']) if lenv['WITH_BF_STATICLIBSAMPLERATE']: statlibs += Split(lenv['BF_LIBSAMPLERATE_LIB_STATIC']) - # setting this last so any overriding of manually libs could be handled - if lenv['OURPLATFORM'] not in ('win32-vc', 'win32-mingw', 'win64-vc', 'linuxcross'): - libincs.append('/usr/lib') + # setting this last so any overriding of manually libs could be handled + if lenv['OURPLATFORM'] not in ('win32-vc', 'win32-mingw', 'win64-vc', 'linuxcross'): + libincs.append('/usr/lib') if lenv['WITH_BF_JEMALLOC']: libincs += Split(lenv['BF_JEMALLOC_LIBPATH']) if lenv['WITH_BF_STATICJEMALLOC']: statlibs += Split(lenv['BF_JEMALLOC_LIB_STATIC']) - return statlibs, libincs + return statlibs, libincs def setup_syslibs(lenv): - syslibs = [ - - lenv['BF_JPEG_LIB'], - lenv['BF_PNG_LIB'], - ] + syslibs = [ + + lenv['BF_JPEG_LIB'], + lenv['BF_PNG_LIB'], + ] if not lenv['WITH_BF_FREETYPE_STATIC']: - syslibs += Split(lenv['BF_FREETYPE_LIB']) - if lenv['WITH_BF_PYTHON'] and not lenv['WITH_BF_STATICPYTHON']: - if lenv['BF_DEBUG'] and lenv['OURPLATFORM'] in ('win32-vc', 'win64-vc', 'win32-mingw'): - syslibs.append(lenv['BF_PYTHON_LIB']+'_d') - else: - syslibs.append(lenv['BF_PYTHON_LIB']) + syslibs += Split(lenv['BF_FREETYPE_LIB']) + if lenv['WITH_BF_PYTHON'] and not lenv['WITH_BF_STATICPYTHON']: @@ Diff output truncated at 10240 characters. @@ _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs