forked from bartvdbraak/blender
add the option of not installing to scons build system
settting WITHOUT_BF_INSTALL='true' will disable the copying to INSTALL_DIR you can use that in your user-config.py or commandline slipping in minor cleaning for Os X builds
This commit is contained in:
parent
6ab51ef2d7
commit
42b629a69b
@ -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
|
||||
|
@ -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
|
||||
-----------------
|
||||
|
||||
|
@ -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 {
|
||||
|
@ -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)
|
||||
|
@ -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()
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user