openharmony/applications_settings
1
0
Fork 0
mirror of https://gitee.com/openharmony/applications_settings synced 2024-11-26 16:10:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ohpm 整改

Browse Source 
Signed-off-by: cwx1161481 <18577333310@163.com>
This commit is contained in:
cwx1161481 2023-09-21 20:57:57 +08:00
parent 16942358d9
commit 54b76d0bce
37 changed files with 327 additions and 1484 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -1,4 +1,6 @@
/node_modules
/oh_modules
/local.properties
/.idea
**/build
/.hvigor

115
build-profile.json5
View File

@ -1,13 +1,28 @@
{
"app": {
"compileSdkVersion": 10,
"compatibleSdkVersion": 10,
"compatibleSdkVersion": 10
,
"products": [
{
"name": "default",
"signingConfig": "release"
}
],
"signingConfigs": [
{
"name": "release",
"material": {
"certpath": "C:\\Users\\Administrator\\.ohos\\config\\openharmony\\auto_ohos_release_applications_settings_com.ohos.settings.cer",
"storePassword": "0000001B8BB7DEA7DFCFD7555780C99AFDA5A805BE9E589C013C3B4117BCCF09AF7FA2C93C18D1E85C7944",
"keyAlias": "debugKey",
"keyPassword": "0000001B20FC40B5F6A0C7D9C9CB39D1CF40A91EB3170DA07CA071E7872D52B43BD343F2D2E4285E0DE8CB",
"profile": "C:\\Users\\Administrator\\.ohos\\config\\openharmony\\auto_ohos_release_applications_settings_com.ohos.settings.p7b",
"signAlg": "SHA256withECDSA",
"storeFile": "C:\\Users\\Administrator\\.ohos\\config\\openharmony\\auto_ohos_release_applications_settings_com.ohos.settings.p12"
}
}
]
},
"modules": [
{
@ -21,7 +36,7 @@
]
}
]
}
},
// {
// "name": "wearable",
// "srcPath": "./product/wearable",
@ -34,53 +49,53 @@
// }
// ]
// },
// {
// "name": "component",
// "srcPath": "./common/component",
// "targets": [
// {
// "name": "default",
// "applyToProducts": [
// "default"
// ]
// }
// ]
// },
// {
// "name": "search",
// "srcPath": "./common/search",
// "targets": [
// {
// "name": "default",
// "applyToProducts": [
// "default"
// ]
// }
// ]
// },
// {
// "name": "settingsBase",
// "srcPath": "./common/settingsBase",
// "targets": [
// {
// "name": "default",
// "applyToProducts": [
// "default"
// ]
// }
// ]
// },
// {
// "name": "utils",
// "srcPath": "./common/utils",
// "targets": [
// {
// "name": "default",
// "applyToProducts": [
// "default"
// ]
// }
// ]
// }
{
"name": "component",
"srcPath": "./common/component",
"targets": [
{
"name": "default",
"applyToProducts": [
"default"
]
}
]
},
{
"name": "search",
"srcPath": "./common/search",
"targets": [
{
"name": "default",
"applyToProducts": [
"default"
]
}
]
},
{
"name": "settingsBase",
"srcPath": "./common/settingsBase",
"targets": [
{
"name": "default",
"applyToProducts": [
"default"
]
}
]
},
{
"name": "utils",
"srcPath": "./common/utils",
"targets": [
{
"name": "default",
"applyToProducts": [
"default"
]
}
]
}
]
}

5
common/component/build-profile.json5
View File

@ -1,13 +1,10 @@
{
"apiType": 'faMode',
"apiType": 'stageMode',
"buildOption": {
},
"targets": [
{
"name": "default",
},
{
"name": "ohosTest",
}
]
}

2
common/component/hvigorfile.js → common/component/hvigorfile.ts
View File

@ -12,4 +12,4 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
module.exports = require('@ohos/hvigor-ohos-plugin').legacyHapTasks
module.exports = require('@ohos/hvigor-ohos-plugin').harTasks;

9
common/component/oh-package.json5 Normal file
View File

@ -0,0 +1,9 @@
{
"license": "ISC",
"devDependencies": {},
"name": "component",
"description": "example description",
"repository": {},
"version": "1.0.0",
"dependencies": {}
}

2
common/component/package-lock.json generated
View File

@ -1,5 +1,3 @@
{
"name": "component",
"version": "1.0.0",
"lockfileVersion": 1
}

