diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-02-09 03:45:16 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-02-09 03:45:16 +0300 |
| commit | 711ba795f7abbae9d8315cda5a7221d6f18e13bc (patch) | |
| tree | a2e92b8e2333fbc2382bd4a3c853581fa4b0c54b | |
| parent | 32e3aac6bccb99fffa28dd4f26b26aecfea72929 (diff) | |
ignore __pycache__ dir for scons and cmake installation (py3.2 caches modules here).
| -rw-r--r-- | SConstruct | 8 | ||||
| -rw-r--r-- | source/creator/CMakeLists.txt | 1 |
2 files changed, 6 insertions, 3 deletions
diff --git a/SConstruct b/SConstruct index 03e61cd06b6..fe60d41c48d 100644 --- a/SConstruct +++ b/SConstruct @@ -489,11 +489,13 @@ if env['OURPLATFORM']!='darwin': 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)) diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index 2c89c3b6b9f..64f117c2bcd 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -241,6 +241,7 @@ if(WITH_INSTALL) 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/ |