diff --git a/.gitmodules b/.gitmodules index 7facb89..70c103d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -21,4 +21,7 @@ url = ../../z2nd_lib/zclipp.git [submodule "dep/zlinuxcomponents"] path = dep/zlinuxcomponents - url = zwsd@192.168.1.3:z2nd_lib/zlinuxcomponents.git \ No newline at end of file + url = zwsd@192.168.1.3:z2nd_lib/zlinuxcomponents.git +[submodule "iflybuild"] + path = iflybuild + url = zwsd@192.168.1.3:z2nd_lib/iflybuild.git diff --git a/sh/envsetup.sh b/.project/envsetup.sh similarity index 100% rename from sh/envsetup.sh rename to .project/envsetup.sh diff --git a/sh/envsetuppc.sh b/.project/envsetuppc.sh similarity index 100% rename from sh/envsetuppc.sh rename to .project/envsetuppc.sh diff --git a/sh/packet.sh b/.project/packet.sh similarity index 93% rename from sh/packet.sh rename to .project/packet.sh index 7ed7c4c..b1c836d 100755 --- a/sh/packet.sh +++ b/.project/packet.sh @@ -1,7 +1,4 @@ #!/bin/bash -# -# wget_and_unzip 解压后的文件名 url -# #################################################################### ########################打包自定义的东西############################## #################################################################### diff --git a/README.md b/README.md index c42a5d6..459f834 100644 --- a/README.md +++ b/README.md @@ -20,27 +20,27 @@ # 初始化环境 -./sh/iflytool.sh envsetup +./build.sh envsetup # 仅编译 -./sh/iflytool.sh build +./build.sh build # 编译调试版本,Cmake使用的是cmakepc.cmake -./sh/iflytool.sh buildpc +./build.sh buildpc # 编译打包部署(整包) -./sh/iflytool.sh --ip flash +./build.sh --ip flash # 编译打包部署,重启系统(整包) -./sh/iflytool.sh --ip flash reboot +./build.sh --ip flash reboot # 编译并只部署应用 -./sh/iflytool.sh --ip --flashapp "app.out" +./build.sh --ip --flashapp "app.out" # 只部署webapp -./sh/iflytool.sh --ip flashwebapp +./build.sh --ip flashwebapp # 配置ssh-key,免密登录 -./sh/iflytool.sh --ip ssh_copy_id +./build.sh --ip ssh_copy_id ``` diff --git a/sh/boardinit.sh b/boardinit.sh similarity index 100% rename from sh/boardinit.sh rename to boardinit.sh diff --git a/build.sh b/build.sh new file mode 120000 index 0000000..fe68a5d --- /dev/null +++ b/build.sh @@ -0,0 +1 @@ +iflybuild/build.sh \ No newline at end of file diff --git a/iflybuild b/iflybuild new file mode 160000 index 0000000..a2932b9 --- /dev/null +++ b/iflybuild @@ -0,0 +1 @@ +Subproject commit a2932b93bea8c07875593af7798c1d972505520a diff --git a/sh/iflytool.sh b/sh/iflytool.sh deleted file mode 120000 index 1eadf77..0000000 --- a/sh/iflytool.sh +++ /dev/null @@ -1 +0,0 @@ -../buildtools/iflytool.sh \ No newline at end of file