From 309d5fede6d74e1749c6680248c345a7085be215 Mon Sep 17 00:00:00 2001
From: zhaohe <h_zhaohe@163.com>
Date: Tue, 3 Jan 2023 16:11:41 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=BC=96=E8=AF=91=E8=84=9A?=
 =?UTF-8?q?=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore             |  3 ++-
 README.md              | 20 +++++++++++++-------
 env/appsetup.sh        |  0
 sh/envsetup.sh         | 46 ----------------------------------------------
 sh/packet.sh           | 43 -------------------------------------------
 sh/pc_envsetup.env     |  5 -----
 sh/pc_envsetup.sh      | 19 +++++++++++++++++++
 sh/rk3328_envsetup.env |  5 -----
 sh/rk3328_envsetup.sh  | 26 ++++++++++++++++++++++++++
 9 files changed, 60 insertions(+), 107 deletions(-)
 create mode 100755 env/appsetup.sh
 delete mode 100755 sh/envsetup.sh
 delete mode 100755 sh/packet.sh
 delete mode 100755 sh/pc_envsetup.env
 create mode 100755 sh/pc_envsetup.sh
 delete mode 100755 sh/rk3328_envsetup.env
 create mode 100755 sh/rk3328_envsetup.sh

diff --git a/.gitignore b/.gitignore
index c795b05..61fd441 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
-build
\ No newline at end of file
+build
+lib
\ No newline at end of file
diff --git a/README.md b/README.md
index 0be89bb..553a3ed 100644
--- a/README.md
+++ b/README.md
@@ -1,16 +1,22 @@
 # linux_smart_speaker_sdk
 
 ```
+目录说明
+dep/ 存放第二方，或者第三方需要编译的代码
+lib/ 编译好的依赖库,通过
+sh/  工程编译打包部署等相关脚本
+env/ 应用程序运行环境
+```
+
+```
 编译说明
 
-source sh/rk3328_envsetup.env
-./sh/envsetup.sh
+# 编译RK3328应用
+./sh/rk3328_envsetup.sh
+# 编译PC应用
+./sh/pc_envsetup.sh
 
 cd build
 ./build.sh && make -j8
 
-```
-
-```
-
-```
+```
\ No newline at end of file
diff --git a/env/appsetup.sh b/env/appsetup.sh
new file mode 100755
index 0000000..e69de29
diff --git a/sh/envsetup.sh b/sh/envsetup.sh
deleted file mode 100755
index efe117b..0000000
--- a/sh/envsetup.sh
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/bin/bash
-
-set -e #如果某条指令执行出错,则会退出脚本
-# set -v #打印正在指令的指令
-set -x
-
-if [ -z ${PROJECT_PATH} ]; then
-    echo "Error:try 'source envsetup.sh' first please. "
-    exit 0;
-fi
-
-# 创建编译目录
-# echo "创建编译目录"
-echo "mkdir -p ${PROJECT_PATH}/build"
-mkdir -p ${PROJECT_PATH}/build
-
-
-
-if [ -z ${COMPILE_TOOLS_DOWN_URL} ]; then
-    #如果没有定义了 COMPILE_TOOLS_DOWN_URL
-    echo "cmake ../ \\" > ${PROJECT_PATH}/build/build.sh
-    echo "-DCMAKE_C_COMPILER=gcc \\" >> ${PROJECT_PATH}/build/build.sh
-    echo "-DCMAKE_CXX_COMPILER=g++ \\" >> ${PROJECT_PATH}/build/build.sh
-else
-    #如果定义了 COMPILE_TOOLS_DOWN_URL
-    # 下载编译工具
-    cd ${PROJECT_PATH}/build
-    wget -c ${COMPILE_TOOLS_DOWN_URL}
-    
-    # 解压编译工具
-    cd ${PROJECT_PATH}/build
-    compile_tools_tar=${COMPILE_TOOLS_DOWN_URL##*/}
-    compile_tools=`basename ${compile_tools_tar} .tar.gz`
-    
-    # 解压编译工具
-    tar -xvf ${compile_tools_tar} > untar.log
-    
-    # 创建编译脚本
-    cd ${PROJECT_PATH}/build
-    echo "cmake ../ \\" > ${PROJECT_PATH}/build/build.sh
-    echo "-DCMAKE_C_COMPILER=${PROJECT_PATH}/build/${compile_tools}/bin/${COMPILE_TOOLS}-gcc \\" >> ${PROJECT_PATH}/build/build.sh
-    echo "-DCMAKE_CXX_COMPILER=${PROJECT_PATH}/build/${compile_tools}/bin/${COMPILE_TOOLS}-g++ \\" >> ${PROJECT_PATH}/build/build.sh
-    chmod +x ${PROJECT_PATH}/build/build.sh
-    
-fi
-
diff --git a/sh/packet.sh b/sh/packet.sh
deleted file mode 100755
index f9a2600..0000000
--- a/sh/packet.sh
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/bash
-
-PACKET_NAME=chicken_farm_host_server
-
-
-set -e
-set -x
-export PROJECT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/../"
-
-#打包目录
-PACKET_DIR=$PROJECT_PATH/out/${PACKET_NAME}
-
-# 删除打包目录,重新打包
-rm -rf ${PACKET_DIR}
-mkdir ${PACKET_DIR}
-########################################################################################
-################################根据需要修改下面的内容即可##################################
-########################################################################################
-
-#1. 编译
-mkdir -p ${PROJECT_PATH}/out/cmake-build-pc
-cd $PROJECT_PATH/out/cmake-build-pc
-make -j8 install
-
-#2.打包APP
-cp $PROJECT_PATH/out/cmake-build-pc/app/app.out $PACKET_DIR/
-
-#3.3 打包webapp
-cp -rf $PROJECT_PATH/webapp $PACKET_DIR/
-
-#4 拷贝配置文件
-cd $PROJECT_PATH/env/ && cp --path -rf ./* $PACKET_DIR/
-
-#5 打包
-cur_date="`date +%Y%m%d`" 
-
-cd $PACKET_DIR/../
-tar -czvf ${PACKET_DIR}_${cur_date}.tar.gz ${PACKET_NAME}
-cp ${PACKET_DIR}_${cur_date}.tar.gz ${PACKET_DIR}.tar.gz
-echo "Brief:"
-echo "generate ${PACKET_DIR}_${cur_date}.tar.gz..................."
-echo "generate ${PACKET_DIR}.tar.gz..................."
-
diff --git a/sh/pc_envsetup.env b/sh/pc_envsetup.env
deleted file mode 100755
index 15d4039..0000000
--- a/sh/pc_envsetup.env
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-export PROJECT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-export COMPILE_TOOLS_DOWN_URL=
-export COMPILE_TOOLS=
-
diff --git a/sh/pc_envsetup.sh b/sh/pc_envsetup.sh
new file mode 100755
index 0000000..6e748d6
--- /dev/null
+++ b/sh/pc_envsetup.sh
@@ -0,0 +1,19 @@
+#!/bin/bash
+
+
+#!/bin/bash
+
+set -e #如果某条指令执行出错,则会退出脚本
+# set -v #打印正在指令的指令
+set -x
+export PROJECT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+
+# 创建编译目录
+# echo "创建编译目录"
+echo "mkdir -p ${PROJECT_PATH}/build"
+mkdir -p ${PROJECT_PATH}/build
+
+#构造编译脚本
+echo "cmake ../ \\" > ${PROJECT_PATH}/build/build.sh
+echo "-DCMAKE_C_COMPILER=gcc \\" >> ${PROJECT_PATH}/build/build.sh
+echo "-DCMAKE_CXX_COMPILER=g++ \\" >> ${PROJECT_PATH}/build/build.sh
diff --git a/sh/rk3328_envsetup.env b/sh/rk3328_envsetup.env
deleted file mode 100755
index d8e4281..0000000
--- a/sh/rk3328_envsetup.env
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-export PROJECT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-export COMPILE_TOOLS_DOWN_URL="ftp://zftpuser:zftpzwsd@192.168.1.2/zwsd/gnu_gcc_release/gcc-linaro-6.3.1-2017.05-x86_64_aarch64-linux-gnu.tar.gz"
-export COMPILE_TOOLS=aarch64-linux-gnu
-
diff --git a/sh/rk3328_envsetup.sh b/sh/rk3328_envsetup.sh
new file mode 100755
index 0000000..acf2ec9
--- /dev/null
+++ b/sh/rk3328_envsetup.sh
@@ -0,0 +1,26 @@
+#!/bin/bash
+export PROJECT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+export COMPILE_TOOLS_DOWN_URL="ftp://zftpuser:zftpzwsd@192.168.1.2/zwsd/gnu_gcc_release/gcc-linaro-6.3.1-2017.05-x86_64_aarch64-linux-gnu.tar.gz"
+export COMPILE_TOOLS=aarch64-linux-gnu
+
+#!/bin/bash
+
+set -e #如果某条指令执行出错,则会退出脚本
+# set -v #打印正在指令的指令
+set -x
+
+# 创建编译目录
+# echo "创建编译目录"
+echo "mkdir -p ${PROJECT_PATH}/build"
+mkdir -p ${PROJECT_PATH}/build
+
+# 下载编译工具
+cd ${PROJECT_PATH}/build
+wget -c "ftp://zftpuser:zftpzwsd@192.168.1.2/zwsd/gnu_gcc_release/gcc-linaro-6.3.1-2017.05-x86_64_aarch64-linux-gnu.tar.gz"
+tar -xvf "gcc-linaro-6.3.1-2017.05-x86_64_aarch64-linux-gnu.tar.gz"
+
+# 构造编译脚本
+echo "cmake ../ \\" >${PROJECT_PATH}/build/build.sh
+echo "-DCMAKE_C_COMPILER=${PROJECT_PATH}/build/gcc-linaro-6.3.1-2017.05-x86_64_aarch64-linux-gnu/bin/aarch64-linux-gnu-gcc \\" >>${PROJECT_PATH}/build/build.sh
+echo "-DCMAKE_CXX_COMPILER=${PROJECT_PATH}/build/gcc-linaro-6.3.1-2017.05-x86_64_aarch64-linux-gnu/bin/aarch64-linux-gnu-g++ \\" >>${PROJECT_PATH}/build/build.sh
+chmod +x ${PROJECT_PATH}/build/build.sh