[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [25826] trunk/blender/source/blender: Added the svn revision number to the splash screen (when buildinfo is

[Matt Ebb]

Revision: 25826
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=25826
Author:   broken
Date:     2010-01-08 06:51:51 +0100 (Fri, 08 Jan 2010)

Log Message:
-----------
Added the svn revision number to the splash screen (when buildinfo is 
enabled). Also fixed cmake so buildinfo works.


Note to all:
** Please mention the revision number when making a bug report **

Modified Paths:
--------------
    trunk/blender/source/blender/editors/CMakeLists.txt
    trunk/blender/source/blender/editors/screen/CMakeLists.txt
    trunk/blender/source/blender/windowmanager/CMakeLists.txt
    trunk/blender/source/blender/windowmanager/intern/wm_operators.c

Modified: trunk/blender/source/blender/editors/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/editors/CMakeLists.txt	2010-01-08 03:55:06 UTC (rev 25825)
+++ trunk/blender/source/blender/editors/CMakeLists.txt	2010-01-08 05:51:51 UTC (rev 25826)
@@ -89,10 +89,9 @@
 	SET(INC ${INC} ${PTHREADS_INC})
 ENDIF(WIN32)
 
-# TODO buildinfo
-IF(BF_BUILDINFO)
+IF(WITH_BUILDINFO)
 	ADD_DEFINITIONS(-DNAN_BUILDINFO)
-ENDIF(BF_BUILDINFO)
+ENDIF(WITH_BUILDINFO)
 
 BLENDERLIB_NOLIST(bf_editors "${SRC}" "${INC}")
 

Modified: trunk/blender/source/blender/editors/screen/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/editors/screen/CMakeLists.txt	2010-01-08 03:55:06 UTC (rev 25825)
+++ trunk/blender/source/blender/editors/screen/CMakeLists.txt	2010-01-08 05:51:51 UTC (rev 25826)
@@ -70,10 +70,9 @@
 	SET(INC ${INC} ${PTHREADS_INC})
 ENDIF(WIN32)
 
-# TODO buildinfo
-IF(BF_BUILDINFO)
+IF(WITH_BUILDINFO)
 	ADD_DEFINITIONS(-DNAN_BUILDINFO)
-ENDIF(BF_BUILDINFO)
+ENDIF(WITH_BUILDINFO)
 
 BLENDERLIB_NOLIST(bf_editors "${SRC}" "${INC}")
 

Modified: trunk/blender/source/blender/windowmanager/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/windowmanager/CMakeLists.txt	2010-01-08 03:55:06 UTC (rev 25825)
+++ trunk/blender/source/blender/windowmanager/CMakeLists.txt	2010-01-08 05:51:51 UTC (rev 25826)
@@ -81,9 +81,8 @@
 	LIST(REMOVE_ITEM SRC "${CMAKE_CURRENT_SOURCE_DIR}/intern/wm_apple.c")
 ENDIF(WITH_COCOA)
 
-# TODO buildinfo
-IF(BF_BUILDINFO)
+IF(WITH_BUILDINFO)
 	ADD_DEFINITIONS(-DNAN_BUILDINFO)
-ENDIF(BF_BUILDINFO)
+ENDIF(WITH_BUILDINFO)
 
 BLENDERLIB_NOLIST(bf_windowmanager "${SRC}" "${INC}")

Modified: trunk/blender/source/blender/windowmanager/intern/wm_operators.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_operators.c	2010-01-08 03:55:06 UTC (rev 25825)
+++ trunk/blender/source/blender/windowmanager/intern/wm_operators.c	2010-01-08 05:51:51 UTC (rev 25826)
@@ -42,6 +42,8 @@
 
 #include "MEM_guardedalloc.h"
 
+#include "BLF_api.h"
+
 #include "PIL_time.h"
 
 #include "BLI_blenlib.h"
@@ -932,14 +934,45 @@
 	uiLayout *layout, *split, *col;
 	uiStyle *style= U.uistyles.first;
 	struct RecentFile *recent;
-	int i;
+	int i, ver_width, rev_width;
+	char *version_str = NULL;
+	char *revision_str = NULL;
 	
+#ifdef NAN_BUILDINFO
+	char version_buf[128];
+	char revision_buf[128];
+	extern char * build_rev;
+	char *cp;
+	
+	version_str = &version_buf[0];
+	revision_str = &revision_buf[0];
+	
+	sprintf(version_str, "%d.%02d.%d", BLENDER_VERSION/100, BLENDER_VERSION%100, BLENDER_SUBVERSION);
+	sprintf(revision_str, "r%s", build_rev);
+	
+	/* here on my system I get ugly double quotes around the revision number.
+	 * if so, clip it off: */
+	cp = strchr(revision_str, '"');
+	if (cp) {
+		memmove(cp, cp+1, strlen(cp+1));
+		cp = strchr(revision_str, '"');
+		if (cp)
+			*cp = 0;
+	}
+	
+	ver_width = BLF_width(version_str);
+	rev_width = BLF_width(revision_str)-7;
+#endif NAN_BUILDINFO
+	
 	block= uiBeginBlock(C, ar, "_popup", UI_EMBOSS);
 	uiBlockSetFlag(block, UI_BLOCK_KEEP_OPEN|UI_BLOCK_RET_1);
 	
 	but= uiDefBut(block, BUT_IMAGE, 0, "", 0, 10, 501, 282, NULL, 0.0, 0.0, 0, 0, "");
 	uiButSetFunc(but, wm_block_splash_close, block, NULL);
 	
+	uiDefBut(block, LABEL, 0, version_str, 500-ver_width, 282-24, ver_width, 20, NULL, 0, 0, 0, 0, NULL);
+	uiDefBut(block, LABEL, 0, revision_str, 500-rev_width, 282-36, rev_width, 20, NULL, 0, 0, 0, 0, NULL);
+	
 	uiBlockSetEmboss(block, UI_EMBOSSP);
 	
 	layout= uiBlockLayout(block, UI_LAYOUT_VERTICAL, UI_LAYOUT_MENU, 10, 10, 480, 110, style);