!386 适配流水线ohpm编译

Merge pull request !386 from gengzhengxing/gzx080101
This commit is contained in:
openharmony_ci 2023-08-10 09:25:16 +00:00 committed by Gitee
commit ef6d42ad49
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
32 changed files with 266 additions and 213 deletions

View File

@ -79,9 +79,11 @@
</filefilter>
<filefilter name="copyrightPolicyFilter" desc="Filters for copyright header policies">
<filteritem type="filename" name="README|README_zh|.*.log|.*.json5|.*.json" desc=""/>
<filteritem type="filename" name="hvigorw|hvigorw.bat|hvigor-wrapper.js" desc="Build files"/>
</filefilter>
<filefilter name="defaultPolicyFilter" desc="Filters for LICENSE file policies">
<filteritem type="filename" name="README|README_zh|*.log|*.json5|*.json" desc="json file"/>
<filteritem type="filename" name="hvigorw|hvigorw.bat|hvigor-wrapper.js" desc="Build files"/>
</filefilter>
</filefilterlist>
</oatconfig>

View File

@ -1,5 +1,8 @@
# 应用子系统/Launcher更新说明
## 2023/08/09更新説明
1. 适配流水线ohpm编译
## 2023/06/27更新説明
1. dialog内存泄漏修复
2. 修复:进入图库服务卡片界面后,再进入相机服务卡片界面显示异常

8
common/oh-package.json5 Normal file
View File

@ -0,0 +1,8 @@
{
"devDependencies": {},
"name": "@ohos/common",
"description": "a npm package which contains common function",
"main": "index.ets",
"version": "1.0.0",
"dependencies": {}
}

View File

@ -1,14 +0,0 @@
{
"devDependencies": {},
"name": "@ohos/common",
"description": "a npm package which contains common function",
"ohos": {
"org": "huawei",
"directoryLevel": "module",
"buildTool": "hvigor"
},
"main": "index.ets",
"version": "1.0.0",
"dependencies": {},
"type": "module"
}

View File

@ -0,0 +1,10 @@
{
"devDependencies": {},
"name": "@ohos/appcenter",
"description": "a npm package which contains appcenter feature",
"main": "index.ets",
"version": "1.0.0",
"dependencies": {
"@ohos/common": "../../common"
}
}

View File

@ -1,16 +0,0 @@
{
"devDependencies": {},
"name": "@ohos/appcenter",
"description": "a npm package which contains appcenter feature",
"ohos": {
"org": "huawei",
"directoryLevel": "module",
"buildTool": "hvigor"
},
"main": "index.ets",
"version": "1.0.0",
"dependencies": {
"@ohos/common": "../../common"
},
"type": "module"
}

View File

@ -0,0 +1,10 @@
{
"devDependencies": {},
"name": "@ohos/bigfolder",
"description": "a npm package which contains bigfolder feature",
"main": "index.ets",
"version": "1.0.0",
"dependencies": {
"@ohos/common": "../../common"
}
}

View File

@ -1,16 +0,0 @@
{
"devDependencies": {},
"name": "@ohos/bigfolder",
"description": "a npm package which contains bigfolder feature",
"ohos": {
"org": "huawei",
"directoryLevel": "module",
"buildTool": "hvigor"
},
"main": "index.ets",
"version": "1.0.0",
"dependencies": {
"@ohos/common": "../../common"
},
"type": "module"
}

View File

@ -0,0 +1,10 @@
{
"devDependencies": {},
"name": "@ohos/form",
"description": "a npm package which contains form feature",
"main": "index.ets",
"version": "1.0.0",
"dependencies": {
"@ohos/common": "../../common"
}
}

View File

@ -1,16 +0,0 @@
{
"devDependencies": {},
"name": "@ohos/form",
"description": "a npm package which contains form feature",
"ohos": {
"org": "huawei",
"directoryLevel": "module",
"buildTool": "hvigor"
},
"main": "index.ets",
"version": "1.0.0",
"dependencies": {
"@ohos/common": "../../common"
},
"type": "module"
}

View File