14
common/component/package.json
View File

@ -1,14 +0,0 @@
{
"license":"ISC",
"devDependencies":{},
"name":"component",
"ohos":{
"org":"huawei",
"directoryLevel":"module",
"buildTool":"hvigor"
},
"description":"example description",
"repository":{},
"version":"1.0.0",
"dependencies":{}
}

22
common/component/src/main/config.json
View File

@ -1,22 +0,0 @@
{
"app": {
"bundleName": "com.ohos.settings",
"vendor": "ohos",
"version": {
"code": 1000000,
"name": "1.0.0"
}
},
"deviceConfig": {},
"module": {
"package": "com.ohos.settings.common",
"deviceType": [
"phone"
],
"distro": {
"deliveryWithInstall": true,
"moduleName": "component",
"moduleType": "har"
}
}
}

10
common/component/src/main/module.json5 Normal file
View File

@ -0,0 +1,10 @@
{
"module": {
"name": "component",
"type": "har",
"deviceTypes": [
"default",
"tablet"
]
}
}

5
common/search/build-profile.json5
View File

@ -1,13 +1,10 @@
{
"apiType": 'faMode',
"apiType": 'stageMode',
"buildOption": {
},
"targets": [
{
"name": "default",
},
{
"name": "ohosTest",
}
]
}

2
common/search/hvigorfile.js → common/search/hvigorfile.ts
View File

@ -12,4 +12,4 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
module.exports = require('@ohos/hvigor-ohos-plugin').legacyHapTasks
module.exports = require('@ohos/hvigor-ohos-plugin').harTasks

9
common/search/oh-package.json5 Normal file
View File

@ -0,0 +1,9 @@
{
"license": "ISC",
"devDependencies": {},
"name": "search",
"description": "example description",
"repository": {},
"version": "1.0.0",
"dependencies": {}
}

2
common/search/package-lock.json generated
View File

@ -1,5 +1,3 @@
{
"name": "search",
"version": "1.0.0",
"lockfileVersion": 1
}

14
common/search/package.json
View File

@ -1,14 +0,0 @@
{
"license":"ISC",
"devDependencies":{},
"name":"search",
"ohos":{
"org":"huawei",
"directoryLevel":"module",
"buildTool":"hvigor"
},
"description":"example description",
"repository":{},
"version":"1.0.0",
"dependencies":{}
}

22
common/search/src/main/config.json
View File

@ -1,22 +0,0 @@
{
"app": {
"bundleName": "com.ohos.settings",
"vendor": "ohos",
"version": {
"code": 1000000,
"name": "1.0.0"
}
},
"deviceConfig": {},
"module": {
"package": "com.ohos.settings.common",
"deviceType": [
"phone"
],
"distro": {
"deliveryWithInstall": true,
"moduleName": "search",
"moduleType": "har"
}
}
}

10
common/search/src/main/module.json5 Normal file
View File

@ -0,0 +1,10 @@
{
"module": {
"name": "search",
"type": "har",
"deviceTypes": [
"default",
"tablet"
]
}
}

15
common/settingsBase/hvigorfile.ts Normal file
View File

@ -0,0 +1,15 @@
/**
* Copyright (c) 2021 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
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
module.exports = require('@ohos/hvigor-ohos-plugin').harTasks;

9
common/settingsBase/oh-package.json5 Normal file
View File

@ -0,0 +1,9 @@
{
"license": "ISC",
"devDependencies": {},
"name": "settingsbase",
"description": "example description",
"repository": {},
"version": "1.0.0",
"dependencies": {}
}

10
common/settingsBase/src/main/module.json5 Normal file
View File

@ -0,0 +1,10 @@
{
"module": {
"name": "settingsBase",
"type": "har",
"deviceTypes": [
"default",
"tablet"
]
}
}

5
common/utils/build-profile.json5
View File

@ -1,13 +1,10 @@
{
"apiType": 'faMode',
"apiType": 'stageMode',
"buildOption": {
},
"targets": [
{
"name": "default",
},
{
"name": "ohosTest",
}
]
}

2
common/utils/hvigorfile.js → common/utils/hvigorfile.ts
View File

@ -13,4 +13,4 @@
* limitations under the License.
*/
module.exports = require('@ohos/hvigor-ohos-plugin').legacyHapTasks
module.exports = require('@ohos/hvigor-ohos-plugin').harTasks;

