Updated to TBB 4.4 update 4

This commit is contained in:
Wenzel Jakob
2016-05-12 12:28:09 +01:00
parent 4fa22d5ace
commit 92a3dcd0a2
1374 changed files with 52186 additions and 31785 deletions
+1 -6
View File
@@ -1,6 +1,6 @@
#!/bin/sh
#
# Copyright 2005-2014 Intel Corporation. All Rights Reserved.
# Copyright 2005-2016 Intel Corporation. All Rights Reserved.
#
# This file is part of Threading Building Blocks. Threading Building Blocks is free software;
# you can redistribute it and/or modify it under the terms of the GNU General Public License
@@ -19,15 +19,10 @@
# reasons why the executable file might be covered by the GNU General Public License.
# Script used to generate version info string
# remove extraneous cntrl-M characters from ends of lines generated by adb shell command
android_os=`(adb shell getprop ro.build.version.release) | sed -e 's/\\r$//g'`
android_kernel=`(adb shell uname -srv) | sed -e 's/\\r$//g'`
echo "#define __TBB_VERSION_STRINGS(N) \\"
echo '#N": BUILD_HOST'"\t\t"`hostname -s`" ("`uname -m`")"'" ENDL \'
# find OS name in *-release and issue* files by filtering blank lines and lsb-release content out
echo '#N": BUILD_OS'"\t\t"`lsb_release -sd 2>/dev/null | grep -ih '[a-z] ' - /etc/*release /etc/issue 2>/dev/null | head -1 | sed -e 's/["\\\\]//g'`'" ENDL \'
echo '#N": BUILD_TARGET_OS'"\t\tAndroid ${android_os}"'" ENDL \'
echo '#N": BUILD_TARGET_KERNEL'"\t${android_kernel}"'" ENDL \'
echo '#N": BUILD_GCC'"\t\t"`${tbb_tool_prefix}g++ --version | grep 'g++'`'" ENDL \'
[ -z "$COMPILER_VERSION" ] || echo '#N": BUILD_COMPILER'"\t"$COMPILER_VERSION'" ENDL \'
[ -z "$ndk_version" ] || echo '#N": BUILD_NDK'"\t\t$ndk_version"'" ENDL \'