revert joes commit and apply change from Aligorith.

remove scripts dir only.

diff --git a/SConstruct b/SConstruct
index 9d57b23077000ccb2fa43cd5792e6f855784c7f3..aa151e4e04ce78130acd9650b185f677d85af11b 100644 (file)
--- 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 f3e8ec8f58f5621a1400211460bd6bb5daedbf58..32c10cf5edb195b23df8d83e452a1db89ed32e31 100644 (file)
--- 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 b806724a3f8fa8a69299128f0be6ca19d5230f76..4cb86ecee6203f0502e59e09804130840b843f15 100644 (file)
--- 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)),