9
common/utils/oh-package.json5 Normal file
View File

@ -0,0 +1,9 @@
{
"license": "ISC",
"devDependencies": {},
"name": "utils",
"description": "example description",
"repository": {},
"version": "1.0.0",
"dependencies": {}
}

2
common/utils/package-lock.json generated
View File

@ -1,5 +1,3 @@
{
"name": "utils",
"version": "1.0.0",
"lockfileVersion": 1
}

14
common/utils/package.json
View File

@ -1,14 +0,0 @@
{
"license":"ISC",
"devDependencies":{},
"name":"utils",
"ohos":{
"org":"huawei",
"directoryLevel":"module",
"buildTool":"hvigor"
},
"description":"example description",
"repository":{},
"version":"1.0.0",
"dependencies":{}
}

24
common/utils/src/main/module.json5
View File

@ -1,22 +1,10 @@
{
"app": {
"bundleName": "com.ohos.settings",
"vendor": "ohos",
"version": {
"code": 1000000,
"name": "1.0.0"
}
},
"deviceConfig": {},
"module": {
"package": "com.ohos.settings.common",
"deviceType": [
"phone"
],
"distro": {
"deliveryWithInstall": true,
"moduleName": "utils",
"moduleType": "har"
}
"name": "utils",
"type": "har",
"deviceTypes": [
"default",
"tablet"
]
}
}

62
hvigorw Normal file
View File

