[Bf-committers] [Bf-blender-cvs] SVN commit: /data/svn/bf-blender [22528] branches/blender2.5/blender: copy the systems python to the install dir for re-distrobution ( non-osx unix), removed some unused stuff in makefiles

[Nicholas Bishop]

This seems to happen every time I rebuild; it's only a small delay,
but it is noticeable. Any way we can make it do it once and forget
about it?

-Nicholas

On Sun, Aug 16, 2009 at 2:14 PM, Campbell Barton<ideasman42 at gmail.com> wrote:
> Revision: 22528
>          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=22528
> Author:   campbellbarton
> Date:     2009-08-16 20:14:17 +0200 (Sun, 16 Aug 2009)
>
> Log Message:
> -----------
> copy the systems python to the install dir for re-distrobution (non-osx unix), removed some unused stuff in makefiles
>
> Modified Paths:
> --------------
>    branches/blender2.5/blender/release/Makefile
>    branches/blender2.5/blender/source/creator/CMakeLists.txt
>    branches/blender2.5/blender/source/gameengine/GamePlayer/netscape/src/Makefile
>
> Modified: branches/blender2.5/blender/release/Makefile
> ===================================================================
> --- branches/blender2.5/blender/release/Makefile        2009-08-16 17:42:09 UTC (rev 22527)
> +++ branches/blender2.5/blender/release/Makefile        2009-08-16 18:14:17 UTC (rev 22528)
> @@ -35,16 +35,6 @@
>  export DISTDIR=$(NAN_OBJDIR)/$(BLENDNAME)
>  export CONFDIR=$(DISTDIR)/.blender
>
> -ifeq ($(OS),beos)
> -   TAR="zip"
> -   TARFLAGS="-ry9"
> -   EXT0=""
> -   EXT1=".zip"
> -   COMPRESS=""
> -   EXT2=""
> -   NOPLUGINS?=true
> -endif
> -
>  ifeq ($(OS),$(findstring $(OS), "freebsd irix linux openbsd solaris"))
>    TAR="tar"
>    TARFLAGS="cf"
>
> Modified: branches/blender2.5/blender/source/creator/CMakeLists.txt
> ===================================================================
> --- branches/blender2.5/blender/source/creator/CMakeLists.txt   2009-08-16 17:42:09 UTC (rev 22527)
> +++ branches/blender2.5/blender/source/creator/CMakeLists.txt   2009-08-16 18:14:17 UTC (rev 22528)
> @@ -114,10 +114,36 @@
>     IF(WITH_PYTHON)
>       ADD_CUSTOM_COMMAND(
>         TARGET blender POST_BUILD MAIN_DEPENDENCY blender
> +        COMMENT "copying blender scripts..."
>         COMMAND cp -R ${CMAKE_SOURCE_DIR}/release/ui ${TARGETDIR}/.blender/
>         COMMAND cp -R ${CMAKE_SOURCE_DIR}/release/io ${TARGETDIR}/.blender/
>         COMMAND find ${TARGETDIR} -name "*.py?" -prune -exec rm -rf {} "\;"
>       )
> +
> +      # Copy the systems python into the install directory
> +      ADD_CUSTOM_COMMAND(
> +        TARGET blender POST_BUILD MAIN_DEPENDENCY blender
> +        COMMENT "copying a subset of the systems python..."
> +
> +        COMMAND mkdir ${TARGETDIR}/.blender/python # PYTHONPATH and PYTHONHOME is set here
> +        COMMAND mkdir ${TARGETDIR}/.blender/python/lib/
> +        COMMAND cp -R ${PYTHON_LIBPATH}/python${PYTHON_VERSION} ${TARGETDIR}/.blender/python/lib/
> +
> +        COMMAND rm -rf ${TARGETDIR}/.blender/python/lib/python${PYTHON_VERSION}/distutils
> +        COMMAND rm -rf ${TARGETDIR}/.blender/python/lib/python${PYTHON_VERSION}/lib2to3
> +        COMMAND rm -rf ${TARGETDIR}/.blender/python/lib/python${PYTHON_VERSION}/idlelib
> +        COMMAND rm -rf ${TARGETDIR}/.blender/python/lib/python${PYTHON_VERSION}/tkinter
> +        COMMAND rm -rf ${TARGETDIR}/.blender/python/lib/python${PYTHON_VERSION}/config
> +
> +        COMMAND rm -rf ${TARGETDIR}/.blender/python/lib/python${PYTHON_VERSION}/site-packages
> +        COMMAND mkdir ${TARGETDIR}/.blender/python/lib/python${PYTHON_VERSION}/site-packages    # python needs it.
> +
> +        COMMAND rm ${TARGETDIR}/.blender/python/lib/python${PYTHON_VERSION}/lib-dynload/_tkinter.so
> +        COMMAND find ${TARGETDIR}/.blender/python/lib/python${PYTHON_VERSION} -name "test" -prune -exec rm -rf {} "\;"
> +        COMMAND find ${TARGETDIR}/.blender/python/lib/python${PYTHON_VERSION} -name "*.py?" -exec rm -rf {} "\;"
> +        COMMAND find ${TARGETDIR}/.blender/python/lib/python${PYTHON_VERSION} -name "*.so"-exec strip -s {} "\;"
> +      )
> +
>     ENDIF(WITH_PYTHON)
>
>     ADD_CUSTOM_COMMAND(
>
> Modified: branches/blender2.5/blender/source/gameengine/GamePlayer/netscape/src/Makefile
> ===================================================================
> --- branches/blender2.5/blender/source/gameengine/GamePlayer/netscape/src/Makefile      2009-08-16 17:42:09 UTC (rev 22527)
> +++ branches/blender2.5/blender/source/gameengine/GamePlayer/netscape/src/Makefile      2009-08-16 18:14:17 UTC (rev 22528)
> @@ -59,9 +59,6 @@
>  CPPFLAGS += -I../../../Rasterizer
>  #CPPFLAGS += -I../../../Network/LoopBackNetwork
>
> -# physics
> -CPPFLAGS += -I../../../../sumo/Fuzzics/include
> -
>  # moto
>  CPPFLAGS += -I$(NAN_MOTO)/include
>
>
>
> _______________________________________________
> Bf-blender-cvs mailing list
> Bf-blender-cvs at blender.org
> http://lists.blender.org/mailman/listinfo/bf-blender-cvs
>