kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Skip .git files from submodules for install targets

Browse Source 
Also removed .svn checks when it's not longer needed.
Some further tweaks (probably for OSX bundler) are
likely needed.
This commit is contained in:
Sergey Sharybin 2013-11-17 00:18:21 +06:00
parent 9c3586d9f9
commit 891a037e9b
2 changed files with 8 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
SConstruct
View File

@ -784,6 +784,8 @@ if env['OURPLATFORM']=='darwin':
dn.remove('.svn') dn.remove('.svn')
if '_svn' in dn: if '_svn' in dn:
dn.remove('_svn') dn.remove('_svn')
if '.git' in df:
df.remove('.git')
dir=env['BF_INSTALLDIR']+dp[len(bundledir):] dir=env['BF_INSTALLDIR']+dp[len(bundledir):]
source=[dp+os.sep+f for f in df] source=[dp+os.sep+f for f in df]
blenderinstall.append(env.Install(dir=dir,source=source)) blenderinstall.append(env.Install(dir=dir,source=source))
@ -813,10 +815,8 @@ if env['OURPLATFORM']!='darwin':
scriptpaths=['release/scripts'] scriptpaths=['release/scripts']
for scriptpath in scriptpaths: for scriptpath in scriptpaths:
for dp, dn, df in os.walk(scriptpath): for dp, dn, df in os.walk(scriptpath):
if '.svn' in dn: if '.git' in df:
dn.remove('.svn') df.remove('.git')
if '_svn' in dn:
dn.remove('_svn')
if '__pycache__' in dn: # py3.2 cache dir if '__pycache__' in dn: # py3.2 cache dir
dn.remove('__pycache__') dn.remove('__pycache__')
@ -840,8 +840,6 @@ if env['OURPLATFORM']!='darwin':
# cycles python code # cycles python code
dir=os.path.join(env['BF_INSTALLDIR'], VERSION, 'scripts', 'addons','cycles') dir=os.path.join(env['BF_INSTALLDIR'], VERSION, 'scripts', 'addons','cycles')
source=os.listdir('intern/cycles/blender/addon') 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__') if '__pycache__' in source: source.remove('__pycache__')
source=['intern/cycles/blender/addon/'+s for s in source] source=['intern/cycles/blender/addon/'+s for s in source]
scriptinstall.append(env.Install(dir=dir,source=source)) scriptinstall.append(env.Install(dir=dir,source=source))
@ -849,8 +847,6 @@ if env['OURPLATFORM']!='darwin':
# cycles kernel code # cycles kernel code
dir=os.path.join(env['BF_INSTALLDIR'], VERSION, 'scripts', 'addons','cycles', 'kernel') dir=os.path.join(env['BF_INSTALLDIR'], VERSION, 'scripts', 'addons','cycles', 'kernel')
source=os.listdir('intern/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__') if '__pycache__' in source: source.remove('__pycache__')
source.remove('kernel.cpp') source.remove('kernel.cpp')
source.remove('CMakeLists.txt') source.remove('CMakeLists.txt')
@ -867,16 +863,12 @@ if env['OURPLATFORM']!='darwin':
# svm # svm
dir=os.path.join(env['BF_INSTALLDIR'], VERSION, 'scripts', 'addons','cycles', 'kernel', 'svm') dir=os.path.join(env['BF_INSTALLDIR'], VERSION, 'scripts', 'addons','cycles', 'kernel', 'svm')
source=os.listdir('intern/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__') if '__pycache__' in source: source.remove('__pycache__')
source=['intern/cycles/kernel/svm/'+s for s in source] source=['intern/cycles/kernel/svm/'+s for s in source]
scriptinstall.append(env.Install(dir=dir,source=source)) scriptinstall.append(env.Install(dir=dir,source=source))
# closure # closure
dir=os.path.join(env['BF_INSTALLDIR'], VERSION, 'scripts', 'addons','cycles', 'kernel', 'closure') dir=os.path.join(env['BF_INSTALLDIR'], VERSION, 'scripts', 'addons','cycles', 'kernel', 'closure')
source=os.listdir('intern/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__') if '__pycache__' in source: source.remove('__pycache__')
source=['intern/cycles/kernel/closure/'+s for s in source] source=['intern/cycles/kernel/closure/'+s for s in source]
scriptinstall.append(env.Install(dir=dir,source=source)) scriptinstall.append(env.Install(dir=dir,source=source))
@ -884,8 +876,6 @@ if env['OURPLATFORM']!='darwin':
# licenses # licenses
dir=os.path.join(env['BF_INSTALLDIR'], VERSION, 'scripts', 'addons','cycles', 'license') dir=os.path.join(env['BF_INSTALLDIR'], VERSION, 'scripts', 'addons','cycles', 'license')
source=os.listdir('intern/cycles/doc/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__') if '__pycache__' in source: source.remove('__pycache__')
source.remove('CMakeLists.txt') source.remove('CMakeLists.txt')
source=['intern/cycles/doc/license/'+s for s in source] 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') colormanagement = os.path.join('release', 'datafiles', 'colormanagement')
for dp, dn, df in os.walk(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.path.join(env['BF_INSTALLDIR'], VERSION, 'datafiles')
dir += os.sep + os.path.basename(colormanagement) + dp[len(colormanagement):] dir += os.sep + os.path.basename(colormanagement) + dp[len(colormanagement):]
@ -946,10 +931,8 @@ if env['OURPLATFORM']!='darwin':
for intpath in internationalpaths: for intpath in internationalpaths:
for dp, dn, df in os.walk(intpath): for dp, dn, df in os.walk(intpath):
if '.svn' in dn: if '.git' in df:
dn.remove('.svn') df.remove('.git')
if '_svn' in dn:
dn.remove('_svn')
# we only care about release/datafiles/fonts, release/datafiles/locales # we only care about release/datafiles/fonts, release/datafiles/locales
if check_path(dp, "fonts"): if check_path(dp, "fonts"):
@ -984,10 +967,6 @@ if env['OURPLATFORM']=='linux':
icontargetlist = [] icontargetlist = []
for tp, tn, tf in os.walk('release/freedesktop/icons'): 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: for f in tf:
iconlist.append(os.path.join(tp, f)) iconlist.append(os.path.join(tp, f))
icontargetlist.append( os.path.join(*([env['BF_INSTALLDIR']] + tp.split(os.sep)[2:] + [f])) ) icontargetlist.append( os.path.join(*([env['BF_INSTALLDIR']] + tp.split(os.sep)[2:] + [f])) )
@ -1013,10 +992,6 @@ if env['OURPLATFORM']=='linuxcross':
textlist = [] textlist = []
texttargetlist = [] texttargetlist = []
for tp, tn, tf in os.walk('release/text'): 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: for f in tf:
textlist.append(tp+os.sep+f) textlist.append(tp+os.sep+f)

6
source/creator/CMakeLists.txt
View File

@ -306,7 +306,7 @@ if(WITH_PYTHON)
install( install(
DIRECTORY ${CMAKE_SOURCE_DIR}/release/scripts DIRECTORY ${CMAKE_SOURCE_DIR}/release/scripts
DESTINATION ${TARGETDIR_VER} DESTINATION ${TARGETDIR_VER}
PATTERN ".svn" EXCLUDE PATTERN ".git" EXCLUDE
PATTERN "__pycache__" EXCLUDE PATTERN "__pycache__" EXCLUDE
PATTERN "${ADDON_EXCLUDE_CONDITIONAL}" EXCLUDE PATTERN "${ADDON_EXCLUDE_CONDITIONAL}" EXCLUDE
PATTERN "${FREESTYLE_EXCLUDE_CONDITIONAL}" EXCLUDE PATTERN "${FREESTYLE_EXCLUDE_CONDITIONAL}" EXCLUDE
@ -322,7 +322,6 @@ if(WITH_INTERNATIONAL)
DIRECTORY DIRECTORY
${CMAKE_SOURCE_DIR}/release/datafiles/fonts ${CMAKE_SOURCE_DIR}/release/datafiles/fonts
DESTINATION ${TARGETDIR_VER}/datafiles DESTINATION ${TARGETDIR_VER}/datafiles
PATTERN ".svn" EXCLUDE
) )
set(_locale_dir "${CMAKE_SOURCE_DIR}/release/datafiles/locale") set(_locale_dir "${CMAKE_SOURCE_DIR}/release/datafiles/locale")
@ -370,7 +369,6 @@ if(WITH_OPENCOLORIO)
install( install(
DIRECTORY ${CMAKE_SOURCE_DIR}/release/datafiles/colormanagement DIRECTORY ${CMAKE_SOURCE_DIR}/release/datafiles/colormanagement
DESTINATION ${TARGETDIR_VER}/datafiles DESTINATION ${TARGETDIR_VER}/datafiles
PATTERN ".svn" EXCLUDE
) )
endif() endif()
@ -447,7 +445,6 @@ if(UNIX AND NOT APPLE)
${CMAKE_SOURCE_DIR}/release/freedesktop/icons/48x48 ${CMAKE_SOURCE_DIR}/release/freedesktop/icons/48x48
${CMAKE_SOURCE_DIR}/release/freedesktop/icons/256x256 ${CMAKE_SOURCE_DIR}/release/freedesktop/icons/256x256
DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor
PATTERN ".svn" EXCLUDE
PATTERN "*.svg" EXCLUDE PATTERN "*.svg" EXCLUDE
) )
install( install(
@ -737,6 +734,7 @@ elseif(APPLE)
install( install(
DIRECTORY ${from} DIRECTORY ${from}
DESTINATION ${to} DESTINATION ${to}
PATTERN ".git" EXCLUDE
PATTERN ".svn" EXCLUDE PATTERN ".svn" EXCLUDE
PATTERN "*.pyc" EXCLUDE PATTERN "*.pyc" EXCLUDE
PATTERN "*.pyo" EXCLUDE PATTERN "*.pyo" EXCLUDE