@ -0,0 +1,62 @@
/**
* Copyright (c) 2023 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
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#!/bin/bash
# ----------------------------------------------------------------------------
# Hvigor startup script, version 1.0.0
#
# Required ENV vars:
# ------------------
# NODE_HOME - location of a Node home dir
# or
# Add /usr/local/nodejs/bin to the PATH environment variable
# ----------------------------------------------------------------------------
HVIGOR_APP_HOME="`pwd -P`"
HVIGOR_WRAPPER_SCRIPT=${HVIGOR_APP_HOME}/hvigor/hvigor-wrapper.js
warn() {
echo ""
echo -e "\033[1;33m`date '+[%Y-%m-%d %H:%M:%S]'`$@\033[0m"
}
error() {
echo ""
echo -e "\033[1;31m`date '+[%Y-%m-%d %H:%M:%S]'`$@\033[0m"
}
fail() {
error "$@"
exit 1
}
# Determine node to start hvigor wrapper script
if [ -n "${NODE_HOME}" ];then
EXECUTABLE_NODE="${NODE_HOME}/bin/node"
if [ ! -x "$EXECUTABLE_NODE" ];then
fail "ERROR: NODE_HOME is set to an invalid directory,check $NODE_HOME\n\nPlease set NODE_HOME in your environment to the location where your nodejs installed"
fi
else
EXECUTABLE_NODE="node"
which ${EXECUTABLE_NODE} > /dev/null 2>&1 || fail "ERROR: NODE_HOME is not set and not 'node' command found in your path"
fi
# Check hvigor wrapper script
if [ ! -r "$HVIGOR_WRAPPER_SCRIPT" ];then
fail "ERROR: Couldn't find hvigor/hvigor-wrapper.js in ${HVIGOR_APP_HOME}"
fi
# start hvigor-wrapper script
exec "${EXECUTABLE_NODE}" \
"${HVIGOR_WRAPPER_SCRIPT}" "$@"

78
hvigorw.bat Normal file
View File

@ -0,0 +1,78 @@
/**
* Copyright (c) 2023 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
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
@if "%DEBUG%" == "" @echo off
@rem ##########################################################################
@rem
@rem Hvigor startup script for Windows
@rem
@rem ##########################################################################
@rem Set local scope for the variables with windows NT shell
if "%OS%"=="Windows_NT" setlocal
set DIRNAME=%~dp0
if "%DIRNAME%" == "" set DIRNAME=.
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%
@rem Resolve any "." and ".." in APP_HOME to make it shorter.
for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
set WRAPPER_MODULE_PATH=%APP_HOME%\hvigor\hvigor-wrapper.js
set NODE_EXE=node.exe
goto start
:start
@rem Find node.exe
if defined NODE_HOME goto findNodeFromNodeHome
%NODE_EXE% --version >NUL 2>&1
if "%ERRORLEVEL%" == "0" goto execute
echo.
echo ERROR: NODE_HOME is not set and no 'node' command could be found in your PATH.
echo.
echo Please set the NODE_HOME variable in your environment to match the
echo location of your NodeJs installation.
goto fail
:findNodeFromNodeHome
set NODE_HOME=%NODE_HOME:"=%
set NODE_EXE_PATH=%NODE_HOME%/%NODE_EXE%
if exist "%NODE_EXE_PATH%" goto execute
echo.
echo ERROR: NODE_HOME is not set and no 'node' command could be found in your PATH.
echo.
echo Please set the NODE_HOME variable in your environment to match the
echo location of your NodeJs installation.
goto fail
:execute
@rem Execute hvigor
"%NODE_EXE%" "%WRAPPER_MODULE_PATH%" %*
if "%ERRORLEVEL%" == "0" goto hvigorwEnd
:fail
exit /b 1
:hvigorwEnd
if "%OS%" == "Windows_NT" endlocal
:end

11
oh-package.json5 Normal file
View File

@ -0,0 +1,11 @@
{
"license": "ISC",
"devDependencies": {
"@ohos/hypium": "1.0.6"
},
"name": "application_settings",
"description": "example description",
"repository": {},
"version": "1.0.0",
"dependencies": {}
}

1232
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

19
package.json
View File

@ -1,19 +0,0 @@
{
"license": "ISC",
"devDependencies": {},
"name": "application_settings",
"ohos": {
"org": "huawei",
"directoryLevel": "project",
"buildTool": "hvigor"
},
"description": "example description",
"repository": {},
"version": "1.0.0",
"dependencies": {
"@ohos/hypium": "1.0.1",
"@ohos/hvigor-ohos-plugin": "1.1.6",
"hypium": "^1.0.0",
"@ohos/hvigor": "1.1.6"
}
}

9
product/phone/oh-package.json5 Normal file
View File

@ -0,0 +1,9 @@
{
"license": "ISC",
"devDependencies": {},
"name": "wearable",
"description": "example description",
"repository": {},
"version": "1.0.0",
"dependencies": {}
}

2
product/phone/package-lock.json generated
View File

@ -1,5 +1,3 @@
{
"name": "phone",
"version": "1.0.0",
"lockfileVersion": 1
}

14
product/phone/package.json
View File

@ -1,14 +0,0 @@
{
"license": "ISC",
"devDependencies": {},
"name": "phone",
"ohos": {
"org": "huawei",
"directoryLevel": "module",
"buildTool": "hvigor"
},
"description": "example description",
"repository": {},
"version": "1.0.0",
"dependencies": {}
}

3
product/wearable/build-profile.json5
View File

@ -5,9 +5,6 @@
"targets": [
{
"name": "default",
},
{
"name": "ohosTest",
}
]
}

2
product/wearable/hvigorfile.js → product/wearable/hvigorfile.ts
View File

@ -14,4 +14,4 @@
*/
// Script for compiling build behavior. It is built in the build plug-in and cannot be modified currently.
module.exports = require('@ohos/hvigor-ohos-plugin').hapTasks
module.exports = require('@ohos/hvigor-ohos-plugin').harTasks;

9
product/wearable/package.json → product/wearable/oh-package.json5
View File

@ -1,13 +1,8 @@
{
"license": "ISC",
"name": "phone",
"version": "1.0.0",
"ohos": {
"org": "huawei",
"buildTool": "hvigor",
"directoryLevel": "module"
},
"description": "example description",
"repository": {},
"license": "ISC",
"version": "1.0.0",
"dependencies": {}
}

33
product/wearable/src/main/module.json5
View File

@ -1,37 +1,10 @@
{
"module": {
"name": "phone",
"type": "entry",
"srcEntrance": "./ets/Application/AbilityStage.ts",
"description": "$string:entry_desc",
"mainElement": "MainAbility",
"name": "wearable",
"type": "har",
"deviceTypes": [
"phone",
"default",
"tablet"
],
"deliveryWithInstall": true,
"installationFree": false,
"pages": "$profile:main_pages",
"uiSyntax": "ets",
"abilities": [
{
"name": "com.ohos.settings.MainAbility",
"srcEntrance": "./ets/MainAbility/MainAbility.ts",
"description": "$string:MainAbility_desc",
"icon": "$media:icon",
"label": "$string:MainAbility_label",
"visible": true,
"skills": [
{
"entities": [
"entity.system.home"
],
"actions": [
"action.system.home"
]
}
]
}
]
}
}