[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [32581] trunk/blender: * Enable compile and link flags to build info also on Windows and in SCons .
Nathan Letwory
nathan at letworyinteractive.com
Tue Oct 19 07:00:38 CEST 2010
Revision: 32581
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=32581
Author: jesterking
Date: 2010-10-19 07:00:36 +0200 (Tue, 19 Oct 2010)
Log Message:
-----------
* Enable compile and link flags to build info also on Windows and in SCons.
* Added build_system SCons or CMake
* Write the new build info also to system-info.txt
Modified Paths:
--------------
trunk/blender/build_files/scons/tools/Blender.py
trunk/blender/release/scripts/modules/sys_info.py
trunk/blender/source/blender/python/intern/bpy_app.c
trunk/blender/source/creator/CMakeLists.txt
trunk/blender/source/creator/buildinfo.c
trunk/blender/source/creator/creator.c
Modified: trunk/blender/build_files/scons/tools/Blender.py
===================================================================
--- trunk/blender/build_files/scons/tools/Blender.py 2010-10-19 04:29:05 UTC (rev 32580)
+++ trunk/blender/build_files/scons/tools/Blender.py 2010-10-19 05:00:36 UTC (rev 32581)
@@ -295,9 +295,15 @@
build_rev = '-UNKNOWN-'
if lenv['BF_DEBUG']:
build_type = "Debug"
+ build_cflags = ' '.join(lenv['CFLAGS'] + lenv['CCFLAGS'] + lenv['BF_DEBUG_CCFLAGS'] + lenv['CPPFLAGS'])
+ build_cxxflags = ' '.join(lenv['CCFLAGS'] + lenv['CXXFLAGS'] + lenv['CPPFLAGS'])
else:
build_type = "Release"
+ build_cflags = ' '.join(lenv['CFLAGS'] + lenv['CCFLAGS'] + lenv['REL_CFLAGS'] + lenv['REL_CCFLAGS'] + lenv['CPPFLAGS'])
+ build_cxxflags = ' '.join(lenv['CCFLAGS'] + lenv['CXXFLAGS'] + lenv['REL_CXXFLAGS'] + lenv['REL_CCFLAGS'] + lenv['CPPFLAGS'])
+ build_linkflags = ' '.join(lenv['PLATFORM_LINKFLAGS'])
+
obj = []
if lenv['BF_BUILDINFO']:
lenv.Append (CPPDEFINES = ['BUILD_TIME="%s"'%(build_time),
@@ -305,7 +311,12 @@
'BUILD_TYPE="%s"'%(build_type),
'BUILD_REV="%s"'%(build_rev),
'NAN_BUILDINFO',
- 'BUILD_PLATFORM="%s:%s"'%(platform.system(), platform.architecture()[0])])
+ 'BUILD_PLATFORM="%s:%s"'%(platform.system(), platform.architecture()[0]),
+ 'BUILD_CFLAGS=\\"%s\\"'%(build_cflags),
+ 'BUILD_CXXFLAGS=\\"%s\\"'%(build_cxxflags),
+ 'BUILD_LINKFLAGS=\\"%s\\"'%(build_linkflags),
+ 'BUILD_SYSTEM="SCons"'
+ ])
lenv.Append (CPPPATH = [root_build_dir+'source/blender/blenkernel'])
Modified: trunk/blender/release/scripts/modules/sys_info.py
===================================================================
--- trunk/blender/release/scripts/modules/sys_info.py 2010-10-19 04:29:05 UTC (rev 32580)
+++ trunk/blender/release/scripts/modules/sys_info.py 2010-10-19 05:00:36 UTC (rev 32581)
@@ -68,7 +68,11 @@
output.write('version {}, revision {}. {}\n'.format(bpy.app.version_string, bpy.app.build_revision, bpy.app.build_type))
output.write('build date: {}, {}\n'.format(bpy.app.build_date, bpy.app.build_time))
output.write('platform: {}\n'.format(bpy.app.build_platform))
- output.write('binary path: {}\n\n'.format(bpy.app.binary_path))
+ output.write('binary path: {}\n'.format(bpy.app.binary_path))
+ output.write('build cflags: {}\n'.format(bpy.app.build_cflags))
+ output.write('build cxxflags: {}\n'.format(bpy.app.build_cxxflags))
+ output.write('build linkflags: {}\n'.format(bpy.app.build_linkflags))
+ output.write('build system: {}\n'.format(bpy.app.build_system))
# python info
output.write('\nPython:\n')
Modified: trunk/blender/source/blender/python/intern/bpy_app.c
===================================================================
--- trunk/blender/source/blender/python/intern/bpy_app.c 2010-10-19 04:29:05 UTC (rev 32580)
+++ trunk/blender/source/blender/python/intern/bpy_app.c 2010-10-19 05:00:36 UTC (rev 32581)
@@ -42,6 +42,7 @@
extern char build_cflags[];
extern char build_cxxflags[];
extern char build_linkflags[];
+extern char build_system[];
#endif
static PyTypeObject BlenderAppType;
@@ -61,6 +62,7 @@
{"build_cflags", ""},
{"build_cxxflags", ""},
{"build_linkflags", ""},
+ {"build_system", ""},
{0}
};
@@ -105,6 +107,7 @@
SetStrItem(build_cflags);
SetStrItem(build_cxxflags);
SetStrItem(build_linkflags);
+ SetStrItem(build_system);
#else
SetStrItem("Unknown");
SetStrItem("Unknown");
@@ -114,6 +117,7 @@
SetStrItem("Unknown");
SetStrItem("Unknown");
SetStrItem("Unknown");
+ SetStrItem("Unknown");
#endif
#undef SetIntItem
Modified: trunk/blender/source/creator/CMakeLists.txt
===================================================================
--- trunk/blender/source/creator/CMakeLists.txt 2010-10-19 04:29:05 UTC (rev 32580)
+++ trunk/blender/source/creator/CMakeLists.txt 2010-10-19 05:00:36 UTC (rev 32581)
@@ -95,15 +95,19 @@
ENDIF(WIN32)
IF(WITH_BUILDINFO)
+ STRING(REPLACE " " "\ " BUILDINFO_CFLAGS ${CMAKE_C_FLAGS})
+ STRING(REPLACE " " "\ " BUILDINFO_CXXFLAGS ${CMAKE_CXX_FLAGS})
+ STRING(REPLACE " " "\ " BUILDINFO_LINKFLAGS ${PLATFORM_LINKFLAGS})
ADD_DEFINITIONS(
-DBUILD_DATE="${BUILD_DATE}"
-DBUILD_TIME="${BUILD_TIME}"
-DBUILD_REV="${BUILD_REV}"
-DBUILD_PLATFORM="${CMAKE_SYSTEM_NAME}"
-DBUILD_TYPE="${CMAKE_BUILD_TYPE}"
- -DBUILD_CFLAGS="${CMAKE_C_FLAGS}"
- -DBUILD_CXXFLAGS="${CMAKE_CXX_FLAGS}"
- -DBUILD_LINKFLAGS="${PLATFORM_LINKFLAGS}"
+ -DBUILD_CFLAGS="${BUILDINFO_CFLAGS}"
+ -DBUILD_CXXFLAGS="${BUILDINFO_CXXFLAGS}"
+ -DBUILD_LINKFLAGS="${BUILDINFO_LINKFLAGS}"
+ -DBUILD_SYSTEM="CMake"
)
LIST(APPEND EXESRC buildinfo.c)
Modified: trunk/blender/source/creator/buildinfo.c
===================================================================
--- trunk/blender/source/creator/buildinfo.c 2010-10-19 04:29:05 UTC (rev 32580)
+++ trunk/blender/source/creator/buildinfo.c 2010-10-19 05:00:36 UTC (rev 32581)
@@ -40,10 +40,12 @@
char build_cflags[]= STRINGIFY(BUILD_CFLAGS);
char build_cxxflags[]= STRINGIFY(BUILD_CXXFLAGS);
char build_linkflags[]= STRINGIFY(BUILD_LINKFLAGS);
+char build_system[]= STRINGIFY(BUILD_SYSTEM);
#else
char build_cflags[]= "unmaintained buildsystem alert!";
char build_cxxflags[]= "unmaintained buildsystem alert!";
char build_linkflags[]= "unmaintained buildsystem alert!";
+char build_system[]= "unmaintained buildsystem alert!";
#endif
#endif // BUILD_DATE
Modified: trunk/blender/source/creator/creator.c
===================================================================
--- trunk/blender/source/creator/creator.c 2010-10-19 04:29:05 UTC (rev 32580)
+++ trunk/blender/source/creator/creator.c 2010-10-19 05:00:36 UTC (rev 32581)
@@ -121,6 +121,7 @@
extern char build_cflags[];
extern char build_cxxflags[];
extern char build_linkflags[];
+extern char build_system[];
#endif
/* Local Function prototypes */
@@ -190,6 +191,7 @@
printf ("\tbuild c flags: %s\n", build_cflags);
printf ("\tbuild c++ flags: %s\n", build_cxxflags);
printf ("\tbuild link flags: %s\n", build_linkflags);
+ printf ("\tbuild system: %s\n", build_system);
#endif
exit(0);
@@ -1054,6 +1056,7 @@
strip_quotes(build_cflags);
strip_quotes(build_cxxflags);
strip_quotes(build_linkflags);
+ strip_quotes(build_system);
#endif
BLI_threadapi_init();
More information about the Bf-blender-cvs
mailing list