diff options
| -rw-r--r-- | SConstruct | 4 | ||||
| -rw-r--r-- | doc/blender-scons.txt | 11 | ||||
| -rw-r--r-- | intern/ghost/intern/GHOST_DisplayManager.cpp | 2 | ||||
| -rw-r--r-- | tools/Blender.py | 2 | ||||
| -rwxr-xr-x | tools/btools.py | 4 |
5 files changed, 19 insertions, 4 deletions
diff --git a/SConstruct b/SConstruct index 900049e0acc..0ef167eb9a8 100644 --- a/SConstruct +++ b/SConstruct @@ -429,7 +429,9 @@ if not env['WITH_BF_GAMEENGINE']: Depends(nsiscmd, allinstall) Default(B.program_list) -Default(installtarget) + +if not env['WITHOUT_BF_INSTALL']: + Default(installtarget) #------------ RELEASE # TODO: zipup the installation diff --git a/doc/blender-scons.txt b/doc/blender-scons.txt index 73aa7add7a6..8c71c31db0c 100644 --- a/doc/blender-scons.txt +++ b/doc/blender-scons.txt @@ -160,6 +160,17 @@ $Id$ for example, setting BF_QUICKDEBUG won't overwrite the contents of BF_DEBUG_LIBS. + Not installing + -------------- + + If you dont want to install the build result, you can use the following option either + on the commandline or in your user-config.py : + + WITHOUT_BF_INSTALL='true' + + by default, this is set to 'false', and so the build is installed + + Supported toolset ----------------- diff --git a/intern/ghost/intern/GHOST_DisplayManager.cpp b/intern/ghost/intern/GHOST_DisplayManager.cpp index b36143ee1a9..f806daee86b 100644 --- a/intern/ghost/intern/GHOST_DisplayManager.cpp +++ b/intern/ghost/intern/GHOST_DisplayManager.cpp @@ -116,7 +116,7 @@ GHOST_DisplayManager::getDisplaySetting( GHOST_TUns8 numDisplays; success = getNumDisplays(numDisplays); if (success == GHOST_kSuccess) { - if (display < numDisplays && index < m_settings[display].size()) { + if (display < numDisplays && ((GHOST_TUns8)index < m_settings[display].size())) { setting = m_settings[display][index]; } else { diff --git a/tools/Blender.py b/tools/Blender.py index 612ab57737d..601d3c3000d 100644 --- a/tools/Blender.py +++ b/tools/Blender.py @@ -328,7 +328,7 @@ def AppIt(target=None, source=None, env=None): commands.getoutput(cmd) cmd = 'chmod +x %s/%s.app/Contents/MacOS/%s'%(builddir,binary, binary) commands.getoutput(cmd) - cmd = 'find %s/%s.app -name CVS -prune -exec rm -rf {} \;'%(builddir, binary) + cmd = 'find %s/%s.app -name .svn -prune -exec rm -rf {} \;'%(builddir, binary) commands.getoutput(cmd) cmd = 'find %s/%s.app -name .DS_Store -exec rm -rf {} \;'%(builddir, binary) commands.getoutput(cmd) diff --git a/tools/btools.py b/tools/btools.py index 0e1fc81dcff..eb8f844df4d 100755 --- a/tools/btools.py +++ b/tools/btools.py @@ -54,7 +54,8 @@ def validate_arguments(args, bc): 'BF_PROFILE_FLAGS', 'LCGDIR', 'WITH_BF_VERSE', 'BF_VERSE_INCLUDE', 'VERSE_BUILD_BINARY', 'VERSE_BUILD_DIR', 'VERSE_REGEN_PROTO', - 'BF_TWEAK_MODE' + 'BF_TWEAK_MODE', + 'WITHOUT_BF_INSTALL' ] arg_list = ['BF_DEBUG', 'BF_QUIET', 'BF_CROSS', 'BF_UPDATE', @@ -296,6 +297,7 @@ def read_opts(cfg, args): (BoolOption('BF_BUILDINFO', 'Buildtime in splash if true', 'true')), (BoolOption('BF_TWEAK_MODE', 'Enable tweak mode if true', 'false')), + (BoolOption('WITHOUT_BF_INSTALL', 'dont install if true', 'false')), ) # end of opts.AddOptions() |