@ -0,0 +1,10 @@
{
"devDependencies": {},
"name": "@ohos/gesturenavigation",
"description": "a npm package which contains gesturenavigation feature",
"main": "index.ets",
"version": "1.0.0",
"dependencies": {
"@ohos/common": "../../common"
}
}

View File

@ -1,16 +0,0 @@
{
"devDependencies": {},
"name": "@ohos/gesturenavigation",
"description": "a npm package which contains gesturenavigation feature",
"ohos": {
"org": "huawei",
"directoryLevel": "module",
"buildTool": "hvigor"
},
"main": "index.ets",
"version": "1.0.0",
"dependencies": {
"@ohos/common": "../../common"
},
"type": "module"
}

View File

@ -0,0 +1,10 @@
{
"devDependencies": {},
"name": "@ohos/numbadge",
"description": "a npm package which contains numbadge feature",
"main": "index.ets",
"version": "1.0.0",
"dependencies": {
"@ohos/common": "../../common"
}
}

View File

@ -1,16 +0,0 @@
{
"devDependencies": {},
"name": "@ohos/numbadge",
"description": "a npm package which contains numbadge feature",
"ohos": {
"org": "huawei",
"directoryLevel": "module",
"buildTool": "hvigor"
},
"main": "index.ets",
"version": "1.0.0",
"dependencies": {
"@ohos/common": "../../common"
},
"type": "module"
}

View File

@ -0,0 +1,12 @@
{
"devDependencies": {},
"name": "@ohos/pagedesktop",
"description": "a npm package which contains pagedesktop feature",
"main": "index.ets",
"version": "1.0.0",
"dependencies": {
"@ohos/bigfolder": "../bigfolder",
"@ohos/form": "../form",
"@ohos/common": "../../common"
}
}

View File

@ -1,18 +0,0 @@
{
"devDependencies": {},
"name": "@ohos/pagedesktop",
"description": "a npm package which contains pagedesktop feature",
"ohos": {
"org": "huawei",
"directoryLevel": "module",
"buildTool": "hvigor"
},
"main": "index.ets",
"version": "1.0.0",
"dependencies": {
"@ohos/bigfolder": "../bigfolder",
"@ohos/form": "../form",
"@ohos/common": "../../common"
},
"type": "module"
}

View File

@ -0,0 +1,10 @@
{
"devDependencies": {},
"name": "@ohos/recents",
"description": "a npm package which contains recents feature",
"main": "index.ets",
"version": "1.0.0",
"dependencies": {
"@ohos/common": "../../common"
}
}

View File

@ -1,16 +0,0 @@
{
"devDependencies": {},
"name": "@ohos/recents",
"description": "a npm package which contains recents feature",
"ohos": {
"org": "huawei",
"directoryLevel": "module",
"buildTool": "hvigor"
},
"main": "index.ets",
"version": "1.0.0",
"dependencies": {
"@ohos/common": "../../common"
},
"type": "module"
}

View File

@ -0,0 +1,9 @@
{
"devDependencies": {},
"name": "launcher_settings",
"description": "",
"version": "1.0.0",
"dependencies": {
"@ohos/common": "../../common"
}
}

View File

@ -1,13 +0,0 @@
{
"devDependencies": {},
"name": "launcher_settings",
"ohos": {
"org": "huawei",
"directoryLevel": "module",
"buildTool": "hvigor"
},
"version": "1.0.0",
"dependencies": {
"@ohos/common": "../../common"
}
}

View File

@ -0,0 +1,10 @@
{
"devDependencies": {},
"name": "@ohos/smartdock",
"description": "a npm package which contains smartdock feature",
"main": "index.ets",
"version": "1.0.0",
"dependencies": {
"@ohos/common": "../../common"
}
}

View File

@ -1,16 +0,0 @@
{
"devDependencies": {},
"name": "@ohos/smartdock",
"description": "a npm package which contains smartdock feature",
"ohos": {
"org": "huawei",
"directoryLevel": "module",
"buildTool": "hvigor"
},
"main": "index.ets",
"version": "1.0.0",
"dependencies": {
"@ohos/common": "../../common"
},
"type": "module"
}

