diff --git a/docker/standard/CHANGELOG.md b/docker/standard/CHANGELOG.md index 42434adbdc1478b14f0e8c85a795053489ecb52f..14fe8b29527e9f11deec749e29117beda1820b01 100644 --- a/docker/standard/CHANGELOG.md +++ b/docker/standard/CHANGELOG.md @@ -1,3 +1,7 @@ + ### 0.0.5(2021/10/28) + +新增安装tar、binutils、git-lfs、gnutls-bin、python3.8、python3-pip、cpio。 + ### 0.0.4(2021/09/18) 1、删除编译依赖的工具预装。 diff --git a/docker/standard/CHANGELOG_en.md b/docker/standard/CHANGELOG_en.md index c14f7da669e47373428efeb2af817289c852c2e9..978182aa1cc0022ad068b3d750d18e930c13d817 100644 --- a/docker/standard/CHANGELOG_en.md +++ b/docker/standard/CHANGELOG_en.md @@ -1,3 +1,7 @@ + ### 0.0.5(2021/10/28) + +Added the installation of tar, binutils, git-lfs, gnutls-bin, python3.8, python3-pip and cpio. + ### 0.0.4(2021/09/18) 1\. dropped pre-installed build dependency tools. diff --git a/docker/standard/Readme-en.md b/docker/standard/Readme-en.md index 679d8e054a1926763fa4f7eaed21efecaefef09f..cd12fd5a04d5b06ced9ee6fa911c1a53d8761eb5 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.4 +docker pull swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker-standard:0.0.5 ``` 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.4 +docker run -it -v $(pwd):/home/openharmony swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker-standard:0.0.5 ``` ##### **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.4 +docker run -it -v $(pwd):/home/openharmony openharmony-docker-standard:0.0.5 ``` ### Building for Standard-System Devices (reference memory ≥ 128 MB) diff --git a/docker/standard/Readme.md b/docker/standard/Readme.md index 81e6c8a965663531a31d37c64144e3f705839b77..ffedcc403d0747ac7cfa82123d18bbc6a7ecd71a 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.4 +docker pull swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker-standard:0.0.5 ``` 2. 进入OpenHarmony代码根目录执行如下命令,从而进入Docker构建环境。 ``` -docker run -it -v $(pwd):/home/openharmony swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker-standard:0.0.4 +docker run -it -v $(pwd):/home/openharmony swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker-standard:0.0.5 ``` ##### 方式二:通过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.4 +docker run -it -v $(pwd):/home/openharmony openharmony-docker-standard:0.0.5 ``` ### 编译源码-标准系统类设备(参考内存≥128MB) diff --git a/docker/standard/build.sh b/docker/standard/build.sh index 7627d6123d56c009722ed946a9175818827a28e0..9af19591449a65b882832c88f1dfd5bd650b6128 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.4 . +docker build -t openharmony-docker-standard:0.0.5 . diff --git a/docker/standard/dockerfile b/docker/standard/dockerfile index 6e4ef8c3f48a7053efbd268d7c7419200cf512b8..65baafa798852b40d7cba68eb5650307456f0eeb 100755 --- a/docker/standard/dockerfile +++ b/docker/standard/dockerfile @@ -26,6 +26,8 @@ RUN apt-get update \ && apt-get install -y \ apt-utils \ vim \ + tar \ + binutils \ software-properties-common \ openssh-server \ iputils-ping \ @@ -68,6 +70,7 @@ RUN apt-get update \ bison \ doxygen \ git \ + git-lfs \ subversion \ tofrodos \ pigz \ @@ -83,6 +86,10 @@ RUN apt-get update \ lib32z-dev \ openjdk-8-jdk \ ruby \ + gnutls-bin \ + python3.8 \ + python3-pip \ + cpio \ && rm -rf /bin/sh \ && ln -s /bin/bash /bin/sh \ && mkdir -p $PREBUILTS_DIR/prebuilts $HOME_TOOLS diff --git a/en/device-dev/get-code/gettools-acquire.md b/en/device-dev/get-code/gettools-acquire.md index 31e2b3212c6db58fd8cd19ea82fea1ccf3b9c3a8..ce5512e1a6459ba18560349b0b8b5379f6a5c90f 100644 --- a/en/device-dev/get-code/gettools-acquire.md +++ b/en/device-dev/get-code/gettools-acquire.md @@ -52,7 +52,7 @@ OpenHarmony provides the following two types of Docker environments for you to q

swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker-standard

-

0.0.4

+

0.0.5

HPM-based Docker environment

@@ -70,6 +70,7 @@ OpenHarmony provides the following two types of Docker environments for you to q + ## Preparations Before using the Docker environment, perform the following operations: @@ -179,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.4 + docker pull swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker-standard:0.0.5 ``` 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.4 + docker run -it -v $(pwd):/home/openharmony swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker-standard:0.0.5 ``` @@ -207,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.4 + docker run -it -v $(pwd):/home/openharmony openharmony-docker-standard:0.0.5 ``` diff --git a/en/device-dev/guide/device-clock-guide.md b/en/device-dev/guide/device-clock-guide.md index 9ddbe73f5d13658e0889e2135538a7caac6ed7f6..81918c4596a0dcea072e9c9f5489fec21ea0449a 100644 --- a/en/device-dev/guide/device-clock-guide.md +++ b/en/device-dev/guide/device-clock-guide.md @@ -257,7 +257,7 @@ To build such an app, we can create a page that has a flexible layout with two r ## Signing and Packaging -After finishing writing the app code, you need to sign and package the app before running it on a real device. For details, see [Signing and Packaging Guide](../../application-dev/quick-start/configuring-the-openharmony-app-signature.md). +After finishing writing the app code, you need to sign and package the app before running it on a real device. For details, see [Configuring the OpenHarmony App Signature](../../application-dev/quick-start/configuring-the-openharmony-app-signature.md). ## Running on the Real Device diff --git a/en/device-dev/quick-start/quickstart-standard-docker-environment.md b/en/device-dev/quick-start/quickstart-standard-docker-environment.md index 6cb423557f300d8f98107d8daaa40cab824c1b92..e04092d2cefc7a508a45a7a83e647e38a6e409ce 100644 --- a/en/device-dev/quick-start/quickstart-standard-docker-environment.md +++ b/en/device-dev/quick-start/quickstart-standard-docker-environment.md @@ -63,13 +63,13 @@ bash build/prebuilts_download.sh 1. Obtain the Docker image. ``` - docker pull swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker-standard:0.0.4 + docker pull swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker-standard:0.0.5 ``` 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.4 + docker run -it -v $(pwd):/home/openharmony swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker-standard:0.0.5 ``` @@ -91,7 +91,7 @@ bash build/prebuilts_download.sh 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.4 + docker run -it -v $(pwd):/home/openharmony openharmony-docker-standard:0.0.5 ``` diff --git a/en/readme/test_subsystem.md b/en/readme/test_subsystem.md index f81632dcb566d1ba86c4585871708a414ec9b9d1..7e99638f87ceb7805a8fd2badab54d01d72e30d2 100644 --- a/en/readme/test_subsystem.md +++ b/en/readme/test_subsystem.md @@ -53,7 +53,7 @@ subsystem # Subsystem │ │ ├── ivi │ │ └── liteos-a │ │ ... - │ └── ohos_build # Build entry configuration +│ └── ohos_build # Build entry configuration ... ``` > **Note:** Test cases are classified into common test cases and device-specific test cases. You are advised to place common test cases in the **common** directory and device-specific test cases in the directories of the related devices. @@ -113,12 +113,12 @@ Example: void CalculatorSubTest::SetUp(void) { - // Set a setup function, which will be called before all test cases. + // Set a setup function, which will be called before each test case. } void CalculatorSubTest::TearDown(void) { - // Set a teardown function, which will be called after all test cases. + // Set a teardown function, which will be called after each test case. } /** @@ -186,12 +186,12 @@ Example: void CalculatorSubTest::SetUp(void) { - // Set a setup function, which will be called before all test cases. + // Set a setup function, which will be called before each test case. } void CalculatorSubTest::TearDown(void) { - // Set a teardown function, which will be called after all test cases. + // Set a teardown function, which will be called after each test case. } ``` > **Note**: When defining a test suite, ensure that the test suite name is the same as the target to build and uses the upper camel case style. @@ -279,12 +279,12 @@ Example: }) beforeEach(function() { - // Set a setup function, which will be called before all test cases. + // Set a setup function, which will be called before each test case. console.info('beforeEach caled') }) afterEach(function() { - // Set a teardown function, which will be called after all test cases. + // Set a teardown function, which will be called after each test case. console.info('afterEach caled') }) @@ -341,12 +341,12 @@ Example: }) beforeEach(function() { - // Set a setup function, which will be called before all test cases. + // Set a setup function, which will be called before each test case. console.info('beforeEach caled') }) afterEach(function() { - // Set a teardown function, which will be called after all test cases. + // Set a teardown function, which will be called after each test case. console.info('afterEach caled') }) ``` @@ -757,12 +757,12 @@ When the build is complete, the test cases are automatically saved in the **out/ ``` In the command: ``` - -**t [TESTTYPE]**: specifies the test case type, which can be **UT**, **MST**, **ST**, or **PERF**. This parameter is mandatory. - -**tp [TESTTYPE]**: specifies a part, which can be used independently. - -**tm [TESTTYPE]**: specifies a module. This parameter must be specified together with **-tp**. - -**ts [TESTTYPE]**: specifies a test suite, which can be used independently. - -**tc [TESTTYPE]**: specifies a test case. This parameter must be specified together with **-ts**. - -You can run **h** to display help information. + -t [TESTTYPE]: specifies the test case type, which can be UT, MST, ST, or PERF. This parameter is mandatory. + -tp [TESTTYPE]: specifies a part, which can be used independently. + -tm [TESTTYPE]: specifies a module. This parameter must be specified together with -tp. + -ts [TESTTYPE]: specifies a test suite, which can be used independently. + -tc [TESTTYPE]: specifies a test case. This parameter must be specified together with -ts. + You can run -h to display help information. ``` ### Executing Test Cases on Linux #### Mapping Remote Port @@ -797,12 +797,12 @@ To enable test cases to be executed on a remote Linux server or a Linux VM, map ``` In the command: ``` - -**t [TESTTYPE]**: specifies the test case type, which can be **UT**, **MST**, **ST**, or **PERF**. This parameter is mandatory. - -**tp [TESTTYPE]**: specifies a part, which can be used independently. - -**tm [TESTTYPE]**: specifies a module. This parameter must be specified together with **-tp**. - -**ts [TESTTYPE]**: specifies a test suite, which can be used independently. - -**tc [TESTTYPE]**: specifies a test case. This parameter must be specified together with **-ts**. - -You can run **h** to display help information. + -t [TESTTYPE]: specifies the test case type, which can be UT, MST, ST, or PERF. This parameter is mandatory. + -tp [TESTTYPE]: specifies a part, which can be used independently. + -tm [TESTTYPE]: specifies a module. This parameter must be specified together with -tp. + -ts [TESTTYPE]: specifies a test suite, which can be used independently. + -tc [TESTTYPE]: specifies a test case. This parameter must be specified together with -ts. + You can run -h to display help information. ``` ## Viewing the Test Report diff --git a/zh-cn/application-dev/js-reference/apis/js-apis-libupdateclient.md b/zh-cn/application-dev/js-reference/apis/js-apis-libupdateclient.md index 260f7b7f6d946d90947d67f0d71189a934de4597..de1b3d9eaac5b5283f52c1c371213588d44e08a0 100644 --- a/zh-cn/application-dev/js-reference/apis/js-apis-libupdateclient.md +++ b/zh-cn/application-dev/js-reference/apis/js-apis-libupdateclient.md @@ -39,7 +39,7 @@ ## 导入模块 ``` -import client from 'libupdateclient.z.so' +import client from '@ohos.update' ``` ## 权限列表 diff --git a/zh-cn/device-dev/get-code/gettools-acquire.md b/zh-cn/device-dev/get-code/gettools-acquire.md index 543098f5f4a2a64c819b1e1fdef8b56d4463ba49..5381dd4199cbbbf6a6c962dea25050e4bbb1d4d3 100644 --- a/zh-cn/device-dev/get-code/gettools-acquire.md +++ b/zh-cn/device-dev/get-code/gettools-acquire.md @@ -52,7 +52,7 @@ OpenHarmony为开发者提供了两种Docker环境,以帮助开发者快速完

swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker-standard

-

0.0.4

+

0.0.5

HPM Docker环境

@@ -70,6 +70,7 @@ OpenHarmony为开发者提供了两种Docker环境,以帮助开发者快速完 + ## 环境准备 在使用docker环境前需要先完成以下操作: @@ -179,13 +180,13 @@ hb set 1. 获取Docker镜像。 ``` - docker pull swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker-standard:0.0.4 + docker pull swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker-standard:0.0.5 ``` 2. 进入OpenHarmony代码根目录执行如下命令,从而进入Docker构建环境。 ``` - docker run -it -v $(pwd):/home/openharmony swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker-standard:0.0.4 + docker run -it -v $(pwd):/home/openharmony swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker-standard:0.0.5 ``` @@ -207,7 +208,7 @@ hb set 3. 进入OpenHarmony代码根目录执行如下命令,从而进入Docker构建环境。 ``` - docker run -it -v $(pwd):/home/openharmony openharmony-docker-standard:0.0.4 + docker run -it -v $(pwd):/home/openharmony openharmony-docker-standard:0.0.5 ``` diff --git a/zh-cn/device-dev/get-code/sourcecode-acquire.md b/zh-cn/device-dev/get-code/sourcecode-acquire.md index 24f68946d826d0893f402133a7a75b2e2c25f8f1..24dbe526dfc776f3e675abda9363786e70f14149 100644 --- a/zh-cn/device-dev/get-code/sourcecode-acquire.md +++ b/zh-cn/device-dev/get-code/sourcecode-acquire.md @@ -144,7 +144,7 @@ OpenHarmony是由开放原子开源基金会(OpenAtom Foundation)孵化及 4. 查找合适的发行版,点击查看发行版的详情介绍。 **图 1** 包管理 - ![](figures/包管理.png "包管理") + ![](figure/包管理.png "包管理") 2. 了解发行版详情。 @@ -153,7 +153,7 @@ OpenHarmony是由开放原子开源基金会(OpenAtom Foundation)孵化及 3. 点击「定制组件」,将对发行版包含的组件进行定制(添加/删除)。 **图 2** 发行版示例 - ![](figures/发行版示例.png "发行版示例") + ![](figure/发行版示例.png "发行版示例") 3. 定制组件。 1. 进入发行版的定制页面,如下图所示。 @@ -162,7 +162,7 @@ OpenHarmony是由开放原子开源基金会(OpenAtom Foundation)孵化及 4. 点击“下载“,系统会根据您的选择,生成相应的OpenHarmony代码结构文件\(如my\_cust\_dist.zip\),保存至本地文件。 **图 3** 组件定制 - ![](figures/组件定制.png "组件定制") + ![](figure/组件定制.png "组件定制") 4. 安装组件。 1. 解压下载的压缩文件,用命令行工具CMD(Linux下的Shell终端)。 diff --git a/zh-cn/device-dev/quick-start/quickstart-lite-env-setup-linux.md b/zh-cn/device-dev/quick-start/quickstart-lite-env-setup-linux.md index 82060c5bfd4b356259a0c211a25c966d3036f022..590dd9a7b53b338c3a13a9a227c2d1dc3fbf05d6 100644 --- a/zh-cn/device-dev/quick-start/quickstart-lite-env-setup-linux.md +++ b/zh-cn/device-dev/quick-start/quickstart-lite-env-setup-linux.md @@ -92,7 +92,7 @@ Linux服务器通用环境配置需要的工具及其获取途径如下表所示 使用如下apt-get命令安装编译所需的必要的库和工具: ``` -sudo apt-get install build-essential gcc g++ make zlib* libffi-dev e2fsprogs pkg-config flex bison perl bc openssl libssl-dev libelf-dev libc6-dev-amd64 binutils binutils-dev libdwarf-dev u-boot-tools mtd-utils gcc-arm-linux-gnueabi +sudo apt-get install build-essential gcc g++ make zlib* libffi-dev e2fsprogs pkg-config flex bison perl bc openssl libssl-dev libelf-dev libc6-dev-amd64 binutils binutils-dev libdwarf-dev u-boot-tools mtd-utils gcc-arm-linux-gnueabi cpio device-tree-compiler ``` ## 安装Python3 diff --git a/zh-cn/device-dev/quick-start/quickstart-standard-docker-environment.md b/zh-cn/device-dev/quick-start/quickstart-standard-docker-environment.md index 3addc9ee979d31d35359ffebe815f61df30dc817..33b1c799470679c9e111f50f49afaa0c522c1728 100644 --- a/zh-cn/device-dev/quick-start/quickstart-standard-docker-environment.md +++ b/zh-cn/device-dev/quick-start/quickstart-standard-docker-environment.md @@ -63,13 +63,13 @@ bash build/prebuilts_download.sh 1. 获取Docker镜像。 ``` - docker pull swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker-standard:0.0.4 + docker pull swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker-standard:0.0.5 ``` 2. 进入OpenHarmony代码根目录执行如下命令,从而进入Docker构建环境。 ``` - docker run -it -v $(pwd):/home/openharmony swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker-standard:0.0.4 + docker run -it -v $(pwd):/home/openharmony swr.cn-south-1.myhuaweicloud.com/openharmony-docker/openharmony-docker-standard:0.0.5 ``` @@ -91,7 +91,7 @@ bash build/prebuilts_download.sh 3. 进入OpenHarmony代码根目录执行如下命令,从而进入Docker构建环境。 ``` - docker run -it -v $(pwd):/home/openharmony openharmony-docker-standard:0.0.4 + docker run -it -v $(pwd):/home/openharmony openharmony-docker-standard:0.0.5 ``` diff --git "a/zh-cn/readme/\345\206\205\346\240\270\345\255\220\347\263\273\347\273\237.md" "b/zh-cn/readme/\345\206\205\346\240\270\345\255\220\347\263\273\347\273\237.md" index 1c1f5ae1fffebd3069fefc2eb6203b69e5b28e6b..c95dec96bea76909df82c24085d888f93ca7b854 100755 --- "a/zh-cn/readme/\345\206\205\346\240\270\345\255\220\347\263\273\347\273\237.md" +++ "b/zh-cn/readme/\345\206\205\346\240\270\345\255\220\347\263\273\347\273\237.md" @@ -14,7 +14,7 @@ ## 简介 -OpenHarmony针对不同量级的系统,分别使用了不同形态的内核,分别为LiteOS和Linux。在轻量系统、小型系统和标准系统上,可以选用LiteOS;在小型系统和标准系统上,可以选用Linux。 +OpenHarmony针对不同量级的系统,分别使用了不同形态的内核,分别为LiteOS和Linux。在轻量系统、小型系统可以选用LiteOS;在小型系统和标准系统上可以选用Linux。 -

系统级别

@@ -33,7 +33,7 @@ OpenHarmony针对不同量级的系统,分别使用了不同形态的内核,

+

×

Linux