* Distinguish output directories for projects on different platforms

Author: lxowalle

.gitignore

@@ -186,6 +186,6 @@ tools/os/*/img_root
 tools/os/*/img_boot
 tools/os/*/images
 projects/apps/
-
+projects/*_apps/
 
 .vscode*

projects/build_all.sh

@@ -43,6 +43,14 @@ function platform_setting()
 	esac
 }
 
+if [ -n "$1" ]; then
+    platform="$1"
+else
+    platform_setting
+fi
+
+apps_dir=${platform}_apps
+
 function build_start()
 {
     # test_script $1
@@ -58,22 +66,17 @@ function build_start()
         maixcdk distclean
         maixcdk release -p "$platform" --toolchain-id default
     fi
-    mkdir -p ../apps
-    cp -r dist/pack/* ../apps
+    mkdir -p ../${apps_dir}
+    cp -r dist/pack/* ../${apps_dir}
     cd ..
 }
 
-if [ -n "$1" ]; then
-    platform="$1"
-else
-    platform_setting
-fi
 
 # 获取当前平台对应的黑名单数组
 blacklist_var="blacklist_${platform}[@]"
 blacklist=("${!blacklist_var}")
 
-rm -rf apps/
+rm -rf ${apps_dir}/
 
 for dir in */; do
   if [ -d "$dir" ]; then

tools/os/maixcam/gen_os.sh

@@ -141,7 +141,7 @@ if [ $skip_build_apps == 0 ]; then
 fi
 cd -
 mkdir -p tmp/sys_builtin_files/maixapp/apps
-cp -r ../../../projects/apps/* tmp/sys_builtin_files/maixapp/apps
+cp -r ../../../projects/maixcam_apps/* tmp/sys_builtin_files/maixapp/apps
 
 # 4. 打包 MaixCDK 写的应用，进入 $MAIXCDK_PATH/projects， 执行 build_all.sh，生成 apps 目录，将内容全部拷贝到 tmp/sys_builtin_files/apps 目录
 echo "pack and copy MaixCDK projects"
@@ -151,8 +151,8 @@ if [ $skip_build_apps == 0 ]; then
     ./build_all.sh maixcam
 fi
 cd -
-if [ -d $MAIXCDK_PATH/projects/apps/ ]; then
-    cp -r $MAIXCDK_PATH/projects/apps/* tmp/sys_builtin_files/maixapp/apps
+if [ -d $MAIXCDK_PATH/projects/maixcam_apps/ ]; then
+    cp -r $MAIXCDK_PATH/projects/maixcam_apps/* tmp/sys_builtin_files/maixapp/apps
 fi
 
 # 5. 生成 tmp/sys_builtin_files/maixapp/apps/app.info 文件，执行 python gen_app_info.py tmp/sys_builtin_files/maixapp/apps

tools/os/maixcam2/gen_os.sh

@@ -186,7 +186,7 @@ if [ $skip_build_apps == 0 ]; then
 fi
 cd -
 mkdir -p tmp/sys_builtin_files/maixapp/apps
-cp -r ../../../projects/apps/* tmp/sys_builtin_files/maixapp/apps
+cp -r ../../../projects/maixcam2_apps/* tmp/sys_builtin_files/maixapp/apps
 
 # 4. 打包 MaixCDK 写的应用，进入 $MAIXCDK_PATH/projects， 执行 build_all.sh，生成 apps 目录，将内容全部拷贝到 tmp/sys_builtin_files/apps 目录
 echo "pack and copy MaixCDK projects"
@@ -196,8 +196,8 @@ if [ $skip_build_apps == 0 ]; then
     ./build_all.sh maixcam2
 fi
 cd -
-if [ -d $MAIXCDK_PATH/projects/apps/ ]; then
-    cp -r $MAIXCDK_PATH/projects/apps/* tmp/sys_builtin_files/maixapp/apps
+if [ -d $MAIXCDK_PATH/projects/maixcam2_apps/ ]; then
+    cp -r $MAIXCDK_PATH/projects/maixcam2_apps/* tmp/sys_builtin_files/maixapp/apps
 fi
 
 # 5. 生成 tmp/sys_builtin_files/maixapp/apps/app.info 文件，执行 python gen_app_info.py tmp/sys_builtin_files/maixapp/apps