View File

@ -0,0 +1,6 @@
{
"hvigorVersion": "2.1.1",
"dependencies": {
"@ohos/hvigor-ohos-plugin": "2.1.1"
}
}

2
hvigor/hvigor-wrapper.js Normal file

File diff suppressed because one or more lines are too long

48
hvigorw Normal file
View File

@ -0,0 +1,48 @@
#!/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=$(dirname $(readlink -f $0))
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}/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}" "$@"

64
hvigorw.bat Normal file
View File

@ -0,0 +1,64 @@
@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

9
oh-package.json5 Normal file
View File

@ -0,0 +1,9 @@
{
"devDependencies": {
"@ohos/hypium": "1.0.6"
},
"name": "launcher",
"description": "",
"version": "1.0.0",
"dependencies": {}
}

View File

@ -1,15 +0,0 @@
{
"devDependencies": {},
"name": "launcher",
"ohos": {
"org": "huawei",
"directoryLevel": "project",
"buildTool": "hvigor"
},
"version": "1.0.0",
"dependencies": {
"@ohos/hvigor-ohos-plugin": "1.3.1",
"@ohos/hvigor": "1.3.1",
"@ohos/hypium": "1.0.3"
}
}

View File

@ -0,0 +1,17 @@
{
"devDependencies": {},
"name": "launcher",
"description": "",
"version": "1.0.0",
"dependencies": {
"@ohos/pagedesktop": "../../feature/pagedesktop",
"@ohos/recents": "../../feature/recents",
"@ohos/bigfolder": "../../feature/bigfolder",
"@ohos/appcenter": "../../feature/appcenter",
"@ohos/smartdock": "../../feature/smartdock",
"@ohos/form": "../../feature/form",
"@ohos/gesturenavigation": "../../feature/gesturenavigation",
"@ohos/common": "../../common",
"@ohos/numbadge": "../../feature/numbadge"
}
}

View File

@ -1,21 +0,0 @@
{
"devDependencies": {},
"name": "launcher",
"ohos": {
"org": "huawei",
"directoryLevel": "module",
"buildTool": "hvigor"
},
"version": "1.0.0",
"dependencies": {
"@ohos/pagedesktop": "../../feature/pagedesktop",
"@ohos/recents": "../../feature/recents",
"@ohos/bigfolder": "../../feature/bigfolder",
"@ohos/appcenter": "../../feature/appcenter",
"@ohos/smartdock": "../../feature/smartdock",
"@ohos/form": "../../feature/form",
"@ohos/gesturenavigation": "../../feature/gesturenavigation",
"@ohos/common": "../../common",
"@ohos/numbadge": "../../feature/numbadge"
}
}

View File

@ -0,0 +1,16 @@
{
"devDependencies": {},
"name": "launcher",
"description": "",
"version": "1.0.0",
"dependencies": {
"@ohos/pagedesktop": "../../feature/pagedesktop",
"@ohos/recents": "../../feature/recents",
"@ohos/bigfolder": "../../feature/bigfolder",
"@ohos/smartdock": "../../feature/smartdock",
"@ohos/form": "../../feature/form",
"@ohos/gesturenavigation": "../../feature/gesturenavigation",
"@ohos/common": "../../common",
"@ohos/numbadge": "../../feature/numbadge"
}
}

View File

@ -1,20 +0,0 @@
{
"devDependencies": {},
"name": "launcher",
"ohos": {
"org": "huawei",
"directoryLevel": "module",
"buildTool": "hvigor"
},
"version": "1.0.0",
"dependencies": {
"@ohos/pagedesktop": "../../feature/pagedesktop",
"@ohos/recents": "../../feature/recents",
"@ohos/bigfolder": "../../feature/bigfolder",
"@ohos/smartdock": "../../feature/smartdock",
"@ohos/form": "../../feature/form",
"@ohos/gesturenavigation": "../../feature/gesturenavigation",
"@ohos/common": "../../common",
"@ohos/numbadge": "../../feature/numbadge"
}
}