Merge from internal changes

AUTHORS

@@ -5,3 +5,13 @@ michaelpeng
 chenjingxu
 whuwxl
 guanqun
+huahang
+yeshunping
+WindLeeWT
+zhangyafeikimi
+vonnyfly
+WongTai
+buaaliyi
+simonkuang
+xiaoqiangkx
+brianli

blade

@@ -73,6 +73,10 @@ blade_path=`_full_real_path $0`
 blade_dir=$(cd $(dirname $blade_path) && pwd)
 blade_file="$blade_dir/bootstrap.py"
 
+if [ -e $blade_dir/blade_init ]; then
+    source $blade_dir/blade_init
+fi
+
 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

genlibbuild

@@ -25,11 +25,7 @@ done
 echo -e "    ]\n)\n"
 
 # generate cc_test
-for src in *_test.{c,cc,cpp,cxx}; do
-    echo -e "\ncc_test(\n    name = '${src/.*/}',\n    srcs = ['$src'],\n    deps = [':$libname']\n)\n"
-done
-
-for src in *Test.{c,cc,cpp,cxx}; do
+for src in *_test.{c,cc,cpp,cxx} *Test.{c,cc,cpp,cxx}; do
     echo -e "\ncc_test(\n    name = '${src/.*/}',\n    srcs = ['$src'],\n    deps = [':$libname']\n)\n"
 done
 

install

@@ -23,10 +23,13 @@ ln -sf $blade_dir/blade ~/bin
 echo ", Done."
 
 if ! echo $PATH | grep "$HOME/bin" &> /dev/null; then
-    echo 'export PATH=~/bin:$PATH' >> ~/.profile
-
+    if [ -f ~/.profile ]; then
+        echo 'export PATH=~/bin:$PATH' >> ~/.profile
+    fi
     if echo $SHELL | grep "zsh" &> /dev/null; then
-        echo 'export PATH=~/bin:$PATH' >> ~/.zshrc
+        if [ -f ~/.zshrc ]; then
+            echo 'export PATH=~/bin:$PATH' >> ~/.zshrc
+        fi
     fi
 fi
 

merge-static-libs

@@ -3,7 +3,7 @@
 set -e
 
 if [[ $# < 1 || $# == 1 && "$1" == '--help' ]]; then
-    echo "Usage <blade-target-name> [build arguments]"
+    echo -e "Usage:\n  $0 <blade-target-name> [build arguments]"
     exit 1;
 fi
 

vim/syntax/blade.vim

@@ -20,14 +20,19 @@ syn case match
 " Sorted by alphabet order
 syn keyword bladeTarget cc_binary cc_library cc_plugin cc_test cc_benchmark cu_binary cu_library
 syn keyword bladeTarget enable_if gen_rule lex_yacc_library proto_library java_jar
-syn keyword bladeTarget resource_library swig_library
+syn keyword bladeTarget java_library java_binary java_test maven_jar java_fat_library
+syn keyword bladeTarget package py_binary py_library py_test
+syn keyword bladeTarget scala_library scala_test scala_fat_library sh_test
+syn keyword bladeTarget resource_library swig_library thrift_library
 
 " Sorted by alphabet order
-syn keyword bladeArg always_run binary_jar cmd defs deprecated deps dynamic_link export_incs
-syn keyword bladeArg exclusive export_dynamic extra_cppflags extra_linkflags
+syn keyword bladeArg always_run binary_jar cmd defs deprecated deps dynamic_link embed_version
+syn keyword bladeArg exclusions exclusive export_dynamic export_incs exported_deps
+syn keyword bladeArg extra_cppflags extra_linkflags generate_descriptors glob
 syn keyword bladeArg heap_check heap_check_debug incs link_all_symbols main_class
-syn keyword bladeArg name optimize outs prebuilt prefix resources srcs suffix
-syn keyword bladeArg testdata warning
+syn keyword bladeArg name optimize out outs plugins prebuilt prefix provided_deps
+syn keyword bladeArg resources secure source_encoding srcs suffix
+syn keyword bladeArg target_under_test testdata transitive visibility warning warnings
 
 if version >= 508 || !exists("did_blade_syn_inits")
     if version < 508

vim/syntax/blade_root.vim

@@ -89,6 +89,8 @@ syn keyword bladeArg extra_incs
 syn keyword bladeArg cppflags
 syn keyword bladeArg cflags
 syn keyword bladeArg cxxflags
+syn keyword bladeArg arflags
+syn keyword bladeArg ranlibflags
 syn keyword bladeArg linkflags
 syn keyword bladeArg c_warnings
 syn keyword bladeArg cxx_warnings
@@ -97,9 +99,13 @@ syn keyword bladeArg cpplint
 syn keyword bladeArg optimize
 syn keyword bladeArg benchmark_libs
 syn keyword bladeArg benchmark_main_libs
-syn keyword bladeArg hipcc
+syn keyword bladeArg securecc
 syn keyword bladeTarget cc_library_config
 syn keyword bladeArg generate_dynamic
+syn keyword bladeTarget protoc_plugin
+syn keyword bladeArg name
+syn keyword bladeArg path
+syn keyword bladeArg code_generation
 
 
 if version >= 508 || !exists("did_blade_roor_syn_inits")