diff --git a/docker/standard/CHANGELOG.md b/docker/standard/CHANGELOG.md index 2120450f7661c07d4f82c465081c03353517f822..7e161f58d014a67f8e060748a49a61af5f6a51f1 100644 --- a/docker/standard/CHANGELOG.md +++ b/docker/standard/CHANGELOG.md @@ -1,3 +1,7 @@ + ### 0.0.2（2021/08/11） + +新增安装llvm-10.0.1-62608和restool工具。 + ### 0.0.1（2021/06/02） 提供OpenHarmony 2.0版本docker编译环境，预装编译依赖工具。 \ No newline at end of file diff --git a/docker/standard/CHANGELOG_en.md b/docker/standard/CHANGELOG_en.md index a93871dd53073bd3686c018e0bbd0952e719e65d..658a01359ea3fa5f592dd1957cc8a11bff930f62 100644 --- a/docker/standard/CHANGELOG_en.md +++ b/docker/standard/CHANGELOG_en.md @@ -1,3 +1,7 @@ + ### 0.0.2（2021/08/11） + +Add the installation of llvm-10.0.1-62608 and restool. + ### 0.0.1（2021/06/02） Provided a Docker build environment for OpenHarmony 2.0 and pre-installed build dependency tools. \ No newline at end of file diff --git a/docker/standard/Readme-en.md b/docker/standard/Readme-en.md index d59a3ca75881ba02766b23f7d26ddd11a7eea3e6..6de964f0f2f0f34a907990aae3edba35c2f29d70 100755 --- a/docker/standard/Readme-en.md +++ b/docker/standard/Readme-en.md @@ -10,11 +10,11 @@ The Docker image of OpenHarmony is hosted on [HUAWEI Cloud SWR](https://auth.hua 1. Obtain the Docker image. ``` -docker pull swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker-standard:0.0.1 +docker pull swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker-standard:0.0.2 ``` 2. Go to the root directory of OpenHarmony code and run the following command to access the Docker build environment: ``` -docker run -it -v $(pwd):/home/openharmony swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker-standard:0.0.1 +docker run -it -v $(pwd):/home/openharmony swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker-standard:0.0.2 ``` ##### **Method 2: Using the Dockerfile to Build a Local Docker Image** @@ -30,7 +30,7 @@ cd docs/docker/standard ``` 3. Go to the root directory of OpenHarmony code and run the following command to access the Docker build environment: ``` -docker run -it -v $(pwd):/home/openharmony openharmony-docker-standard:0.0.1 +docker run -it -v $(pwd):/home/openharmony openharmony-docker-standard:0.0.2 ``` ### Building for Standard-System Devices (reference memory ≥ 128 MB) diff --git a/docker/standard/Readme.md b/docker/standard/Readme.md index b051121fba18d0685f1f69fd33c63c6c880a5a5e..3ad20d1370ec6652e8d55877e08cb662890336f8 100755 --- a/docker/standard/Readme.md +++ b/docker/standard/Readme.md @@ -10,11 +10,11 @@ OpenHarmony的Docker镜像托管在HuaweiCloud SWR上。开发者可以通过该 1. 获取Docker镜像。 ``` -docker pull swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker-standard:0.0.1 +docker pull swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker-standard:0.0.2 ``` 2. 进入OpenHarmony代码根目录执行如下命令，从而进入Docker构建环境。 ``` -docker run -it -v $(pwd):/home/openharmony swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker-standard:0.0.1 +docker run -it -v $(pwd):/home/openharmony swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker-standard:0.0.2 ``` ##### 方式二：通过Dockerfile 构建本地Docker镜像进行构建 @@ -30,7 +30,7 @@ cd docs/docker/standard ``` 3. 进入OpenHarmony代码根目录执行如下命令，从而进入Docker构建环境。 ``` -docker run -it -v $(pwd):/home/openharmony openharmony-docker-standard:0.0.1 +docker run -it -v $(pwd):/home/openharmony openharmony-docker-standard:0.0.2 ``` ### 编译源码-标准系统类设备（参考内存≥128MB） diff --git a/docker/standard/build.sh b/docker/standard/build.sh index 549a773fc70290e860bfd142ceabbba7a4d5b5f2..7f38da71f63e7b05f05f83db74173c94d5427e84 100755 --- a/docker/standard/build.sh +++ b/docker/standard/build.sh @@ -13,4 +13,4 @@ #!/bin/sh -docker build -t openharmony-docker-standard:0.0.1 . +docker build -t openharmony-docker-standard:0.0.2 . diff --git a/docker/standard/prebuilts_download.sh b/docker/standard/prebuilts_download.sh index cc9f4fa6bca75076f5dc670432d00548d5faf335..9a410a27d5ec6f94de1a713c3bb96583b8d4ca64 100755 --- a/docker/standard/prebuilts_download.sh +++ b/docker/standard/prebuilts_download.sh @@ -1,4 +1,4 @@ -# Copyright (c) 2020 Huawei Device Co., Ltd. +# Copyright (c) 2020 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -32,6 +32,8 @@ prebuilts,https://repo.huaweicloud.com/harmonyos/compiler/hc-gen/0.65/linux/hc-g prebuilts/gcc/linux-x86/arm,https://repo.huaweicloud.com/harmonyos/compiler/prebuilts_gcc_linux-x86_arm_gcc-linaro-7.5.0-arm-linux-gnueabi/1.0/prebuilts_gcc_linux-x86_arm_gcc-linaro-7.5.0-arm-linux-gnueabi.tar.gz prebuilts/clang/host,https://repo.huaweicloud.com/harmonyos/compiler/prebuilts_clang_aosp_linux-x86_64/1.0/prebuilts_clang_aosp_linux-x86_64.tar.gz prebuilts/sdk/js-loader/build-tools,https://repo.huaweicloud.com/harmonyos/compiler/ace-loader/1.0/ace-loader.tar.gz +prebuilts/clang/ohos/linux-x86_64,https://repo.huaweicloud.com/harmonyos/compiler/clang/10.0.1-62608/linux/llvm.tar.gz +prebuilts/build-tools/common,https://repo.huaweicloud.com/harmonyos/compiler/restool/1.023-c/restool.tar.gz """ if [ ! -d "${bin_dir}" ];then mkdir -p "${bin_dir}" diff --git a/en/device-dev/get-code/gettools-acquire.md b/en/device-dev/get-code/gettools-acquire.md index 453cce21c04f24a2a64605a38e8f5f433ffe6994..e1654c255a4f54a49a35f9739413fc74b22e3ea4 100644 --- a/en/device-dev/get-code/gettools-acquire.md +++ b/en/device-dev/get-code/gettools-acquire.md @@ -180,13 +180,13 @@ hb set 1. Obtain the Docker image. ``` - docker pull swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker-standard:0.0.1 + docker pull swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker-standard:0.0.2 ``` 2. Go to the root directory of OpenHarmony code and run the following command to access the Docker build environment: ``` - docker run -it -v $(pwd):/home/openharmony swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker-standard:0.0.1 + docker run -it -v $(pwd):/home/openharmony swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker-standard:0.0.2 ``` @@ -208,7 +208,7 @@ hb set 3. Go to the root directory of OpenHarmony code and run the following command to access the Docker build environment: ``` - docker run -it -v $(pwd):/home/openharmony openharmony-docker-standard:0.0.1 + docker run -it -v $(pwd):/home/openharmony openharmony-docker-standard:0.0.2 ``` @@ -289,7 +289,7 @@ Start building. Docker can be automatically installed only in Ubuntu. If you are This example uses the **@ohos/hispark\_taurus** solution for illustration. If the execution is successful, the output is as follows: - + ``` ... ohos ipcamera_hispark_taurus build success! diff --git a/zh-cn/device-dev/bundles/figure/zh-cn_image_0000001188041297.png b/zh-cn/device-dev/bundles/figure/zh-cn_image_0000001188041297.png old mode 100755 new mode 100644 diff --git a/zh-cn/device-dev/get-code/gettools-acquire.md b/zh-cn/device-dev/get-code/gettools-acquire.md index 942635e189a91797d3624a574a4d2892d52e6a7d..e10ba6af345e93c6a3360298bf7ed99334c4df49 100644 --- a/zh-cn/device-dev/get-code/gettools-acquire.md +++ b/zh-cn/device-dev/get-code/gettools-acquire.md @@ -180,13 +180,13 @@ hb set 1. 获取Docker镜像。 ``` - docker pull swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker-standard:0.0.1 + docker pull swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker-standard:0.0.2 ``` 2. 进入OpenHarmony代码根目录执行如下命令，从而进入Docker构建环境。 ``` - docker run -it -v $(pwd):/home/openharmony swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker-standard:0.0.1 + docker run -it -v $(pwd):/home/openharmony swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker-standard:0.0.2 ``` @@ -208,7 +208,7 @@ hb set 3. 进入OpenHarmony代码根目录执行如下命令，从而进入Docker构建环境。 ``` - docker run -it -v $(pwd):/home/openharmony openharmony-docker-standard:0.0.1 + docker run -it -v $(pwd):/home/openharmony openharmony-docker-standard:0.0.2 ``` @@ -289,7 +289,7 @@ docker\_dist是一个[HPM](https://hpm.harmonyos.com/)系统中的模板组件 以上两种方式以@ohos/hispark\_taurus为例，执行成功结果如下： - + ``` ...... ohos ipcamera_hispark_taurus build success! diff --git a/zh-cn/device-dev/kernel/figure/Snipaste_2021-01-26_10-38-58-25.png b/zh-cn/device-dev/kernel/figure/Snipaste_2021-01-26_10-38-58-25.png old mode 100755 new mode 100644 diff --git a/zh-cn/device-dev/kernel/figure/Snipaste_2021-01-26_10-38-58-26.png b/zh-cn/device-dev/kernel/figure/Snipaste_2021-01-26_10-38-58-26.png old mode 100755 new mode 100644 diff --git a/zh-cn/device-dev/kernel/figure/zh-cn_image_0000001133848164.png b/zh-cn/device-dev/kernel/figure/zh-cn_image_0000001133848164.png old mode 100755 new mode 100644 diff --git a/zh-cn/device-dev/kernel/figure/zh-cn_image_0000001133848370.png b/zh-cn/device-dev/kernel/figure/zh-cn_image_0000001133848370.png old mode 100755 new mode 100644 diff --git a/zh-cn/device-dev/kernel/figure/zh-cn_image_0000001133848906.png b/zh-cn/device-dev/kernel/figure/zh-cn_image_0000001133848906.png old mode 100755 new mode 100644 diff --git a/zh-cn/device-dev/kernel/figure/zh-cn_image_0000001134008030.png b/zh-cn/device-dev/kernel/figure/zh-cn_image_0000001134008030.png old mode 100755 new mode 100644 diff --git a/zh-cn/device-dev/kernel/figure/zh-cn_image_0000001134008686.png b/zh-cn/device-dev/kernel/figure/zh-cn_image_0000001134008686.png old mode 100755 new mode 100644 diff --git a/zh-cn/device-dev/kernel/figure/zh-cn_image_0000001134008688.png b/zh-cn/device-dev/kernel/figure/zh-cn_image_0000001134008688.png old mode 100755 new mode 100644 diff --git a/zh-cn/device-dev/kernel/figure/zh-cn_image_0000001179847649.png b/zh-cn/device-dev/kernel/figure/zh-cn_image_0000001179847649.png old mode 100755 new mode 100644 diff --git a/zh-cn/device-dev/kernel/figure/zh-cn_image_0000001179848349.png b/zh-cn/device-dev/kernel/figure/zh-cn_image_0000001179848349.png old mode 100755 new mode 100644 diff --git a/zh-cn/device-dev/kernel/figure/zh-cn_image_0000001179848731.png b/zh-cn/device-dev/kernel/figure/zh-cn_image_0000001179848731.png old mode 100755 new mode 100644 diff --git a/zh-cn/device-dev/kernel/figure/zh-cn_image_0000001179967527.png b/zh-cn/device-dev/kernel/figure/zh-cn_image_0000001179967527.png old mode 100755 new mode 100644 diff --git a/zh-cn/device-dev/kernel/figure/zh-cn_image_0000001179967909.png b/zh-cn/device-dev/kernel/figure/zh-cn_image_0000001179967909.png old mode 100755 new mode 100644 diff --git "a/zh-cn/device-dev/kernel/figure/\346\230\276\347\244\272\347\273\223\346\236\234\345\246\202\344\270\213-24.png" "b/zh-cn/device-dev/kernel/figure/\346\230\276\347\244\272\347\273\223\346\236\234\345\246\202\344\270\213-24.png" old mode 100755 new mode 100644 diff --git a/zh-cn/device-dev/kernel/kernel-standard-overview.md b/zh-cn/device-dev/kernel/kernel-standard-overview.md old mode 100755 new mode 100644