Revision: 27487
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=27487
Author: campbellbarton
Date: 2010-03-14 18:18:36 +0100 (Sun, 14 Mar 2010)
Log Message:
-----------
strip quites off buildinfo at startup (was doing this for splash screen and
python api)
Modified Paths:
--------------
trunk/blender/source/blender/python/intern/bpy_app.c
trunk/blender/source/blender/python/intern/bpy_interface.c
trunk/blender/source/blender/windowmanager/intern/wm_operators.c
trunk/blender/source/creator/buildinfo.c
trunk/blender/source/creator/creator.c
Modified: trunk/blender/source/blender/python/intern/bpy_app.c
===================================================================
--- trunk/blender/source/blender/python/intern/bpy_app.c 2010-03-14
16:36:41 UTC (rev 27486)
+++ trunk/blender/source/blender/python/intern/bpy_app.c 2010-03-14
17:18:36 UTC (rev 27487)
@@ -24,16 +24,18 @@
#include "bpy_app.h"
+#include "BLI_path_util.h"
+
#include "BKE_blender.h"
#include "BKE_global.h"
#include "structseq.h"
#ifdef BUILD_DATE
-extern const char * build_date;
-extern const char * build_time;
-extern const char * build_rev;
-extern const char * build_platform;
-extern const char * build_type;
+extern char build_date[];
+extern char build_time[];
+extern char build_rev[];
+extern char build_platform[];
+extern char build_type[];
#endif
static PyTypeObject BlenderAppType;
@@ -61,24 +63,9 @@
10
};
-static char *strip_quotes(char *buf, const char *input)
-{
- int i;
- strcpy(buf, input);
- if(buf[0]=='\0') return buf;
- while(buf[1] && (buf[0]=='"' || buf[0]=='\'')) buf++;
- if(buf[0]=='\0') return buf;
- i= strlen(buf) - 1;
- while(i>=0 && (buf[i]=='"' || buf[i]=='\'')) i--;
- buf[i+1]= '\0';
-
- return buf;
-}
-
static PyObject *make_app_info(void)
{
extern char bprogname[]; /* argv[0] from creator.c */
- char buf[256];
PyObject *app_info;
int pos = 0;
@@ -103,11 +90,11 @@
/* build info */
#ifdef BUILD_DATE
- SetStrItem(strip_quotes(buf, build_date));
- SetStrItem(strip_quotes(buf, build_time));
- SetStrItem(strip_quotes(buf, build_rev));
- SetStrItem(strip_quotes(buf, build_platform));
- SetStrItem(strip_quotes(buf, build_type));
+ SetStrItem(build_date);
+ SetStrItem(build_time);
+ SetStrItem(build_rev);
+ SetStrItem(build_platform);
+ SetStrItem(build_type);
#else
SetStrItem(strip_quotes(buf, "Unknown"));
SetStrItem(strip_quotes(buf, "Unknown"));
Modified: trunk/blender/source/blender/python/intern/bpy_interface.c
===================================================================
--- trunk/blender/source/blender/python/intern/bpy_interface.c 2010-03-14
16:36:41 UTC (rev 27486)
+++ trunk/blender/source/blender/python/intern/bpy_interface.c 2010-03-14
17:18:36 UTC (rev 27487)
@@ -526,13 +526,7 @@
}
#endif
-// #define TIME_REGISTRATION
-#ifdef TIME_REGISTRATION
-//(INCLUDE_LINT)#include "PIL_time.h"
-#endif
-
-
int BPY_button_eval(bContext *C, char *expr, double *value)
{
PyGILState_STATE gilstate;
Modified: trunk/blender/source/blender/windowmanager/intern/wm_operators.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_operators.c
2010-03-14 16:36:41 UTC (rev 27486)
+++ trunk/blender/source/blender/windowmanager/intern/wm_operators.c
2010-03-14 17:18:36 UTC (rev 27487)
@@ -1060,7 +1060,7 @@
char *revision_str = NULL;
char version_buf[128];
char revision_buf[128];
- extern char * build_rev;
+ extern char build_rev[];
char *cp;
version_str = &version_buf[0];
@@ -1069,16 +1069,6 @@
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;
- }
-
BLF_size(style->widgetlabel.points, U.dpi);
ver_width = BLF_width(version_str)+5;
rev_width = BLF_width(revision_str)+5;
Modified: trunk/blender/source/creator/buildinfo.c
===================================================================
--- trunk/blender/source/creator/buildinfo.c 2010-03-14 16:36:41 UTC (rev
27486)
+++ trunk/blender/source/creator/buildinfo.c 2010-03-14 17:18:36 UTC (rev
27487)
@@ -35,9 +35,9 @@
#define XSTRINGIFY(x) #x
#ifdef BUILD_DATE
-const char * build_date=STRINGIFY(BUILD_DATE);
-const char * build_time=STRINGIFY(BUILD_TIME);
-const char * build_rev=STRINGIFY(BUILD_REV);
-const char * build_platform=STRINGIFY(BUILD_PLATFORM);
-const char * build_type=STRINGIFY(BUILD_TYPE);
+char build_date[]= STRINGIFY(BUILD_DATE);
+char build_time[]= STRINGIFY(BUILD_TIME);
+char build_rev[]= STRINGIFY(BUILD_REV);
+char build_platform[]= STRINGIFY(BUILD_PLATFORM);
+char build_type[]= STRINGIFY(BUILD_TYPE);
#endif
Modified: trunk/blender/source/creator/creator.c
===================================================================
--- trunk/blender/source/creator/creator.c 2010-03-14 16:36:41 UTC (rev
27486)
+++ trunk/blender/source/creator/creator.c 2010-03-14 17:18:36 UTC (rev
27487)
@@ -107,11 +107,11 @@
// from buildinfo.c
#ifdef BUILD_DATE
-extern const char * build_date;
-extern const char * build_time;
-extern const char * build_rev;
-extern const char * build_platform;
-extern const char * build_type;
+extern char build_date[];
+extern char build_time[];
+extern char build_rev[];
+extern char build_platform[];
+extern char build_type[];
#endif
/* Local Function prototypes */
@@ -161,6 +161,18 @@
}
}
+/* buildinfo can have quotes */
+static void strip_quotes(char *str)
+{
+ if(str[0] == '"') {
+ int len= strlen(str) - 1;
+ memmove(str, str+1, len);
+ if(str[len-1] == '"') {
+ str[len-1]= '\0';
+ }
+ }
+}
+
static int print_version(int argc, char **argv, void *data)
{
#ifdef BUILD_DATE
@@ -936,7 +948,15 @@
if(blender_path_env)
BLI_strncpy(blender_path, blender_path_env,
sizeof(blender_path));
}
-
+
+#ifdef BUILD_DATE
+ strip_quotes(build_date);
+ strip_quotes(build_time);
+ strip_quotes(build_rev);
+ strip_quotes(build_platform);
+ strip_quotes(build_type);
+#endif
+
RNA_init();
RE_engines_init();
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
