Merge with latest internal version

Author: cf

ChangeLog

@@ -1,16 +1,34 @@
-Tue Aug 21 21:09:14 2012  Tencent Inc. <[email protected]>
+2012-08-21  Tencent Inc. <[email protected]>
 
-    * blade: version 1.0
-    * initialize opensource release
+	* blade: version 1.0
+	* initialize opensource release
 
-Tue Dec 25 11:21:00 2012  Tencent Inc. <[email protected]>
+2012-12-25  Tencent Inc. <[email protected]>
 
-    * Add is_debug for build_target
-    * Add prompt message to source bashrc after install blade
-    * Skip making duplicate prebuit lib symlink and remove useless warning
-    * Add graphviz output to blade query command.
-    * Do not exit when symlink existed
-    * Fixed loop dependency detecting in recursive method
-    * Updated user manual-config part of blade_user_manual.pdf
-    * Allow libs in global config files starts with '//'
+	* Add is_debug for build_target
+	* Add prompt message to source bashrc after install blade
+	* Skip making duplicate prebuit lib symlink and remove useless warning
+	* Add graphviz output to blade query command.
+	* Do not exit when symlink existed
+	* Fixed loop dependency detecting in recursive method
+	* Updated user manual-config part of blade_user_manual.pdf
+	* Allow libs in global config files starts with '//'
 
+2013-02-21  Tencent Inc. <[email protected]>
+
+	* Fix readlink compatible issue, enable run blade on MAC.
+	* Add cpp_flags, c_flags, cxx_flags to cc_config
+	* Dump the CC CPP CXX LD at startup
+	* Add prompt message to source bashrc after install blade
+	* Refactoring configure
+	* Add -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS
+	to enable full functional stdint.h and inttypes.h for C++
+
+2013-03-21  Tencent Inc. <[email protected]>
+
+	* Make test run easier and python 2.6 compatible.
+	* Fix problem of no response to ctrl-c when run tests
+	* Support --gcov for gcc 3.x
+	* Enlarge the size of stack size warning to 64+8k
+
+Copyright 2012, 2013 Tencent, Inc.

blade

@@ -19,9 +19,9 @@
 function _info()
 {
     if [ -t 1 ]; then
-        echo -e "\033[1;36mBlade(info): $@\033[m"
+        echo -e "\033[1;36mBlade(info): $@\033[m" >&2
     else
-        echo -e "Blade(info): $@"
+        echo -e "Blade(info): $@" >&2
     fi
 }
 
@@ -44,7 +44,7 @@ function _error_exit()
     exit 1
 }
 
-function full_real_path()
+function _full_real_path()
 {
     local o
     local f
@@ -69,100 +69,43 @@ function full_real_path()
     return 0
 }
 
-blade_path=`full_real_path $0`
-
+blade_path=`_full_real_path $0`
 blade_dir=$(cd $(dirname $blade_path) && pwd)
-
 blade_file="$blade_dir/blade.zip"
 
+if [[ "$BLADE_AUTO_UPGRADE" != "no" ]]; then
+    # Auto update blade main program to latest version and run it
+    if svn_up_info=`svn up --trust-server-cert --non-interactive ${blade_dir} 2>&1`; then
+        _info "auto upgrade success: $svn_up_info"
+    else
+        _warning "Auto upgrade failure: $svn_up_info"
+        _warning "Please svn up $blade_dir"
+    fi
+fi
+
 # Check the python version at first, exit blade when python
 # version is under 2.6
 no_python=$(which python 2>&1 | grep 'which: no')
-if [[ -n "$no_python" ]]
-then
+if [[ -n "$no_python" ]]; then
     _error_exit "Please install python 2.6 or above in your system"
 fi
 
 python_ver=$(python -V 2>&1 | sed 's/Python //g')
 
-if [[ "$python_ver" < "2.6" ]]
-then
+if [[ "$python_ver" < "2.6" ]]; then
     _info "Python version in your machine: $python_ver"
     _error_exit "Please upgrade your python version to 2.6 or above"
 fi
 
 # Check scons environment
 no_scons=$(which scons 2>&1 | grep 'which: no scons in')
-if [[ -n "$no_scons" ]]
-then
+if [[ -n "$no_scons" ]]; then
     _error_exit "Please install scons v2.0 or above on your machine"
 fi
 
-# blade now
-if [[ ! -f "$blade_file" ]]
-then
+# Check blade.zip
+if [[ ! -f "$blade_file" ]]; then
     _error_exit "Cannot find the core file $blade_file"
 fi
 
-# for _find_project_root
-source $blade_dir/bladefunctions
-
-if blade_root=`_find_project_root`; then
-    # in old version of blade, there is no blade.py but blade only
-    blade_path=$blade_root/common/builder/blade
-
-    # auto update blade main program to latest version and run it
-    if svn_up_info=`svn up --trust-server-cert --non-interactive ${blade_path} 2>&1`; then
-        _info "$svn_up_info"
-    else
-        _warning "Auto upgrade failure: $svn_up_info"
-        _warning "Please svn up $blade_path"
-    fi
-
-    blade=$blade_path/blade
-    blade_py=${blade}.py
-    blade2=${blade}.zip
-
-    build_by_blade2=1
-    actions="^(build|run|test|query|clean|--help)$"
-
-    if [ "$#" -ge 1 ]; then
-        if [[ ! "$1" =~ $actions ]]; then
-            build_by_blade2=0
-        fi
-    fi
-
-
-    if [ $build_by_blade2 -eq 1 ]
-    then
-        _info 'Welcome to blade2'
-        if [ -e "$blade_file" ]; then
-            python $blade_file "$@"
-        else
-            _error_exit "Cannot find the core file $blade_file"
-            exit 1
-        fi
-    else
-        case "$1" in
-        -t)
-            action="test"
-            ;;
-        -c)
-            action="clean"
-            ;;
-        *)
-            action="build"
-            ;;
-        esac
-        _error_exit "Command should be 'blade $action'"
-        if [ -e "$blade_py" ]; then
-            blade_python=$blade_py
-        else
-            blade_python=$blade
-        fi
-        $blade_python "$@"
-    fi
-
-else
-    _error_exit "Can't find BLADE_ROOT, are you in a correct source dir tree?"
-fi
+python $blade_file "$@"

blade.conf

@@ -20,11 +20,20 @@ proto_library_config(
     protoc='thirdparty/protobuf/bin/protoc',
     protobuf_libs=['thirdparty/protobuf:protobuf'],
     protobuf_path='thirdparty',
-    protobuf_include_path = 'thirdparty',
+    protobuf_incs = 'thirdparty',
     protobuf_php_path='thirdparty/Protobuf-PHP/library',
     protoc_php_plugin='thirdparty/Protobuf-PHP/protoc-gen-php.php'
 )
 
+thrift_library_config(
+    # The path to thrift compiler.
+    thrift='/usr/local/bin/thrift',
+    # The libraries depended by thrift.
+    thrift_libs=['#thrift', '#pthread'],
+    # The extra include paths to be passed to thrift compiler.
+    thrift_incs=[],
+)
+
 cc_config(
     extra_incs='thirdparty'
 )