Merge #476 into sdk602patch0626 from refs/changes/476/head

修复 autobuild.sh user 编译问题

* refs/changes/476/head: (1 commits squashed)

  - 修复 autobuild.sh user 编译问题

Signed-off-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Reviewed-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Merged-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/476

diff --git a/autobuild.sh b/autobuild.sh
index d006eb7..a491150 100755 (executable)
--- a/autobuild.sh
+++ b/autobuild.sh
@@ -5,10 +5,13 @@ DATE=$(date  +%Y%m%d_%H%M%S)
 HOMEDIR=$PWD
 DEFAULT_BUILD_TYPE=release
 DEFAULT_TARGET_PACK_NAME=pack_brandy_native_js
+DEFAULT_APPLICATION_NAME=brandy-native-js
 DEFAULT_TARGET_PACK_NAME_USER=pack_brandy_native_js_user
+DEFAULT_APPLICATION_NAME_USER=brandy-native-js-user
 DEFAULT_CUSTOM_FW_VERSION=1.1.14
 
 TARGET_PACK_NAME=$DEFAULT_TARGET_PACK_NAME
+APPLICATION_NAME=$DEFAULT_APPLICATION_NAME
 RELEASE_BUILD=$DEFAULT_BUILD_TYPE
 CLEAN=
 
@@ -38,6 +41,7 @@ fi
 if [ "$1" == "user" ]
 then
 TARGET_PACK_NAME=$DEFAULT_TARGET_PACK_NAME_USER
+APPLICATION_NAME=$DEFAULT_APPLICATION_NAME_USER
 fi
 
 }
@@ -46,21 +50,11 @@ COMMIT_ID=`git rev-parse HEAD`
 SOURCE_MODIFIED=`git status --short`
 cp_releasepackage()
 {      
-       # code/sdk/output/package/brandy/pack_brandy_native_js/brandy-native-js/application.bin  
-       # code/sdk/output/package/brandy/pack_brandy_native_js/brandy-native-js/application.elf  
-       # code/sdk/output/package/brandy/pack_brandy_native_js/brandy-native-js/application.lst  
-       # code/sdk/output/package/brandy/pack_brandy_native_js/brandy-native-js/file.bin
-       # code/sdk/output/package/brandy/pack_brandy_native_js/brandy-native-js-r/recovery.bin  
-       # code/sdk/output/package/brandy/pack_brandy_native_js/brandy-native-js-r/recovery.elf  
-       # code/sdk/output/package/brandy/pack_brandy_native_js/brandy-native-js-r/recovery.lst  
-       # code/sdk/output/package/brandy/pack_brandy_native_js/brandy-ssb/ssb.bin
-       # code/sdk/output/package/brandy/pack_brandy_native_js/brandy-ssb/ssb.elf  
-       # code/sdk/output/package/brandy/pack_brandy_native_js/brandy-ssb/ssb.lst
 
        package_dir=$HOMEDIR/code/sdk/output/package/brandy/$TARGET_PACK_NAME/
-       application_path=$package_dir/brandy-native-js/application.bin
-       applicationelf_path=$package_dir/brandy-native-js/application.elf 
-       applicationlst_path=$package_dir/brandy-native-js/application.lst
+       application_path=$package_dir/$APPLICATION_NAME/application.bin
+       applicationelf_path=$package_dir/$APPLICATION_NAME/application.elf 
+       applicationlst_path=$package_dir/$APPLICATION_NAME/application.lst
        recovery_path=$package_dir/brandy-native-js-r/recovery.bin
        recoveryelf_path=$package_dir/brandy-native-js-r/recovery.elf 
        recoverylst_path=$package_dir/brandy-native-js-r/recovery.lst