diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2010-02-13 13:55:04 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2010-02-13 13:55:04 +0300 |
| commit | 6c9aa76d2141d527eee086db8398db4b3cd5bb84 (patch) | |
| tree | dd9f7fb02e1f686b617d936e8cbb7601a6e3d3dc | |
| parent | ea8c807db004f33aa76f9df74c6449adf22e66e1 (diff) | |
revert joes commit and apply change from Aligorith.
remove scripts dir only.
| -rw-r--r-- | SConstruct | 7 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | tools/btools.py | 2 |
3 files changed, 7 insertions, 9 deletions
diff --git a/SConstruct b/SConstruct index 9d57b230770..aa151e4e04c 100644 --- a/SConstruct +++ b/SConstruct @@ -193,9 +193,10 @@ if not env['BF_FANCY']: # NOTE: only do the scripts directory for now, otherwise is too disruptive for developers # TODO: perhaps we need an option (off by default) to not do this altogether... if not env['WITHOUT_BF_INSTALL'] and not env['WITHOUT_BF_OVERWRITE_INSTALL']: - if os.path.isdir(env['BF_INSTALLDIR']): - print B.bc.OKGREEN + "Clearing installation directory%s: %s" % (B.bc.ENDC, os.path.abspath(env['BF_INSTALLDIR'])) - shutil.rmtree(env['BF_INSTALLDIR']) + scriptsDir = env['BF_INSTALLDIR'] + os.sep + '.blender' + os.sep + 'scripts' + if os.path.isdir(scriptsDir): + print B.bc.OKGREEN + "Clearing installation directory%s: %s" % (B.bc.ENDC, os.path.abspath(scriptsDir)) + shutil.rmtree(scriptsDir) SetOption('num_jobs', int(env['BF_NUMJOBS'])) diff --git a/source/blender/makesrna/intern/CMakeLists.txt b/source/blender/makesrna/intern/CMakeLists.txt index f3e8ec8f58f..32c10cf5edb 100644 --- a/source/blender/makesrna/intern/CMakeLists.txt +++ b/source/blender/makesrna/intern/CMakeLists.txt @@ -42,9 +42,7 @@ SET(SRC INCLUDE_DIRECTORIES(../../../../intern/guardedalloc .. ../../makesdna ../../blenkernel ../../blenlib ../../ikplugin ../../windowmanager ../../editors/include ../../gpu ../../imbuf ../../render/extern/include .) FILE(GLOB INC_FILES ../*.h ../../makesdna/*.h) -IF(WITH_PYTHON) - -ELSE(WITH_PYTHON) +IF(NOT WITH_PYTHON) ADD_DEFINITIONS(-DDISABLE_PYTHON) ENDIF(WITH_PYTHON) @@ -103,9 +101,9 @@ ADD_EXECUTABLE(makesrna ${SRC} ${INC_FILES}) TARGET_LINK_LIBRARIES(makesrna bf_dna) # Output rna_*_gen.c +# note (linux only): with crashes try add this after COMMAND: valgrind --leak-check=full --track-origins=yes ADD_CUSTOM_COMMAND( OUTPUT ${GENSRC} - # with crashes try add this after COMMAND: valgrind --leak-check=full --track-origins=yes COMMAND ${CMAKE_BINARY_DIR}/bin/${CMAKE_CFG_INTDIR}/makesrna ${CMAKE_CURRENT_BINARY_DIR}/ DEPENDS makesrna ) @@ -115,4 +113,3 @@ SET(SRC rna_access.c ${GENSRC}) BLENDERLIB(bf_rna "${SRC}" "${INC}") MESSAGE(STATUS "Configuring makesrna") - diff --git a/tools/btools.py b/tools/btools.py index b806724a3f8..4cb86ecee62 100644 --- a/tools/btools.py +++ b/tools/btools.py @@ -408,7 +408,7 @@ def read_opts(cfg, args): (BoolVariable('BF_SPLIT_SRC', 'Split src lib into several chunks if true', False)), (BoolVariable('WITHOUT_BF_INSTALL', 'dont install if true', False)), (BoolVariable('WITHOUT_BF_PYTHON_INSTALL', 'dont install Python modules if true', False)), - (BoolVariable('WITHOUT_BF_OVERWRITE_INSTALL', 'dont remove existing files before breating the new install directory (set to False when making packages for others)', True)), + (BoolVariable('WITHOUT_BF_OVERWRITE_INSTALL', 'dont remove existing files before breating the new install directory (set to False when making packages for others)', False)), (BoolVariable('BF_FANCY', 'Enable fancy output if true', True)), (BoolVariable('BF_QUIET', 'Enable silent output if true', True)), (BoolVariable('BF_LINE_OVERWRITE', 'Enable overwriting of compile line in BF_QUIET mode if true', False)), |