Revision: 34724
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=34724
Author: campbellbarton
Date: 2011-02-09 00:45:16 +0000 (Wed, 09 Feb 2011)
Log Message:
-----------
ignore __pycache__ dir for scons and cmake installation (py3.2 caches modules
here).
Modified Paths:
--------------
trunk/blender/SConstruct
trunk/blender/source/creator/CMakeLists.txt
Modified: trunk/blender/SConstruct
===================================================================
--- trunk/blender/SConstruct 2011-02-08 21:32:26 UTC (rev 34723)
+++ trunk/blender/SConstruct 2011-02-09 00:45:16 UTC (rev 34724)
@@ -489,11 +489,13 @@
dn.remove('.svn')
if '_svn' in dn:
dn.remove('_svn')
-
+ if '__pycache__' in dn: # py3.2 cache dir
+ dn.remove('__pycache__')
+
dir = os.path.join(env['BF_INSTALLDIR'], VERSION)
dir += os.sep + os.path.basename(scriptpath) +
dp[len(scriptpath):]
-
- source=[os.path.join(dp, f) for f in df if f[-3:]!='pyc']
+
+ source=[os.path.join(dp, f) for f in df if not
f.endswith(".pyc")]
# To ensure empty dirs are created too
if len(source)==0:
env.Execute(Mkdir(dir))
Modified: trunk/blender/source/creator/CMakeLists.txt
===================================================================
--- trunk/blender/source/creator/CMakeLists.txt 2011-02-08 21:32:26 UTC (rev
34723)
+++ trunk/blender/source/creator/CMakeLists.txt 2011-02-09 00:45:16 UTC (rev
34724)
@@ -241,6 +241,7 @@
DESTINATION
${CMAKE_INSTALL_PREFIX}/share/blender/${BLENDER_VERSION}/scripts
PATTERN ".svn" EXCLUDE
PATTERN "*.pyc" EXCLUDE
+ PATTERN "__pycache__" EXCLUDE
)
install(
DIRECTORY
${CMAKE_SOURCE_DIR}/release/datafiles/brushicons/
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
