切换ohpm

Signed-off-by: qin_wei_jie <qinweijie2@huawei.com>

OAT.xml

@@ -49,6 +49,8 @@
     <oatconfig>
         <policylist>
             <policy name="projectPolicy" desc="">
+				<policyitem type="license" name="*" path=".*" rule="may" group="defaultGroup" filefilter="defaultPolicyFilter" desc=""/>
+				<policyitem type="copyright" name="*" path=".*" rule="may" group="defaultGroup" filefilter="copyrightPolicyFilter" desc=""/>
 				<policyitem type="copyright" name="Copyright 2015 the original author or authors." path="gradlew" rule="may" group="defaultGroup" filefilter="copyrightPolicyFilter" desc="file generated by development tool"/>
 				<policyitem type="copyright" name="Copyright 2015 the original author or authors." path="gradlew.bat" rule="may" group="defaultGroup" filefilter="copyrightPolicyFilter" desc="file generated by development tool"/>
 			</policy>
@@ -59,11 +61,15 @@
 				<filteritem type="filepath" name="**/.*.json5" desc="build config file"/>
 				<filteritem type="filepath" name="features/.*/.*.json5" desc="build config file"/>
 				<filteritem type="filepath" name="product/.*/.*.json5" desc="build config file"/>
+				<filteritem type="filepath" name="hvigorw" desc="build config file"/>
+				<filteritem type="filepath" name="hvigorw.bat" desc="build config file"/>
             </filefilter>
 			<filefilter name="binaryFileTypePolicyFilter" desc="Filters for binary file policies">
 				<filteritem type="filepath" name="entry/phone/src/main/resources/base/media/.*.png" desc="self developed image"/>
 				<filteritem type="filepath" name="features/screenshot/src/main/resources/base/media/.*.png" desc="self developed image"/>
 				<filteritem type="filepath" name="product/phone/src/main/resources/base/media/.*.png" desc="self developed image"/>
+				<filteritem type="filepath" name="hvigorw" desc="build config file"/>
+				<filteritem type="filepath" name="hvigorw.bat" desc="build config file"/>
 			</filefilter>
 		</filefilterlist>
     </oatconfig>

hvigor/hvigor-config.json5

@@ -0,0 +1,18 @@
+{
+  "hvigorVersion": "2.1.1",
+  "dependencies": {
+    "@ohos/hvigor-ohos-plugin": "2.1.1"
+  },
+  "execution": {
+    // "daemon": true,                          /* Enable daemon compilation. Default: true */
+    // "incremental": true,                     /* Enable incremental compilation. Default: true */
+    // "parallel": true,                        /* Enable parallel compilation. Default: true */
+    // "typeCheck": false,                      /* Enable typeCheck. Default: false */
+  },
+  "logging": {
+    // "level": "info"                          /* Define the log level. Value: [ "debug" | "info" | "warn" | "error" ]. Default: "info" */
+  },
+  "debugging": {
+    // "stacktrace": false                      /* Disable stacktrace compilation. Default: false */
+  }
+}

hvigorw

@@ -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="`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}" "$@"

hvigorw.bat

@@ -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

oh-package.json5

@@ -0,0 +1,11 @@
+{
+  "devDependencies": {
+    "@ohos/hypium": "1.0.7"
+  },
+  "name": "screenshot",
+  "description": "",
+  "version": "1.0.0",
+  "dependencies": {
+    "@ohos/hypium": "^1.0.7"
+  }
+}

package.json

@@ -1,16 +0,0 @@
-{
-	"devDependencies":{},
-	"name":"screenshot",
-	"ohos":{
-		"org":"huawei",
-		"directoryLevel":"project",
-		"buildTool":"hvigor"
-	},
-	"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"
-	}
-}

product/phone/oh-package.json5

@@ -0,0 +1,7 @@
+{
+  "devDependencies": {},
+  "name": "screenshot",
+  "description": "",
+  "version": "1.0.0",
+  "dependencies": {}
+}

product/phone/package-lock.json

@@ -1,5 +0,0 @@
-{
-	"name": "screenshot",
-	"version": "1.0.0",
-	"lockfileVersion": 1
-}

product/phone/package.json

@@ -1,11 +0,0 @@
-{
-	"devDependencies": {},
-	"name": "screenshot",
-	"ohos": {
-		"org": "huawei",
-		"directoryLevel": "module",
-		"buildTool": "hvigor"
-	},
-	"version": "1.0.0",
-	"dependencies": {}
-}