Merge branch 'master' into soc-2013-rigid_body_simsoc-2013-rigid_body_sim

Conflicts:
	intern/rigidbody/CMakeLists.txt
	release/datafiles/splash.png
	source/blender/editors/space_view3d/drawobject.c
	source/blender/makesdna/DNA_view3d_types.h

2 files changed, 102 insertions, 8 deletions

diff --git a/build_files/cmake/buildinfo.cmake b/build_files/cmake/buildinfo.cmake
index e68015e36d3..2cc92df15e7 100644
--- a/build_files/cmake/buildinfo.cmake
+++ b/build_files/cmake/buildinfo.cmake
@@ -1,16 +1,57 @@
 # This is called by cmake as an extermal process from
 # ./source/creator/CMakeLists.txt to write ./source/creator/buildinfo.h
 
-# The FindSubversion.cmake module is part of the standard distribution
-include(FindSubversion)
-
 # Extract working copy information for SOURCE_DIR into MY_XXX variables
 # with a default in case anything fails, for examble when using git-svn
-set(MY_WC_REVISION "unknown")
+set(MY_WC_HASH "unknown")
+set(MY_WC_BRANCH "unknown")
+set(MY_WC_COMMIT_TIMESTAMP 0)
+
 # Guess if this is a SVN working copy and then look up the revision
-if(EXISTS ${SOURCE_DIR}/.svn/)
-	if(Subversion_FOUND)
-		Subversion_WC_INFO(${SOURCE_DIR} MY)
+if(EXISTS ${SOURCE_DIR}/.git/)
+	# The FindSubversion.cmake module is part of the standard distribution
+	include(FindGit)
+	if(GIT_FOUND)
+		execute_process(COMMAND git rev-parse --short HEAD
+		                WORKING_DIRECTORY ${SOURCE_DIR}
+		                OUTPUT_VARIABLE MY_WC_HASH
+		                OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+		execute_process(COMMAND git rev-parse --abbrev-ref HEAD
+		                WORKING_DIRECTORY ${SOURCE_DIR}
+		                OUTPUT_VARIABLE MY_WC_BRANCH
+		                OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+		execute_process(COMMAND git log -1 --format=%ct
+		                WORKING_DIRECTORY ${SOURCE_DIR}
+		                OUTPUT_VARIABLE MY_WC_COMMIT_TIMESTAMP
+		                OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+		# Update GIT index before getting dirty files
+		execute_process(COMMAND git update-index -q --refresh
+		                WORKING_DIRECTORY ${SOURCE_DIR}
+		                OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+		execute_process(COMMAND git diff-index --name-only HEAD --
+		                WORKING_DIRECTORY ${SOURCE_DIR}
+		                OUTPUT_VARIABLE _git_changed_files
+		                OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+		if(NOT _git_changed_files STREQUAL "")
+			set(MY_WC_BRANCH "${MY_WC_BRANCH} (modified)")
+		else()
+			# Unpushed commits are also considered local odifications
+			execute_process(COMMAND git log @{u}..
+			                WORKING_DIRECTORY ${SOURCE_DIR}
+			                OUTPUT_VARIABLE _git_unpushed_log
+			                OUTPUT_STRIP_TRAILING_WHITESPACE)
+			if(NOT _git_unpushed_log STREQUAL "")
+				set(MY_WC_BRANCH "${MY_WC_BRANCH} (modified)")
+			endif()
+			unset(_git_unpushed_log)
+		endif()
+
+		unset(_git_changed_files)
 	endif()
 endif()
 
@@ -27,7 +68,9 @@ endif()
 
 # Write a file with the SVNVERSION define
 file(WRITE buildinfo.h.txt
-	"#define BUILD_REV \"${MY_WC_REVISION}\"\n"
+	"#define BUILD_HASH \"${MY_WC_HASH}\"\n"
+	"#define BUILD_COMMIT_TIMESTAMP ${MY_WC_COMMIT_TIMESTAMP}\n"
+	"#define BUILD_BRANCH \"${MY_WC_BRANCH}\"\n"
 	"#define BUILD_DATE \"${BUILD_DATE}\"\n"
 	"#define BUILD_TIME \"${BUILD_TIME}\"\n"
 )
diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake
index 9ded803f45b..e7e88ad5703 100644
--- a/build_files/cmake/macros.cmake
+++ b/build_files/cmake/macros.cmake
@@ -48,6 +48,24 @@ macro(list_insert_before
 	unset(_index)
 endmacro()
 
+function (list_assert_duplicates
+	list_id
+	)
+	
+	# message(STATUS "list data: ${list_id}")
+
+	list(LENGTH list_id _len_before)
+	list(REMOVE_DUPLICATES list_id)
+	list(LENGTH list_id _len_after)
+	# message(STATUS "list size ${_len_before} -> ${_len_after}")
+	if(NOT _len_before EQUAL _len_after)
+		message(FATAL_ERROR "duplicate found in list which should not contain duplicates: ${list_id}")
+	endif()
+	unset(_len_before)
+	unset(_len_after)
+endfunction()
+
+
 # foo_bar.spam --> foo_barMySuffix.spam
 macro(file_suffix
 	file_name_new file_name file_suffix
@@ -177,6 +195,11 @@ macro(blender_add_lib_nolist
 	# listed is helpful for IDE's (QtCreator/MSVC)
 	blender_source_group("${sources}")
 
+	list_assert_duplicates("${sources}")
+	list_assert_duplicates("${includes}")
+	# Not for system includes because they can resolve to the same path
+	# list_assert_duplicates("${includes_sys}")
+
 endmacro()
 
 
@@ -847,3 +870,31 @@ macro(svg_to_png
 	unset(_file_to)
 
 endmacro()
+
+macro(msgfmt_simple
+      file_from
+      list_to_add)
+
+	# remove ../'s
+	get_filename_component(_file_from_we ${file_from} NAME_WE)
+
+	get_filename_component(_file_from ${file_from} REALPATH)
+	get_filename_component(_file_to ${CMAKE_CURRENT_BINARY_DIR}/${_file_from_we}.mo REALPATH)
+
+	list(APPEND ${list_to_add} ${_file_to})
+
+	get_filename_component(_file_to_path ${_file_to} PATH)
+
+	add_custom_command(
+		OUTPUT  ${_file_to}
+		COMMAND ${CMAKE_COMMAND} -E make_directory ${_file_to_path}
+		COMMAND ${CMAKE_BINARY_DIR}/bin/${CMAKE_CFG_INTDIR}/msgfmt ${_file_from} ${_file_to}
+		DEPENDS msgfmt)
+
+	set_source_files_properties(${_file_to} PROPERTIES GENERATED TRUE)
+
+	unset(_file_from_we)
+	unset(_file_from)
+	unset(_file_to)
+	unset(_file_to_path)
+endmacro()