kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

update to build system excluding parts of the python bundle.

Browse Source
This commit is contained in:
Campbell Barton 2011-05-26 11:45:25 +00:00
parent d7f42721f8
commit 514de547ac
2 changed files with 54 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
build_files/scons/tools/Blender.py
View File

@ -449,10 +449,16 @@ def WinPyBundle(target=None, source=None, env=None):
shutil.rmtree(py_target, False, printexception) shutil.rmtree(py_target, False, printexception)
exclude_re=[re.compile('.*/test/.*'), exclude_re=[re.compile('.*/test/.*'),
re.compile('^config/.*'), re.compile('^config/.*'),
re.compile('^config-*/.*'),
re.compile('^distutils/.*'), re.compile('^distutils/.*'),
re.compile('^idlelib/.*'), re.compile('^idlelib/.*'),
re.compile('^lib2to3/.*'), re.compile('^lib2to3/.*'),
re.compile('^tkinter/.*')] re.compile('^tkinter/.*'),
re.compile('^_tkinter_d.pyd'),
re.compile('^turtledemo'),
re.compile('^turtle.py'),
]
print "Unpacking '" + py_tar + "' to '" + py_target + "'" print "Unpacking '" + py_tar + "' to '" + py_target + "'"
untar_pybundle(py_tar,py_target,exclude_re) untar_pybundle(py_tar,py_target,exclude_re)
@ -569,17 +575,17 @@ def UnixPyBundle(target=None, source=None, env=None):
run("cp -R '%s' '%s'" % (py_src, os.path.dirname(py_target))) run("cp -R '%s' '%s'" % (py_src, os.path.dirname(py_target)))
run("rm -rf '%s/distutils'" % py_target) run("rm -rf '%s/distutils'" % py_target)
run("rm -rf '%s/lib2to3'" % py_target) run("rm -rf '%s/lib2to3'" % py_target)
run("rm -rf '%s/idlelib'" % py_target)
run("rm -rf '%s/tkinter'" % py_target)
run("rm -rf '%s/config'" % py_target) run("rm -rf '%s/config'" % py_target)
run("rm -rf '%s/config-*'" % py_target)
run("rm -rf '%s/site-packages'" % py_target) run("rm -rf '%s/site-packages'" % py_target)
run("mkdir '%s/site-packages'" % py_target) # python needs it.' run("mkdir '%s/site-packages'" % py_target) # python needs it.'
run("rm -rf '%s/idlelib'" % py_target)
run("rm -rf '%s/tkinter'" % py_target)
run("rm -rf '%s/turtledemo'" % py_target)
run("rm -r '%s/turtle.py'" % py_target)
run("rm -f '%s/lib-dynload/_tkinter.so'" % py_target) run("rm -f '%s/lib-dynload/_tkinter.so'" % py_target)
run("find '%s' -type d -name 'test' -prune -exec rm -rf {} ';'" % py_target) run("find '%s' -type d -name 'test' -prune -exec rm -rf {} ';'" % py_target)
run("find '%s' -type d -name 'config-*' -prune -exec rm -rf {} ';'" % py_target)
run("find '%s' -type d -name 'turtledemo' -prune -exec rm -rf {} ';'" % py_target)
run("find '%s' -type d -name '__pycache__' -exec rm -rf {} ';'" % py_target) run("find '%s' -type d -name '__pycache__' -exec rm -rf {} ';'" % py_target)
run("find '%s' -name '*.py[co]' -exec rm -rf {} ';'" % py_target) run("find '%s' -name '*.py[co]' -exec rm -rf {} ';'" % py_target)
run("find '%s' -name '*.so' -exec strip -s {} ';'" % py_target) run("find '%s' -name '*.so' -exec strip -s {} ';'" % py_target)

80
source/creator/CMakeLists.txt
View File

