[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36120] trunk/blender: - fix for cmake when there is no version character.

[Campbell Barton]

Revision: 36120
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36120
Author:   campbellbarton
Date:     2011-04-12 16:20:41 +0000 (Tue, 12 Apr 2011)
Log Message:
-----------
- fix for cmake when there is no version character.
- link to release docs correctly from the splash page.

Modified Paths:
--------------
    trunk/blender/build_files/cmake/macros.cmake
    trunk/blender/source/blender/windowmanager/intern/wm_operators.c

Modified: trunk/blender/build_files/cmake/macros.cmake
===================================================================
--- trunk/blender/build_files/cmake/macros.cmake	2011-04-12 15:55:38 UTC (rev 36119)
+++ trunk/blender/build_files/cmake/macros.cmake	2011-04-12 16:20:41 UTC (rev 36120)
@@ -376,7 +376,8 @@
 	set(BLENDER_VERSION_CYCLE ${_out_version_cycle})
 
 	# for packaging, alpha to numbers
-	if(${BLENDER_VERSION_CHAR})
+	string(COMPARE EQUAL "${BLENDER_VERSION_CHAR}" "" _out_version_char_empty)
+	if(${_out_version_char_empty})
 		set(BLENDER_VERSION_CHAR_INDEX "0")
 	else()
 		set(_char_ls a b c d e f g h i j k l m n o p q r s t u v w q y z)
@@ -388,6 +389,7 @@
 
 	unset(_out_subversion)
 	unset(_out_version_char)
+	unset(_out_version_char_empty)
 	unset(_out_version_cycle)
 
 	# message(STATUS "Version (Internal): ${BLENDER_VERSION}.${BLENDER_SUBVERSION}, Version (external): ${BLENDER_VERSION}${BLENDER_VERSION_CHAR}-${BLENDER_VERSION_CYCLE}")

Modified: trunk/blender/source/blender/windowmanager/intern/wm_operators.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_operators.c	2011-04-12 15:55:38 UTC (rev 36119)
+++ trunk/blender/source/blender/windowmanager/intern/wm_operators.c	2011-04-12 16:20:41 UTC (rev 36120)
@@ -1139,7 +1139,7 @@
 	struct RecentFile *recent;
 	int i;
 	MenuType *mt= WM_menutype_find("USERPREF_MT_splash", TRUE);
-	char url[64];
+	char url[96];
 	
 #ifdef NAN_BUILDINFO
 	int ver_width, rev_width;
@@ -1197,7 +1197,12 @@
 	uiItemStringO(col, "Manual", ICON_URL, "WM_OT_url_open", "url", "http://wiki.blender.org/index.php/Doc:Manual");
 	uiItemStringO(col, "Blender Website", ICON_URL, "WM_OT_url_open", "url", "http://www.blender.org/");
 	uiItemStringO(col, "User Community", ICON_URL, "WM_OT_url_open", "url", "http://www.blender.org/community/user-community/"); // 
-	BLI_snprintf(url, sizeof(url), "http://www.blender.org/documentation/blender_python_api_%d_%d_%d", BLENDER_VERSION/100, BLENDER_VERSION%100, BLENDER_SUBVERSION);
+	if(strcmp(STRINGIFY(BLENDER_VERSION_CYCLE), "release")==0) {
+		BLI_snprintf(url, sizeof(url), "http://www.blender.org/documentation/blender_python_api_%d_%d" STRINGIFY(BLENDER_VERSION_CHAR) "_release", BLENDER_VERSION/100, BLENDER_VERSION%100);
+	}
+	else {
+		BLI_snprintf(url, sizeof(url), "http://www.blender.org/documentation/blender_python_api_%d_%d_%d", BLENDER_VERSION/100, BLENDER_VERSION%100, BLENDER_SUBVERSION);
+	}
 	uiItemStringO(col, "Python API Reference", ICON_URL, "WM_OT_url_open", "url", url);
 	uiItemL(col, "", ICON_NONE);