Added note that cmake/scons rules are automatically generated for extern/libmv

Also updated generation scripts and templates

5 files changed, 167 insertions, 143 deletions

diff --git a/extern/libmv/CMakeLists.txt b/extern/libmv/CMakeLists.txt
index 76fb36709cb..671520a76f8 100644
--- a/extern/libmv/CMakeLists.txt
+++ b/extern/libmv/CMakeLists.txt
@@ -22,6 +22,10 @@
 #
 # ***** END GPL LICENSE BLOCK *****
 
+# NOTEL This file is automatically generated by bundle.sh script
+#       If you're doing changes in this file, please update template
+#       in that script too
+
 set(INC
 	.
 	../Eigen3
diff --git a/extern/libmv/SConscript b/extern/libmv/SConscript
index 9c134934fa0..a2132e73f03 100644
--- a/extern/libmv/SConscript
+++ b/extern/libmv/SConscript
@@ -1,4 +1,9 @@
 #!/usr/bin/python
+
+# NOTEL 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
 
diff --git a/extern/libmv/bundle.sh b/extern/libmv/bundle.sh
index fb336c66d61..ca808e12d7e 100755
--- a/extern/libmv/bundle.sh
+++ b/extern/libmv/bundle.sh
@@ -33,14 +33,14 @@ rm -rf $tmp
 
 chmod 664 ./third_party/glog/src/windows/*.cc ./third_party/glog/src/windows/*.h ./third_party/glog/src/windows/glog/*.h
 
-sources=`find ./libmv -type f -iname '*.cc' -or -iname '*.cpp' -or -iname '*.c' | sed -r 's/^\.\//\t/'`
-headers=`find ./libmv -type f -iname '*.h' | sed -r 's/^\.\//\t/'`
+sources=`find ./libmv -type f -iname '*.cc' -or -iname '*.cpp' -or -iname '*.c' | sed -r 's/^\.\//\t/' | sort -d`
+headers=`find ./libmv -type f -iname '*.h' | sed -r 's/^\.\//\t/' | sort -d`
 
-third_sources=`find ./third_party -type f -iname '*.cc' -or -iname '*.cpp' -or -iname '*.c' | grep -v glog | sed -r 's/^\.\//\t/'`
-third_headers=`find ./third_party -type f -iname '*.h' | grep -v glog | sed -r 's/^\.\//\t/'`
+third_sources=`find ./third_party -type f -iname '*.cc' -or -iname '*.cpp' -or -iname '*.c' | grep -v glog | sed -r 's/^\.\//\t/' | sort`
+third_headers=`find ./third_party -type f -iname '*.h' | grep -v glog | sed -r 's/^\.\//\t/' | sort`
 
-third_glog_sources=`find ./third_party -type f -iname '*.cc' -or -iname '*.cpp' -or -iname '*.c' | grep glog | grep -v windows | sed -r 's/^\.\//\t\t/'`
-third_glog_headers=`find ./third_party -type f -iname '*.h' | grep glog | grep -v windows | sed -r 's/^\.\//\t\t/'`
+third_glog_sources=`find ./third_party -type f -iname '*.cc' -or -iname '*.cpp' -or -iname '*.c' | grep glog | grep -v windows | sed -r 's/^\.\//\t\t/' | sort`
+third_glog_headers=`find ./third_party -type f -iname '*.h' | grep glog | grep -v windows | sed -r 's/^\.\//\t\t/' | sort`
 
 src_dir=`find ./libmv -type f -iname '*.cc' -exec dirname {} \; -or -iname '*.cpp' -exec dirname {} \; -or -iname '*.c' -exec dirname {} \; | sed -r 's/^\.\//\t/' | sort | uniq`
 src_third_dir=`find ./third_party -type f -iname '*.cc' -exec dirname {} \; -or -iname '*.cpp' -exec dirname {} \; -or -iname '*.c' -exec dirname {} \; | sed -r 's/^\.\//\t/'  | sort | uniq`
@@ -89,7 +89,6 @@ for x in $src_dir $src_third_dir; do
 done
 
 cat > CMakeLists.txt << EOF
-# \$Id\$
 # ***** BEGIN GPL LICENSE BLOCK *****
 #
 # This program is free software; you can redistribute it and/or
@@ -114,17 +113,21 @@ cat > CMakeLists.txt << EOF
 #
 # ***** END GPL LICENSE BLOCK *****
 
+# NOTEL This file is automatically generated by bundle.sh script
+#       If you're doing changes in this file, please update template
+#       in that script too
+
 set(INC
 	.
 	../Eigen3
-	./third_party/ssba
-	./third_party/ldl/Include
+	third_party/ssba
+	third_party/ldl/Include
 	../colamd/Include
 )
 
 set(INC_SYS
-	${PNG_INCLUDE_DIR}
-	${ZLIB_INCLUDE_DIRS}
+	\${PNG_INCLUDE_DIR}
+	\${ZLIB_INCLUDE_DIRS}
 )
 
 set(SRC
@@ -139,7 +142,7 @@ ${headers}
 ${third_headers}
 )
 
-IF(WIN32)
+if(WIN32)
 	list(APPEND SRC
 		third_party/glog/src/logging.cc
 		third_party/glog/src/raw_logging.cc
@@ -167,28 +170,23 @@ IF(WIN32)
 	)
 
 	list(APPEND INC
-		./third_party/glog/src/windows
+		third_party/glog/src/windows
 	)
 
-	IF(NOT MINGW)
+	if(NOT MINGW)
 		list(APPEND INC
-			./third_party/msinttypes
+			third_party/msinttypes
 		)
-	ENDIF(MINGW)
-
-	list(APPEND INC
-		./third_party/glog/src/windows
-		./third_party/msinttypes
-	)
+	endif()
 
-	IF(MSVC)
+	if(MSVC)
 		set(MSVC_OFLAGS O1 O2 Ox)
 		foreach(FLAG \${MSVC_OFLAGS})
 			string(REPLACE "\${FLAG}" "Od" CMAKE_CXX_FLAGS_RELEASE "\${CMAKE_CXX_FLAGS_RELEASE}")
 			string(REPLACE "\${FLAG}" "Od" CMAKE_C_FLAGS_RELWITHDEBINFO "\${CMAKE_C_FLAGS_RELWITHDEBINFO}")
 		endforeach()
-	ENDIF(MSVC)
-ELSE(WIN32)
+	endif()
+else()
 	list(APPEND SRC
 ${third_glog_sources}
 
@@ -196,17 +194,25 @@ ${third_glog_headers}
 	)
 
 	list(APPEND INC
-		./third_party/glog/src
+		third_party/glog/src
 	)
-ENDIF(WIN32)
+endif()
 
-add_definitions(-DV3DLIB_ENABLE_SUITESPARSE -DGOOGLE_GLOG_DLL_DECL=)
+add_definitions(
+	-DV3DLIB_ENABLE_SUITESPARSE
+	-DGOOGLE_GLOG_DLL_DECL=
+)
 
 blender_add_lib(extern_libmv "\${SRC}" "\${INC}" "\${INC_SYS}")
 EOF
 
 cat > SConscript << EOF
 #!/usr/bin/python
+
+# NOTEL 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
 
@@ -230,7 +236,6 @@ incs += ' ' + env['BF_ZLIB_INC']
 
 if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'):
     incs += ' ./third_party/glog/src/windows ./third_party/glog/src/windows/glog'
-    incs += ' ./third_party/glog/src/windows ./third_party/glog/src/windows/glog'
     if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'):
         incs += ' ./third_party/msinttypes'
 ${win_src}
@@ -246,16 +251,16 @@ ${win_src}
             defs.append('NDEBUG')
     else:
         if not env['BF_DEBUG']:
-            cflags_libmv = Split(env['REL_CFLAGS'])
-            ccflags_libmv = Split(env['REL_CCFLAGS'])
-            cxxflags_libmv = Split(env['REL_CXXFLAGS'])
+            cflags_libmv += Split(env['REL_CFLAGS'])
+            ccflags_libmv += Split(env['REL_CCFLAGS'])
+            cxxflags_libmv += Split(env['REL_CXXFLAGS'])
 else:
     src += env.Glob("third_party/glog/src/*.cc")
     incs += ' ./third_party/glog/src'
     if not env['BF_DEBUG']:
-        cflags_libmv = Split(env['REL_CFLAGS'])
-        ccflags_libmv = Split(env['REL_CCFLAGS'])
-        cxxflags_libmv = Split(env['REL_CXXFLAGS'])
+        cflags_libmv += Split(env['REL_CFLAGS'])
+        ccflags_libmv += Split(env['REL_CCFLAGS'])
+        cxxflags_libmv += Split(env['REL_CXXFLAGS'])
 
 incs += ' ./third_party/ssba ./third_party/ldl/Include ../colamd/Include'
 
diff --git a/extern/libmv/files.txt b/extern/libmv/files.txt
index fe6be5d0b20..96dfd89828e 100644
--- a/extern/libmv/files.txt
+++ b/extern/libmv/files.txt
@@ -1,141 +1,151 @@
+libmv/base/id_generator.h
+libmv/base/scoped_ptr.h
+libmv/base/vector.h
+libmv/base/vector_utils.h
+libmv/image/array_nd.cc
+libmv/image/array_nd.h
+libmv/image/convolve.cc
+libmv/image/convolve.h
+libmv/image/image.h
+libmv/image/sample.h
+libmv/image/tuple.h
 libmv/logging/logging.h
+libmv/multiview/conditioning.cc
+libmv/multiview/conditioning.h
+libmv/multiview/euclidean_resection.cc
+libmv/multiview/euclidean_resection.h
+libmv/multiview/fundamental.cc
+libmv/multiview/fundamental.h
+libmv/multiview/nviewtriangulation.h
+libmv/multiview/projection.cc
+libmv/multiview/projection.h
+libmv/multiview/resection.h
+libmv/multiview/triangulation.cc
+libmv/multiview/triangulation.h
 libmv/numeric/dogleg.h
+libmv/numeric/function_derivative.h
 libmv/numeric/levenberg_marquardt.h
-libmv/numeric/poly.h
 libmv/numeric/numeric.cc
-libmv/numeric/function_derivative.h
-libmv/numeric/poly.cc
-libmv/numeric/tinyvector.cc
 libmv/numeric/numeric.h
-libmv/simple_pipeline/reconstruction.cc
-libmv/simple_pipeline/resect.h
-libmv/simple_pipeline/resect.cc
-libmv/simple_pipeline/reconstruction.h
+libmv/numeric/poly.cc
+libmv/numeric/poly.h
+libmv/simple_pipeline/bundle.cc
+libmv/simple_pipeline/bundle.h
+libmv/simple_pipeline/callbacks.cc
+libmv/simple_pipeline/callbacks.h
+libmv/simple_pipeline/camera_intrinsics.cc
 libmv/simple_pipeline/camera_intrinsics.h
-libmv/simple_pipeline/intersect.cc
+libmv/simple_pipeline/detect.cc
+libmv/simple_pipeline/detect.h
 libmv/simple_pipeline/initialize_reconstruction.cc
-libmv/simple_pipeline/camera_intrinsics.cc
+libmv/simple_pipeline/initialize_reconstruction.h
+libmv/simple_pipeline/intersect.cc
+libmv/simple_pipeline/intersect.h
 libmv/simple_pipeline/pipeline.cc
-libmv/simple_pipeline/tracks.h
-libmv/simple_pipeline/detect.h
-libmv/simple_pipeline/detect.cc
 libmv/simple_pipeline/pipeline.h
+libmv/simple_pipeline/reconstruction.cc
+libmv/simple_pipeline/reconstruction.h
+libmv/simple_pipeline/resect.cc
+libmv/simple_pipeline/resect.h
 libmv/simple_pipeline/tracks.cc
-libmv/simple_pipeline/bundle.cc
-libmv/simple_pipeline/intersect.h
-libmv/simple_pipeline/bundle.h
-libmv/simple_pipeline/initialize_reconstruction.h
-libmv/image/convolve.h
-libmv/image/tuple.h
-libmv/image/array_nd.h
-libmv/image/convolve.cc
-libmv/image/array_nd.cc
-libmv/image/sample.h
-libmv/image/image.h
+libmv/simple_pipeline/tracks.h
+libmv/tracking/brute_region_tracker.cc
+libmv/tracking/brute_region_tracker.h
+libmv/tracking/esm_region_tracker.cc
+libmv/tracking/esm_region_tracker.h
+libmv/tracking/hybrid_region_tracker.cc
+libmv/tracking/hybrid_region_tracker.h
+libmv/tracking/klt_region_tracker.cc
+libmv/tracking/klt_region_tracker.h
+libmv/tracking/lmicklt_region_tracker.cc
+libmv/tracking/lmicklt_region_tracker.h
 libmv/tracking/pyramid_region_tracker.cc
+libmv/tracking/pyramid_region_tracker.h
 libmv/tracking/region_tracker.h
-libmv/tracking/sad.cc
-libmv/tracking/trklt_region_tracker.cc
-libmv/tracking/klt_region_tracker.cc
+libmv/tracking/retrack_region_tracker.cc
 libmv/tracking/retrack_region_tracker.h
+libmv/tracking/sad.cc
 libmv/tracking/sad.h
-libmv/tracking/pyramid_region_tracker.h
+libmv/tracking/trklt_region_tracker.cc
 libmv/tracking/trklt_region_tracker.h
-libmv/tracking/retrack_region_tracker.cc
-libmv/tracking/klt_region_tracker.h
-libmv/base/id_generator.h
-libmv/base/vector.h
-libmv/base/scoped_ptr.h
-libmv/base/vector_utils.h
-libmv/multiview/projection.cc
-libmv/multiview/conditioning.cc
-libmv/multiview/nviewtriangulation.h
-libmv/multiview/resection.h
-libmv/multiview/fundamental.cc
-libmv/multiview/euclidean_resection.cc
-libmv/multiview/euclidean_resection.h
-libmv/multiview/triangulation.h
-libmv/multiview/projection.h
-libmv/multiview/triangulation.cc
-libmv/multiview/fundamental.h
-libmv/multiview/conditioning.h
-third_party/ssba/README.TXT
-third_party/ssba/COPYING.TXT
-third_party/ssba/Geometry/v3d_metricbundle.h
-third_party/ssba/Geometry/v3d_metricbundle.cpp
-third_party/ssba/Geometry/v3d_cameramatrix.h
-third_party/ssba/Geometry/v3d_distortion.h
-third_party/ssba/README.libmv
-third_party/ssba/Math/v3d_linear_utils.h
-third_party/ssba/Math/v3d_optimization.h
-third_party/ssba/Math/v3d_mathutilities.h
-third_party/ssba/Math/v3d_linear.h
-third_party/ssba/Math/v3d_optimization.cpp
-third_party/gflags/gflags_completions.h
-third_party/gflags/mutex.h
-third_party/gflags/gflags.cc
-third_party/gflags/gflags_reporting.cc
-third_party/gflags/README.libmv
-third_party/gflags/config.h
-third_party/gflags/gflags_completions.cc
-third_party/gflags/gflags.h
-third_party/fast/fast_9.c
 third_party/fast/fast_10.c
 third_party/fast/fast_11.c
-third_party/fast/fast.h
-third_party/fast/LICENSE
 third_party/fast/fast_12.c
+third_party/fast/fast_9.c
 third_party/fast/fast.c
+third_party/fast/fast.h
+third_party/fast/LICENSE
+third_party/fast/nonmax.c
 third_party/fast/README
 third_party/fast/README.libmv
-third_party/fast/nonmax.c
-third_party/ldl/Include/ldl.h
-third_party/ldl/CMakeLists.txt
-third_party/ldl/README.libmv
-third_party/ldl/Doc/ChangeLog
-third_party/ldl/Doc/lesser.txt
-third_party/ldl/README.txt
-third_party/ldl/Source/ldl.c
+third_party/gflags/config.h
+third_party/gflags/gflags.cc
+third_party/gflags/gflags_completions.cc
+third_party/gflags/gflags_completions.h
+third_party/gflags/gflags.h
+third_party/gflags/gflags_reporting.cc
+third_party/gflags/mutex.h
+third_party/gflags/README.libmv
+third_party/glog/AUTHORS
 third_party/glog/ChangeLog
 third_party/glog/COPYING
-third_party/glog/src/utilities.cc
-third_party/glog/src/utilities.h
-third_party/glog/src/symbolize.cc
-third_party/glog/src/stacktrace_generic-inl.h
+third_party/glog/NEWS
+third_party/glog/README
+third_party/glog/README.libmv
+third_party/glog/src/base/commandlineflags.h
+third_party/glog/src/base/googleinit.h
+third_party/glog/src/base/mutex.h
+third_party/glog/src/config_freebsd.h
+third_party/glog/src/config.h
+third_party/glog/src/config_linux.h
 third_party/glog/src/config_mac.h
-third_party/glog/src/vlog_is_on.cc
+third_party/glog/src/demangle.cc
+third_party/glog/src/demangle.h
+third_party/glog/src/glog/logging.h
+third_party/glog/src/glog/log_severity.h
+third_party/glog/src/glog/raw_logging.h
+third_party/glog/src/glog/vlog_is_on.h
+third_party/glog/src/logging.cc
+third_party/glog/src/raw_logging.cc
 third_party/glog/src/signalhandler.cc
+third_party/glog/src/stacktrace_generic-inl.h
 third_party/glog/src/stacktrace.h
+third_party/glog/src/stacktrace_libunwind-inl.h
+third_party/glog/src/stacktrace_powerpc-inl.h
 third_party/glog/src/stacktrace_x86_64-inl.h
+third_party/glog/src/stacktrace_x86-inl.h
+third_party/glog/src/symbolize.cc
 third_party/glog/src/symbolize.h
-third_party/glog/src/base/googleinit.h
-third_party/glog/src/base/mutex.h
-third_party/glog/src/base/commandlineflags.h
-third_party/glog/src/windows/preprocess.sh
-third_party/glog/src/windows/port.h
+third_party/glog/src/utilities.cc
+third_party/glog/src/utilities.h
+third_party/glog/src/vlog_is_on.cc
 third_party/glog/src/windows/config.h
-third_party/glog/src/windows/glog/raw_logging.h
-third_party/glog/src/windows/glog/vlog_is_on.h
 third_party/glog/src/windows/glog/logging.h
 third_party/glog/src/windows/glog/log_severity.h
+third_party/glog/src/windows/glog/raw_logging.h
+third_party/glog/src/windows/glog/vlog_is_on.h
 third_party/glog/src/windows/port.cc
-third_party/glog/src/logging.cc
-third_party/glog/src/stacktrace_powerpc-inl.h
-third_party/glog/src/stacktrace_x86-inl.h
-third_party/glog/src/demangle.cc
-third_party/glog/src/config.h
-third_party/glog/src/demangle.h
-third_party/glog/src/stacktrace_libunwind-inl.h
-third_party/glog/src/glog/raw_logging.h
-third_party/glog/src/glog/vlog_is_on.h
-third_party/glog/src/glog/logging.h
-third_party/glog/src/glog/log_severity.h
-third_party/glog/src/raw_logging.cc
-third_party/glog/src/config_linux.h
-third_party/glog/NEWS
-third_party/glog/README
-third_party/glog/README.libmv
-third_party/glog/AUTHORS
-third_party/msinttypes/stdint.h
+third_party/glog/src/windows/port.h
+third_party/glog/src/windows/preprocess.sh
+third_party/ldl/CMakeLists.txt
+third_party/ldl/Doc/ChangeLog
+third_party/ldl/Doc/lesser.txt
+third_party/ldl/Include/ldl.h
+third_party/ldl/README.libmv
+third_party/ldl/README.txt
+third_party/ldl/Source/ldl.c
 third_party/msinttypes/inttypes.h
 third_party/msinttypes/README.libmv
+third_party/msinttypes/stdint.h
+third_party/ssba/COPYING.TXT
+third_party/ssba/Geometry/v3d_cameramatrix.h
+third_party/ssba/Geometry/v3d_distortion.h
+third_party/ssba/Geometry/v3d_metricbundle.cpp
+third_party/ssba/Geometry/v3d_metricbundle.h
+third_party/ssba/Math/v3d_linear.h
+third_party/ssba/Math/v3d_linear_utils.h
+third_party/ssba/Math/v3d_mathutilities.h
+third_party/ssba/Math/v3d_optimization.cpp
+third_party/ssba/Math/v3d_optimization.h
+third_party/ssba/README.libmv
+third_party/ssba/README.TXT
diff --git a/extern/libmv/mkfiles.sh b/extern/libmv/mkfiles.sh
index 6618f2849ea..fe84c357de4 100755
--- a/extern/libmv/mkfiles.sh
+++ b/extern/libmv/mkfiles.sh
@@ -1,4 +1,4 @@
 #!/bin/sh
 
-find ./libmv/ -type f | sed -r 's/^\.\///' > files.txt
-find ./third_party/ -type f | sed -r 's/^\.\///' >> files.txt
+find ./libmv/ -type f | sed -r 's/^\.\///' | sort > files.txt
+find ./third_party/ -type f | sed -r 's/^\.\///' | sort >> files.txt