@ -193,8 +193,8 @@ if(WITH_PYTHON_MODULE)
PROPERTIES PROPERTIES
PREFIX "" PREFIX ""
OUTPUT_NAME bpy OUTPUT_NAME bpy
LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin/ LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin
RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin/ # only needed on windows RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin # only needed on windows
) )
if(WIN32) if(WIN32)
@ -270,7 +270,7 @@ if(UNIX AND NOT APPLE)
) )
install( install(
DIRECTORY ${CMAKE_SOURCE_DIR}/release/text/ DIRECTORY ${CMAKE_SOURCE_DIR}/release/text
DESTINATION ${TARGETDIR} DESTINATION ${TARGETDIR}
PATTERN ".svn" EXCLUDE PATTERN ".svn" EXCLUDE
) )
@ -317,7 +317,7 @@ if(UNIX AND NOT APPLE)
${CMAKE_SOURCE_DIR}/release/freedesktop/icons/32x32 ${CMAKE_SOURCE_DIR}/release/freedesktop/icons/32x32
${CMAKE_SOURCE_DIR}/release/freedesktop/icons/48x48 ${CMAKE_SOURCE_DIR}/release/freedesktop/icons/48x48
${CMAKE_SOURCE_DIR}/release/freedesktop/icons/256x256 ${CMAKE_SOURCE_DIR}/release/freedesktop/icons/256x256
DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/ DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor
PATTERN ".svn" EXCLUDE PATTERN ".svn" EXCLUDE
PATTERN "*.svg" EXCLUDE PATTERN "*.svg" EXCLUDE
) )
@ -334,7 +334,7 @@ if(UNIX AND NOT APPLE)
DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man1 DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man1
) )
install( install(
DIRECTORY ${CMAKE_SOURCE_DIR}/release/text/ DIRECTORY ${CMAKE_SOURCE_DIR}/release/text
DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/blender DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/blender
PATTERN ".svn" EXCLUDE PATTERN ".svn" EXCLUDE
) )
@ -353,7 +353,7 @@ if(UNIX AND NOT APPLE)
install( install(
DIRECTORY ${CMAKE_SOURCE_DIR}/release/bin/.blender/locale DIRECTORY ${CMAKE_SOURCE_DIR}/release/bin/.blender/locale
DESTINATION ${TARGETDIR_VER}/datafiles/ DESTINATION ${TARGETDIR_VER}/datafiles
PATTERN ".svn" EXCLUDE PATTERN ".svn" EXCLUDE
) )
endif() endif()
@ -362,7 +362,7 @@ if(UNIX AND NOT APPLE)
# #
# install( # install(
# DIRECTORY ${CMAKE_SOURCE_DIR}/release/plugins # DIRECTORY ${CMAKE_SOURCE_DIR}/release/plugins
# DESTINATION ${TARGETDIR_VER}/ # DESTINATION ${TARGETDIR_VER}
# PATTERN ".svn" EXCLUDE # PATTERN ".svn" EXCLUDE
# ) # )
@ -370,7 +370,7 @@ if(UNIX AND NOT APPLE)
# install(CODE "message(\"copying blender scripts...\")") # install(CODE "message(\"copying blender scripts...\")")
install( install(
DIRECTORY ${CMAKE_SOURCE_DIR}/release/scripts DIRECTORY ${CMAKE_SOURCE_DIR}/release/scripts
DESTINATION ${TARGETDIR_VER}/ DESTINATION ${TARGETDIR_VER}
PATTERN ".svn" EXCLUDE PATTERN ".svn" EXCLUDE
PATTERN "__pycache__" EXCLUDE PATTERN "__pycache__" EXCLUDE
) )
@ -381,9 +381,9 @@ if(UNIX AND NOT APPLE)
# install(CODE "message(\"copying a subset of the systems python...\")") # install(CODE "message(\"copying a subset of the systems python...\")")
install( install(
DIRECTORY ${PYTHON_LIBPATH}/python${PYTHON_VERSION} DIRECTORY ${PYTHON_LIBPATH}/python${PYTHON_VERSION}
DESTINATION ${TARGETDIR_VER}/python/lib/ DESTINATION ${TARGETDIR_VER}/python/lib
PATTERN ".svn" EXCLUDE PATTERN ".svn" EXCLUDE
PATTERN "__pycache__" EXCLUDE # ./distutils PATTERN "__pycache__" EXCLUDE # * any cache *
PATTERN "distutils" EXCLUDE # ./distutils PATTERN "distutils" EXCLUDE # ./distutils
PATTERN "lib2to3" EXCLUDE # ./lib2to3 PATTERN "lib2to3" EXCLUDE # ./lib2to3
PATTERN "config" EXCLUDE # ./config PATTERN "config" EXCLUDE # ./config
@ -391,8 +391,10 @@ if(UNIX AND NOT APPLE)
PATTERN "site-packages/*" EXCLUDE # ./site-packages/* PATTERN "site-packages/*" EXCLUDE # ./site-packages/*
PATTERN "tkinter" EXCLUDE # ./tkinter PATTERN "tkinter" EXCLUDE # ./tkinter
PATTERN "lib-dynload/_tkinter.*" EXCLUDE # ./lib-dynload/_tkinter.co PATTERN "lib-dynload/_tkinter.*" EXCLUDE # ./lib-dynload/_tkinter.co
PATTERN "idlelib" EXCLUDE # ./idlelib
PATTERN "test" EXCLUDE # ./test PATTERN "test" EXCLUDE # ./test
PATTERN "turtledemo" EXCLUDE # ./turtledemo PATTERN "turtledemo" EXCLUDE # ./turtledemo
PATTERN "turtle.py" EXCLUDE # ./turtle.py
) )
# # doesnt work, todo # # doesnt work, todo
@ -409,8 +411,8 @@ elseif(WIN32)
) )
install( # same as linux!, deduplicate install( # same as linux!, deduplicate
DIRECTORY ${CMAKE_SOURCE_DIR}/release/text/ DIRECTORY ${CMAKE_SOURCE_DIR}/release/text
DESTINATION ${TARGETDIR}/ DESTINATION ${TARGETDIR}
PATTERN ".svn" EXCLUDE PATTERN ".svn" EXCLUDE
) )
@ -426,25 +428,25 @@ elseif(WIN32)
) )
install( install(
DIRECTORY ${CMAKE_SOURCE_DIR}/release/bin/.blender/locale DIRECTORY ${CMAKE_SOURCE_DIR}/release/bin/.blender/locale
DESTINATION ${TARGETDIR_VER}/datafiles/ DESTINATION ${TARGETDIR_VER}/datafiles
PATTERN ".svn" EXCLUDE PATTERN ".svn" EXCLUDE
) )
if(NOT CMAKE_CL_64) if(NOT CMAKE_CL_64)
install( install(
FILES ${LIBDIR}/gettext/lib/gnu_gettext.dll FILES ${LIBDIR}/gettext/lib/gnu_gettext.dll
DESTINATION ${TARGETDIR}/ DESTINATION ${TARGETDIR}
) )
install( install(
FILES ${LIBDIR}/iconv/lib/iconv.dll FILES ${LIBDIR}/iconv/lib/iconv.dll
DESTINATION ${TARGETDIR}/ DESTINATION ${TARGETDIR}
) )
endif() endif()
endif() endif()
install( # same as linux!, deduplicate install( # same as linux!, deduplicate
DIRECTORY ${CMAKE_SOURCE_DIR}/release/bin/.blender/locale/ DIRECTORY ${CMAKE_SOURCE_DIR}/release/bin/.blender/locale
DESTINATION ${TARGETDIR_VER}/datafiles/locale DESTINATION ${TARGETDIR_VER}/datafiles/locale
PATTERN ".svn" EXCLUDE PATTERN ".svn" EXCLUDE
) )
@ -453,7 +455,7 @@ elseif(WIN32)
# #
# install( # install(
# DIRECTORY ${CMAKE_SOURCE_DIR}/release/plugins # DIRECTORY ${CMAKE_SOURCE_DIR}/release/plugins
# DESTINATION ${TARGETDIR_VER}/ # DESTINATION ${TARGETDIR_VER}
# PATTERN ".svn" EXCLUDE # PATTERN ".svn" EXCLUDE
# ) # )
@ -461,19 +463,19 @@ elseif(WIN32)
# install(CODE "message(\"copying blender scripts...\")") # install(CODE "message(\"copying blender scripts...\")")
install( # same as linux!, deduplicate install( # same as linux!, deduplicate
DIRECTORY ${CMAKE_SOURCE_DIR}/release/scripts DIRECTORY ${CMAKE_SOURCE_DIR}/release/scripts
DESTINATION ${TARGETDIR_VER}/ DESTINATION ${TARGETDIR_VER}
PATTERN ".svn" EXCLUDE PATTERN ".svn" EXCLUDE
PATTERN "__pycache__" EXCLUDE PATTERN "__pycache__" EXCLUDE
) )
# TODO, multiple targets? # TODO, multiple targets?
install(FILES ${LIBDIR}/python/lib/python32.dll DESTINATION ${TARGETDIR}/ CONFIGURATIONS Release) install(FILES ${LIBDIR}/python/lib/python32.dll DESTINATION ${TARGETDIR} CONFIGURATIONS Release)
install(FILES ${LIBDIR}/python/lib/python32.dll DESTINATION ${TARGETDIR}/ CONFIGURATIONS RelWithDebInfo) install(FILES ${LIBDIR}/python/lib/python32.dll DESTINATION ${TARGETDIR} CONFIGURATIONS RelWithDebInfo)
install(FILES ${LIBDIR}/python/lib/python32.dll DESTINATION ${TARGETDIR}/ CONFIGURATIONS MinSizeRel) install(FILES ${LIBDIR}/python/lib/python32.dll DESTINATION ${TARGETDIR} CONFIGURATIONS MinSizeRel)
install( install(
FILES ${LIBDIR}/python/lib/python32_d.dll FILES ${LIBDIR}/python/lib/python32_d.dll
DESTINATION ${TARGETDIR}/ DESTINATION ${TARGETDIR}
CONFIGURATIONS Debug CONFIGURATIONS Debug
) )
@ -485,8 +487,8 @@ elseif(WIN32)
CODE CODE
" "
message(\"creating ${TARGETDIR_VER}/python/lib\") message(\"creating ${TARGETDIR_VER}/python/lib\")
file(MAKE_DIRECTORY \"${TARGETDIR_VER}/python/\") file(MAKE_DIRECTORY \"${TARGETDIR_VER}/python\")
file(MAKE_DIRECTORY \"${TARGETDIR_VER}/python/lib/\") file(MAKE_DIRECTORY \"${TARGETDIR_VER}/python/lib\")
message(\"done creating dir\") message(\"done creating dir\")
" "
) )
@ -494,7 +496,7 @@ elseif(WIN32)
install( install(
CODE CODE
" "
execute_process(COMMAND \"${CMAKE_COMMAND}\" -E chdir \"${TARGETDIR_VER}/python/lib/\" execute_process(COMMAND \"${CMAKE_COMMAND}\" -E chdir \"${TARGETDIR_VER}/python/lib\"
\"${CMAKE_COMMAND}\" -E tar xzfv \"${LIBDIR}/release/python32.tar.gz\") \"${CMAKE_COMMAND}\" -E tar xzfv \"${LIBDIR}/release/python32.tar.gz\")
" "
CONFIGURATIONS Release CONFIGURATIONS Release
@ -502,7 +504,7 @@ elseif(WIN32)
install( install(
CODE CODE
" "
execute_process(COMMAND \"${CMAKE_COMMAND}\" -E chdir \"${TARGETDIR_VER}/python/lib/\" execute_process(COMMAND \"${CMAKE_COMMAND}\" -E chdir \"${TARGETDIR_VER}/python/lib\"
\"${CMAKE_COMMAND}\" -E tar xzfv \"${LIBDIR}/release/python32.tar.gz\") \"${CMAKE_COMMAND}\" -E tar xzfv \"${LIBDIR}/release/python32.tar.gz\")
" "
CONFIGURATIONS RelWithDebInfo CONFIGURATIONS RelWithDebInfo
@ -510,7 +512,7 @@ elseif(WIN32)
install( install(
CODE CODE
" "
execute_process(COMMAND \"${CMAKE_COMMAND}\" -E chdir \"${TARGETDIR_VER}/python/lib/\" execute_process(COMMAND \"${CMAKE_COMMAND}\" -E chdir \"${TARGETDIR_VER}/python/lib\"
\"${CMAKE_COMMAND}\" -E tar xzfv \"${LIBDIR}/release/python32.tar.gz\") \"${CMAKE_COMMAND}\" -E tar xzfv \"${LIBDIR}/release/python32.tar.gz\")
" "
CONFIGURATIONS MinSizeRel CONFIGURATIONS MinSizeRel
@ -518,7 +520,7 @@ elseif(WIN32)
install( install(
CODE CODE
" "
execute_process(COMMAND \"${CMAKE_COMMAND}\" -E chdir \"${TARGETDIR_VER}/python/lib/\" execute_process(COMMAND \"${CMAKE_COMMAND}\" -E chdir \"${TARGETDIR_VER}/python/lib\"
\"${CMAKE_COMMAND}\" -E tar xzfv \"${LIBDIR}/release/python32_d.tar.gz\") \"${CMAKE_COMMAND}\" -E tar xzfv \"${LIBDIR}/release/python32_d.tar.gz\")
" "
CONFIGURATIONS Debug CONFIGURATIONS Debug
@ -533,26 +535,26 @@ elseif(WIN32)
# gettext and png are statically linked on win64 # gettext and png are statically linked on win64
install( install(
FILES ${LIBDIR}/zlib/lib/zlib.dll FILES ${LIBDIR}/zlib/lib/zlib.dll
DESTINATION ${TARGETDIR}/ DESTINATION ${TARGETDIR}
) )
else() else()
install( install(
FILES FILES
${LIBDIR}/png/lib/libpng.dll ${LIBDIR}/png/lib/libpng.dll
${LIBDIR}/zlib/lib/zlib.dll ${LIBDIR}/zlib/lib/zlib.dll
DESTINATION ${TARGETDIR}/ DESTINATION ${TARGETDIR}
) )
endif() endif()
if(MSVC) if(MSVC)
install( install(
FILES ${LIBDIR}/pthreads/lib/pthreadVC2.dll FILES ${LIBDIR}/pthreads/lib/pthreadVC2.dll
DESTINATION ${TARGETDIR}/ DESTINATION ${TARGETDIR}
) )
else() else()
install( install(
FILES ${LIBDIR}/pthreads/lib/pthreadGC2.dll FILES ${LIBDIR}/pthreads/lib/pthreadGC2.dll
DESTINATION ${TARGETDIR}/ DESTINATION ${TARGETDIR}
) )
endif() endif()
@ -564,7 +566,7 @@ elseif(WIN32)
${LIBDIR}/ffmpeg/lib/avdevice-52.dll ${LIBDIR}/ffmpeg/lib/avdevice-52.dll
${LIBDIR}/ffmpeg/lib/avutil-50.dll ${LIBDIR}/ffmpeg/lib/avutil-50.dll
${LIBDIR}/ffmpeg/lib/swscale-0.dll ${LIBDIR}/ffmpeg/lib/swscale-0.dll
DESTINATION ${TARGETDIR}/ DESTINATION ${TARGETDIR}
) )
endif() endif()
@ -573,7 +575,7 @@ elseif(WIN32)
install( install(
FILES FILES
${LIBDIR}/sndfile/lib/libsndfile-1.dll ${LIBDIR}/sndfile/lib/libsndfile-1.dll
DESTINATION ${TARGETDIR}/ DESTINATION ${TARGETDIR}
) )
endif() endif()
@ -582,7 +584,7 @@ elseif(WIN32)
FILES FILES
${LIBDIR}/openal/lib/OpenAL32.dll ${LIBDIR}/openal/lib/OpenAL32.dll
${LIBDIR}/openal/lib/wrap_oal.dll ${LIBDIR}/openal/lib/wrap_oal.dll
DESTINATION ${TARGETDIR}/ DESTINATION ${TARGETDIR}
) )
endif() endif()
@ -591,7 +593,7 @@ elseif(WIN32)
install( install(
FILES FILES
${LIBDIR}/sdl/lib/SDL.dll ${LIBDIR}/sdl/lib/SDL.dll
DESTINATION ${TARGETDIR}/ DESTINATION ${TARGETDIR}
) )
endif() endif()
endif() endif()
@ -600,13 +602,13 @@ elseif(WIN32)
install( install(
FILES FILES
${LIBDIR}/thumbhandler/lib/BlendThumb.dll ${LIBDIR}/thumbhandler/lib/BlendThumb.dll
DESTINATION ${TARGETDIR}/ DESTINATION ${TARGETDIR}
) )
else() else()
install( install(
FILES FILES
${LIBDIR}/thumbhandler/lib/BlendThumb64.dll ${LIBDIR}/thumbhandler/lib/BlendThumb64.dll
DESTINATION ${TARGETDIR}/ DESTINATION ${TARGETDIR}
) )
endif() endif()
@ -660,7 +662,7 @@ elseif(APPLE)
install( install(
FILES ${SOURCEDIR}/Contents/PkgInfo FILES ${SOURCEDIR}/Contents/PkgInfo
DESTINATION ${TARGETDIR}/blender.app/Contents/ DESTINATION ${TARGETDIR}/blender.app/Contents
) )
install_dir( install_dir(