[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [26861] trunk/blender: revert joes commit and apply change from Aligorith.

[Campbell Barton]

Revision: 26861
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=26861
Author:   campbellbarton
Date:     2010-02-13 11:55:04 +0100 (Sat, 13 Feb 2010)

Log Message:
-----------
revert joes commit and apply change from Aligorith.
remove scripts dir only.

Modified Paths:
--------------
    trunk/blender/SConstruct
    trunk/blender/source/blender/makesrna/intern/CMakeLists.txt
    trunk/blender/tools/btools.py

Modified: trunk/blender/SConstruct
===================================================================
--- trunk/blender/SConstruct	2010-02-13 10:05:06 UTC (rev 26860)
+++ trunk/blender/SConstruct	2010-02-13 10:55:04 UTC (rev 26861)
@@ -193,9 +193,10 @@
 # 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']))

Modified: trunk/blender/source/blender/makesrna/intern/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/makesrna/intern/CMakeLists.txt	2010-02-13 10:05:06 UTC (rev 26860)
+++ trunk/blender/source/blender/makesrna/intern/CMakeLists.txt	2010-02-13 10:55:04 UTC (rev 26861)
@@ -42,9 +42,7 @@
 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 @@
 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 @@
 BLENDERLIB(bf_rna "${SRC}" "${INC}")
 
 MESSAGE(STATUS "Configuring makesrna")
-

Modified: trunk/blender/tools/btools.py
===================================================================
--- trunk/blender/tools/btools.py	2010-02-13 10:05:06 UTC (rev 26860)
+++ trunk/blender/tools/btools.py	2010-02-13 10:55:04 UTC (rev 26861)
@@ -408,7 +408,7 @@
         (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)),