[Bf-blender-cvs] [891a037] master: Skip .git files from submodules for install targets
Sergey Sharybin
noreply at git.blender.org
Sat Nov 16 19:19:20 CET 2013
Commit: 891a037e9b4725b79117f6f2bc469b4b3a2eeeef
Author: Sergey Sharybin
Date: Sun Nov 17 00:18:21 2013 +0600
http://developer.blender.org/rB891a037e9b4725b79117f6f2bc469b4b3a2eeeef
Skip .git files from submodules for install targets
Also removed .svn checks when it's not longer needed.
Some further tweaks (probably for OSX bundler) are
likely needed.
===================================================================
M SConstruct
M source/creator/CMakeLists.txt
===================================================================
diff --git a/SConstruct b/SConstruct
index e15616e..8c27424 100644
--- a/SConstruct
+++ b/SConstruct
@@ -784,6 +784,8 @@ if env['OURPLATFORM']=='darwin':
dn.remove('.svn')
if '_svn' in dn:
dn.remove('_svn')
+ if '.git' in df:
+ df.remove('.git')
dir=env['BF_INSTALLDIR']+dp[len(bundledir):]
source=[dp+os.sep+f for f in df]
blenderinstall.append(env.Install(dir=dir,source=source))
@@ -813,10 +815,8 @@ if env['OURPLATFORM']!='darwin':
scriptpaths=['release/scripts']
for scriptpath in scriptpaths:
for dp, dn, df in os.walk(scriptpath):
- if '.svn' in dn:
- dn.remove('.svn')
- if '_svn' in dn:
- dn.remove('_svn')
+ if '.git' in df:
+ df.remove('.git')
if '__pycache__' in dn: # py3.2 cache dir
dn.remove('__pycache__')
@@ -840,8 +840,6 @@ if env['OURPLATFORM']!='darwin':
# cycles python code
dir=os.path.join(env['BF_INSTALLDIR'], VERSION, 'scripts', 'addons','cycles')
source=os.listdir('intern/cycles/blender/addon')
- if '.svn' in source: source.remove('.svn')
- if '_svn' in source: source.remove('_svn')
if '__pycache__' in source: source.remove('__pycache__')
source=['intern/cycles/blender/addon/'+s for s in source]
scriptinstall.append(env.Install(dir=dir,source=source))
@@ -849,8 +847,6 @@ if env['OURPLATFORM']!='darwin':
# cycles kernel code
dir=os.path.join(env['BF_INSTALLDIR'], VERSION, 'scripts', 'addons','cycles', 'kernel')
source=os.listdir('intern/cycles/kernel')
- if '.svn' in source: source.remove('.svn')
- if '_svn' in source: source.remove('_svn')
if '__pycache__' in source: source.remove('__pycache__')
source.remove('kernel.cpp')
source.remove('CMakeLists.txt')
@@ -867,16 +863,12 @@ if env['OURPLATFORM']!='darwin':
# svm
dir=os.path.join(env['BF_INSTALLDIR'], VERSION, 'scripts', 'addons','cycles', 'kernel', 'svm')
source=os.listdir('intern/cycles/kernel/svm')
- if '.svn' in source: source.remove('.svn')
- if '_svn' in source: source.remove('_svn')
if '__pycache__' in source: source.remove('__pycache__')
source=['intern/cycles/kernel/svm/'+s for s in source]
scriptinstall.append(env.Install(dir=dir,source=source))
# closure
dir=os.path.join(env['BF_INSTALLDIR'], VERSION, 'scripts', 'addons','cycles', 'kernel', 'closure')
source=os.listdir('intern/cycles/kernel/closure')
- if '.svn' in source: source.remove('.svn')
- if '_svn' in source: source.remove('_svn')
if '__pycache__' in source: source.remove('__pycache__')
source=['intern/cycles/kernel/closure/'+s for s in source]
scriptinstall.append(env.Install(dir=dir,source=source))
@@ -884,8 +876,6 @@ if env['OURPLATFORM']!='darwin':
# licenses
dir=os.path.join(env['BF_INSTALLDIR'], VERSION, 'scripts', 'addons','cycles', 'license')
source=os.listdir('intern/cycles/doc/license')
- if '.svn' in source: source.remove('.svn')
- if '_svn' in source: source.remove('_svn')
if '__pycache__' in source: source.remove('__pycache__')
source.remove('CMakeLists.txt')
source=['intern/cycles/doc/license/'+s for s in source]
@@ -920,11 +910,6 @@ if env['OURPLATFORM']!='darwin':
colormanagement = os.path.join('release', 'datafiles', 'colormanagement')
for dp, dn, df in os.walk(colormanagement):
- if '.svn' in dn:
- dn.remove('.svn')
- if '_svn' in dn:
- dn.remove('_svn')
-
dir = os.path.join(env['BF_INSTALLDIR'], VERSION, 'datafiles')
dir += os.sep + os.path.basename(colormanagement) + dp[len(colormanagement):]
@@ -946,10 +931,8 @@ if env['OURPLATFORM']!='darwin':
for intpath in internationalpaths:
for dp, dn, df in os.walk(intpath):
- if '.svn' in dn:
- dn.remove('.svn')
- if '_svn' in dn:
- dn.remove('_svn')
+ if '.git' in df:
+ df.remove('.git')
# we only care about release/datafiles/fonts, release/datafiles/locales
if check_path(dp, "fonts"):
@@ -984,10 +967,6 @@ if env['OURPLATFORM']=='linux':
icontargetlist = []
for tp, tn, tf in os.walk('release/freedesktop/icons'):
- if '.svn' in tn:
- tn.remove('.svn')
- if '_svn' in tn:
- tn.remove('_svn')
for f in tf:
iconlist.append(os.path.join(tp, f))
icontargetlist.append( os.path.join(*([env['BF_INSTALLDIR']] + tp.split(os.sep)[2:] + [f])) )
@@ -1013,10 +992,6 @@ if env['OURPLATFORM']=='linuxcross':
textlist = []
texttargetlist = []
for tp, tn, tf in os.walk('release/text'):
- if '.svn' in tn:
- tn.remove('.svn')
- if '_svn' in tn:
- tn.remove('_svn')
for f in tf:
textlist.append(tp+os.sep+f)
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
index 495399b..cb745d4 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -306,7 +306,7 @@ if(WITH_PYTHON)
install(
DIRECTORY ${CMAKE_SOURCE_DIR}/release/scripts
DESTINATION ${TARGETDIR_VER}
- PATTERN ".svn" EXCLUDE
+ PATTERN ".git" EXCLUDE
PATTERN "__pycache__" EXCLUDE
PATTERN "${ADDON_EXCLUDE_CONDITIONAL}" EXCLUDE
PATTERN "${FREESTYLE_EXCLUDE_CONDITIONAL}" EXCLUDE
@@ -322,7 +322,6 @@ if(WITH_INTERNATIONAL)
DIRECTORY
${CMAKE_SOURCE_DIR}/release/datafiles/fonts
DESTINATION ${TARGETDIR_VER}/datafiles
- PATTERN ".svn" EXCLUDE
)
set(_locale_dir "${CMAKE_SOURCE_DIR}/release/datafiles/locale")
@@ -370,7 +369,6 @@ if(WITH_OPENCOLORIO)
install(
DIRECTORY ${CMAKE_SOURCE_DIR}/release/datafiles/colormanagement
DESTINATION ${TARGETDIR_VER}/datafiles
- PATTERN ".svn" EXCLUDE
)
endif()
@@ -447,7 +445,6 @@ if(UNIX AND NOT APPLE)
${CMAKE_SOURCE_DIR}/release/freedesktop/icons/48x48
${CMAKE_SOURCE_DIR}/release/freedesktop/icons/256x256
DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor
- PATTERN ".svn" EXCLUDE
PATTERN "*.svg" EXCLUDE
)
install(
@@ -737,6 +734,7 @@ elseif(APPLE)
install(
DIRECTORY ${from}
DESTINATION ${to}
+ PATTERN ".git" EXCLUDE
PATTERN ".svn" EXCLUDE
PATTERN "*.pyc" EXCLUDE
PATTERN "*.pyo" EXCLUDE
More information about the Bf-blender-cvs
mailing list