Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2016-01-04 12:20:48 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2016-01-04 12:20:48 +0300
commit5d99cde8229a481363f1439ea4a4c2af851b1cb1 (patch)
tree76ebd7548ddb8eee0c7039e7f154ac982b57e80f /extern/libmv
parent1eb5e0b6608b2c2bbc9813d9155ea379a5bc8ef4 (diff)
Remove SCons building system
While SCons building system was serving us really good for ages it's no longer having much attention by the developers and started to become quite a difficult task to maintain. What's even worse -- there started to be quite serious divergence between SCons and CMake which was only accumulating over the releases now. The fact that none of the active developers are really using SCons and that our main studio is also using CMake spotting bugs in the SCons builds became quite a difficult task and we aren't always spotting them in time. Meanwhile CMake became really mature building system which is available on every platform we support and arguably it's also easier and more robust to use. This commit includes: - Removal of actual SCons building system - Removal of SCons git submodule - Removal of documentation which is stored in the sources and covers SCons - Tweaks to the buildbot master to stop using SCons submodule (this change requires deploying to the server) - Tweaks to the install dependencies script to skip installing or mentioning SCons building system - Tweaks to various helper scripts to avoid mention of SCons folders/files as well Reviewers: mont29, dingto, dfelinto, lukastoenne, lukasstockner97, brecht, Severin, merwin, aligorith, psy-fi, campbellbarton, juicyfruit Reviewed By: campbellbarton, juicyfruit Differential Revision: https://developer.blender.org/D1680
Diffstat (limited to 'extern/libmv')
-rw-r--r--extern/libmv/SConscript68
-rwxr-xr-xextern/libmv/bundle.sh67
-rw-r--r--extern/libmv/third_party/SConscript3
-rw-r--r--extern/libmv/third_party/ceres/SConscript63
-rwxr-xr-xextern/libmv/third_party/ceres/bundle.sh66
5 files changed, 1 insertions, 266 deletions
diff --git a/extern/libmv/SConscript b/extern/libmv/SConscript
deleted file mode 100644
index c177f74c2b8..00000000000
--- a/extern/libmv/SConscript
+++ /dev/null
@@ -1,68 +0,0 @@
-# NOTE: This file is automatically generated by bundle.sh script
-# If you're doing changes in this file, please update template
-# in that script too
-
-import sys
-import os
-
-Import('env')
-
-defs = []
-incs = '.'
-
-if env['WITH_BF_LIBMV'] or (env['WITH_BF_CYCLES'] and env['WITH_BF_CYCLES_LOGGING']):
- defs.append('GOOGLE_GLOG_DLL_DECL=')
- defs.append('WITH_LIBMV_GUARDED_ALLOC')
- defs.append('LIBMV_NO_FAST_DETECTOR')
-
- incs += ' ../Eigen3 third_party/gflags third_party/gflags/gflags third_party/glog/src third_party/ceres/include third_party/ceres/config ../../intern/guardedalloc'
- incs += ' ' + env['BF_PNG_INC']
- incs += ' ' + env['BF_ZLIB_INC']
-
- if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc', 'win64-mingw'):
- incs += ' ./third_party/glog/src/windows ./third_party/glog/src/windows/glog'
- if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'):
- incs += ' ./third_party/msinttypes'
- else:
- incs += ' ./third_party/glog/src'
-
-if env['WITH_BF_LIBMV']:
- if not env['WITH_SHARED_PTR_SUPPORT']:
- print("-- Unable to find shared_ptr which is required for compilation.")
- exit(1)
-
- if env['SHARED_PTR_HEADER'] == 'tr1/memory':
- defs.append('CERES_TR1_MEMORY_HEADER')
- if env['SHARED_PTR_NAMESPACE'] == 'std::tr1':
- defs.append('CERES_TR1_SHARED_PTR')
-
- src = env.Glob('intern/*.cc')
- src.remove('intern' + os.sep + 'stub.cc')
- src += env.Glob('libmv/autotrack/*.cc')
- src += env.Glob('libmv/base/*.cc')
- src += env.Glob('libmv/image/*.cc')
- src += env.Glob('libmv/multiview/*.cc')
- src += env.Glob('libmv/numeric/*.cc')
- src += env.Glob('libmv/simple_pipeline/*.cc')
- src += env.Glob('libmv/tracking/*.cc')
-else:
- src = env.Glob("intern/stub.cc")
-
-src = [src for src in src if src.find('_test.cc') == -1]
-
-env.BlenderLib(libname = 'extern_libmv', sources=src, includes=Split(incs), defines=defs, libtype=['extern', 'player'], priority=[20,137])
-
-if env['WITH_BF_LIBMV'] or (env['WITH_BF_CYCLES'] and env['WITH_BF_CYCLES_LOGGING']):
- glog_src = []
- glog_src += env.Glob("third_party/gflags/*.cc")
- if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc', 'win64-mingw'):
- glog_src += ['./third_party/glog/src/logging.cc', './third_party/glog/src/raw_logging.cc', './third_party/glog/src/utilities.cc', './third_party/glog/src/vlog_is_on.cc']
- glog_src += ['./third_party/glog/src/windows/port.cc']
- else:
- glog_src.remove('third_party/gflags/windows_port.cc')
- glog_src += env.Glob("third_party/glog/src/*.cc")
-
- env.BlenderLib(libname = 'extern_glog', sources=glog_src, includes=Split(incs), defines=defs, libtype=['extern', 'player'], priority=[20,137])
-
-if env['WITH_BF_LIBMV']:
- SConscript(['third_party/SConscript'])
diff --git a/extern/libmv/bundle.sh b/extern/libmv/bundle.sh
index ac4190041bd..e9fb33e5930 100755
--- a/extern/libmv/bundle.sh
+++ b/extern/libmv/bundle.sh
@@ -18,7 +18,7 @@ git --git-dir $tmp/libmv/.git --work-tree $tmp/libmv log -n 50 > ChangeLog
find libmv -type f -not -iwholename '*.svn*' -exec rm -rf {} \;
find third_party -type f -not -iwholename '*.svn*' -not -iwholename '*third_party/ceres*' \
- -not -iwholename '*third_party/SConscript*' -not -iwholename '*third_party/CMakeLists.txt*' \
+ -not -iwholename '*third_party/CMakeLists.txt*' \
-exec rm -rf {} \;
cat "files.txt" | while read f; do
@@ -277,68 +277,3 @@ ${third_glog_headers}
blender_add_lib(extern_glog "\${GLOG_SRC}" "\${INC}" "\${INC_SYS}")
endif()
EOF
-
-cat > SConscript << EOF
-# NOTE: This file is automatically generated by bundle.sh script
-# If you're doing changes in this file, please update template
-# in that script too
-
-import sys
-import os
-
-Import('env')
-
-defs = []
-incs = '.'
-
-if env['WITH_BF_LIBMV'] or (env['WITH_BF_CYCLES'] and env['WITH_BF_CYCLES_LOGGING']):
- defs.append('GOOGLE_GLOG_DLL_DECL=')
- defs.append('WITH_LIBMV_GUARDED_ALLOC')
- defs.append('LIBMV_NO_FAST_DETECTOR')
-
- incs += ' ../Eigen3 third_party/gflags third_party/gflags/gflags third_party/glog/src third_party/ceres/include third_party/ceres/config ../../intern/guardedalloc'
- incs += ' ' + env['BF_PNG_INC']
- incs += ' ' + env['BF_ZLIB_INC']
-
- if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc', 'win64-mingw'):
- incs += ' ./third_party/glog/src/windows ./third_party/glog/src/windows/glog'
- if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'):
- incs += ' ./third_party/msinttypes'
- else:
- incs += ' ./third_party/glog/src'
-
-if env['WITH_BF_LIBMV']:
- if not env['WITH_SHARED_PTR_SUPPORT']:
- print("-- Unable to find shared_ptr which is required for compilation.")
- exit(1)
-
- if env['SHARED_PTR_HEADER'] == 'tr1/memory':
- defs.append('CERES_TR1_MEMORY_HEADER')
- if env['SHARED_PTR_NAMESPACE'] == 'std::tr1':
- defs.append('CERES_TR1_SHARED_PTR')
-
- src = env.Glob('intern/*.cc')
- src.remove('intern' + os.sep + 'stub.cc')
-$src
-else:
- src = env.Glob("intern/stub.cc")
-
-src = [src for src in src if src.find('_test.cc') == -1]
-
-env.BlenderLib(libname = 'extern_libmv', sources=src, includes=Split(incs), defines=defs, libtype=['extern', 'player'], priority=[20,137])
-
-if env['WITH_BF_LIBMV'] or (env['WITH_BF_CYCLES'] and env['WITH_BF_CYCLES_LOGGING']):
- glog_src = []
- glog_src += env.Glob("third_party/gflags/*.cc")
- if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc', 'win64-mingw'):
- glog_src += ['./third_party/glog/src/logging.cc', './third_party/glog/src/raw_logging.cc', './third_party/glog/src/utilities.cc', './third_party/glog/src/vlog_is_on.cc']
- glog_src += ['./third_party/glog/src/windows/port.cc']
- else:
- glog_src.remove('third_party/gflags/windows_port.cc')
- glog_src += env.Glob("third_party/glog/src/*.cc")
-
- env.BlenderLib(libname = 'extern_glog', sources=glog_src, includes=Split(incs), defines=defs, libtype=['extern', 'player'], priority=[20,137])
-
-if env['WITH_BF_LIBMV']:
- SConscript(['third_party/SConscript'])
-EOF
diff --git a/extern/libmv/third_party/SConscript b/extern/libmv/third_party/SConscript
deleted file mode 100644
index b05692e385f..00000000000
--- a/extern/libmv/third_party/SConscript
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/python
-
-SConscript(['ceres/SConscript'])
diff --git a/extern/libmv/third_party/ceres/SConscript b/extern/libmv/third_party/ceres/SConscript
deleted file mode 100644
index 7b46083f386..00000000000
--- a/extern/libmv/third_party/ceres/SConscript
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/usr/bin/env python
-
-# NOTE: This file is automatically generated by bundle.sh script
-# If you're doing changes in this file, please update template
-# in that script too
-
-import sys
-import os
-
-Import('env')
-
-src = []
-defs = []
-
-src += env.Glob('internal/ceres/*.cc')
-if env['WITH_BF_LIBMV_SCHUR_SPECIALIZATIONS']:
- src += env.Glob('internal/ceres/generated/*.cc')
-else:
- src += env.Glob('internal/ceres/generated/schur_eliminator_d_d_d.cc')
- src += env.Glob('internal/ceres/generated/partitioned_matrix_view_d_d_d.cc')
- defs.append('CERES_RESTRICT_SCHUR_SPECIALIZATION')
-
-defs.append('CERES_HAVE_PTHREAD')
-defs.append('CERES_NO_SUITESPARSE')
-defs.append('CERES_NO_CXSPARSE')
-defs.append('CERES_NO_LAPACK')
-defs.append('CERES_HAVE_RWLOCK')
-
-if env['WITH_BF_OPENMP']:
- defs.append('CERES_USE_OPENMP')
-
-if env['WITH_UNORDERED_MAP_SUPPORT']:
- if env['UNORDERED_MAP_HEADER'] == 'unordered_map':
- if env['UNORDERED_MAP_NAMESPACE'] == 'std':
- defs.append('CERES_STD_UNORDERED_MAP')
- elif env['UNORDERED_MAP_NAMESPACE'] == 'std::tr1':
- defs.append('CERES_STD_UNORDERED_MAP_IN_TR1_NAMESPACE')
- elif env['UNORDERED_MAP_NAMESPACE'] == 'std::tr1':
- defs.append('CERES_TR1_UNORDERED_MAP')
-else:
- print("-- Replacing unordered_map/set with map/set (warning: slower!)")
- defs.append('CERES_NO_UNORDERED_MAP')
-
-if not env['WITH_SHARED_PTR_SUPPORT']:
- print("-- Unable to find shared_ptr which is required for compilation.")
- exit(1)
-
-if env['SHARED_PTR_HEADER'] == 'tr1/memory':
- defs.append('CERES_TR1_MEMORY_HEADER')
-if env['SHARED_PTR_NAMESPACE'] == 'std::tr1':
- defs.append('CERES_TR1_SHARED_PTR')
-
-incs = '. ../../ ../../../Eigen3 ./include ./internal ../gflags ./config'
-
-if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc', 'win64-mingw'):
- if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'):
- incs += ' ../msinttypes'
-
- incs += ' ../glog/src/windows'
-else:
- incs += ' ../glog/src'
-
-env.BlenderLib ( libname = 'extern_ceres', sources=src, includes=Split(incs), defines=defs, libtype=['extern', 'player'], priority=[20,137])
diff --git a/extern/libmv/third_party/ceres/bundle.sh b/extern/libmv/third_party/ceres/bundle.sh
index 0418356c6f4..85da4f2afc9 100755
--- a/extern/libmv/third_party/ceres/bundle.sh
+++ b/extern/libmv/third_party/ceres/bundle.sh
@@ -199,69 +199,3 @@ endif()
blender_add_lib(extern_ceres "\${SRC}" "\${INC}" "\${INC_SYS}")
EOF
-
-cat > SConscript << EOF
-#!/usr/bin/env python
-
-# NOTE: This file is automatically generated by bundle.sh script
-# If you're doing changes in this file, please update template
-# in that script too
-
-import sys
-import os
-
-Import('env')
-
-src = []
-defs = []
-
-$src
-if env['WITH_BF_LIBMV_SCHUR_SPECIALIZATIONS']:
- src += env.Glob('internal/ceres/generated/*.cc')
-else:
- src += env.Glob('internal/ceres/generated/schur_eliminator_d_d_d.cc')
- src += env.Glob('internal/ceres/generated/partitioned_matrix_view_d_d_d.cc')
- defs.append('CERES_RESTRICT_SCHUR_SPECIALIZATION')
-
-defs.append('CERES_HAVE_PTHREAD')
-defs.append('CERES_NO_SUITESPARSE')
-defs.append('CERES_NO_CXSPARSE')
-defs.append('CERES_NO_LAPACK')
-defs.append('CERES_HAVE_RWLOCK')
-
-if env['WITH_BF_OPENMP']:
- defs.append('CERES_USE_OPENMP')
-
-if env['WITH_UNORDERED_MAP_SUPPORT']:
- if env['UNORDERED_MAP_HEADER'] == 'unordered_map':
- if env['UNORDERED_MAP_NAMESPACE'] == 'std':
- defs.append('CERES_STD_UNORDERED_MAP')
- elif env['UNORDERED_MAP_NAMESPACE'] == 'std::tr1':
- defs.append('CERES_STD_UNORDERED_MAP_IN_TR1_NAMESPACE')
- elif env['UNORDERED_MAP_NAMESPACE'] == 'std::tr1':
- defs.append('CERES_TR1_UNORDERED_MAP')
-else:
- print("-- Replacing unordered_map/set with map/set (warning: slower!)")
- defs.append('CERES_NO_UNORDERED_MAP')
-
-if not env['WITH_SHARED_PTR_SUPPORT']:
- print("-- Unable to find shared_ptr which is required for compilation.")
- exit(1)
-
-if env['SHARED_PTR_HEADER'] == 'tr1/memory':
- defs.append('CERES_TR1_MEMORY_HEADER')
-if env['SHARED_PTR_NAMESPACE'] == 'std::tr1':
- defs.append('CERES_TR1_SHARED_PTR')
-
-incs = '. ../../ ../../../Eigen3 ./include ./internal ../gflags ./config'
-
-if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc', 'win64-mingw'):
- if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'):
- incs += ' ../msinttypes'
-
- incs += ' ../glog/src/windows'
-else:
- incs += ' ../glog/src'
-
-env.BlenderLib ( libname = 'extern_ceres', sources=src, includes=Split(incs), defines=defs, libtype=['extern', 'player'], priority=[20,137])
-EOF