diff --git a/build.sh b/build.sh index 0de5b25f272711f6b3fbb8406ee57b94453c5fa7..00d356545a4c1592883a86b60cc35fdd39dea992 100755 --- a/build.sh +++ b/build.sh @@ -68,7 +68,7 @@ function build_sdk() { SDK_PREBUILTS_PATH=${ROOT_PATH}/out/sdk/packages/ohos-sdk pushd ${ROOT_PATH} echo "building the latest ohos-sdk..." - ./build.py --product-name ohos-sdk --load-test-config=false --get-warning-list=false --stat-ccache=false --compute-overlap-rate=false --deps-guard=false --generate-ninja-trace=false --gn-args skip_generate_module_list_file=true sdk_platform=linux ndk_platform=linux use_cfi=false use_thin_lto=false enable_lto_O0=true sdk_check_flag=false enable_ndk_doxygen=false archive_ndk=false + ./build.py --product-name ohos-sdk --load-test-config=false --get-warning-list=false --stat-ccache=false --compute-overlap-rate=false --deps-guard=false --generate-ninja-trace=false --gn-args skip_generate_module_list_file=true sdk_platform=linux ndk_platform=linux use_cfi=false use_thin_lto=false enable_lto_O0=true sdk_check_flag=false enable_ndk_doxygen=false archive_ndk=false sdk_build_public=true --gn-args=sdk_build_arkts=true if [[ "$?" -ne 0 ]]; then echo "ohos-sdk build failed! You can try to use '--no-prebuilt-sdk' to skip the build of ohos-sdk." exit 1 @@ -146,7 +146,7 @@ export PATH=/home/tools/command-line-tools/ohpm/bin:$PATH npm config set registry https://repo.huaweicloud.com/repository/npm/ npm config set @ohos:registry https://repo.harmonyos.com/npm/ npm config set strict-ssl false -npm config set lockfile false +#npm config set lockfile false cat $HOME/.npmrc | grep 'lockfile=false' || echo 'lockfile=false' >> $HOME/.npmrc if [ -d ${ROOT_PATH}/prebuilts/ohos-sdk/linux/10 ]; then mkdir -p ${ohos_sdk_path} @@ -216,57 +216,6 @@ if [ -d ${ROOT_PATH}/prebuilts/ohos-sdk/linux/14 ]; then ln -nsf ../14/previewer previewer/$sdk_version popd fi -if [ -d ${ROOT_PATH}/prebuilts/ohos-sdk/linux/18 ]; then - mkdir -p ${ohos_sdk_path} - mv -n ${ROOT_PATH}/prebuilts/ohos-sdk/linux/18 ${ohos_sdk_path} - pushd ${ohos_sdk_path} - sdk_version=$(grep version 18/toolchains/oh-uni-package.json | awk '{print $2}' | sed -r 's/\",?//g') - mkdir -p ets - ln -nsf ../18/ets ets/$sdk_version - mkdir -p js - ln -nsf ../18/js js/$sdk_version - mkdir -p toolchains - ln -nsf ../18/toolchains toolchains/$sdk_version - mkdir -p native - ln -nsf ../18/native native/$sdk_version - mkdir -p previewer - ln -nsf ../18/previewer previewer/$sdk_version - popd -fi -if [ -d ${ROOT_PATH}/prebuilts/ohos-sdk/linux/19 ]; then - mkdir -p ${ohos_sdk_path} - mv -n ${ROOT_PATH}/prebuilts/ohos-sdk/linux/19 ${ohos_sdk_path} - pushd ${ohos_sdk_path} - sdk_version=$(grep version 19/toolchains/oh-uni-package.json | awk '{print $2}' | sed -r 's/\",?//g') - mkdir -p ets - ln -nsf ../19/ets ets/$sdk_version - mkdir -p js - ln -nsf ../19/js js/$sdk_version - mkdir -p toolchains - ln -nsf ../19/toolchains toolchains/$sdk_version - mkdir -p native - ln -nsf ../19/native native/$sdk_version - mkdir -p previewer - ln -nsf ../19/previewer previewer/$sdk_version - popd -fi -if [ -d ${ROOT_PATH}/prebuilts/ohos-sdk/linux/20 ]; then - mkdir -p ${ohos_sdk_path} - mv -n ${ROOT_PATH}/prebuilts/ohos-sdk/linux/20 ${ohos_sdk_path} - pushd ${ohos_sdk_path} - sdk_version=$(grep version 20/toolchains/oh-uni-package.json | awk '{print $2}' | sed -r 's/\",?//g') - mkdir -p ets - ln -nsf ../20/ets ets/$sdk_version - mkdir -p js - ln -nsf ../20/js js/$sdk_version - mkdir -p toolchains - ln -nsf ../20/toolchains toolchains/$sdk_version - mkdir -p native - ln -nsf ../20/native native/$sdk_version - mkdir -p previewer - ln -nsf ../20/previewer previewer/$sdk_version - popd -fi if [ "${arg_project}" == "" -a "${arg_url}" == "" ]; then echo "--project or --url is not null" exit 1; @@ -335,7 +284,7 @@ echo "start build hap..." cd ${arg_project} echo "sdk.dir=${OHOS_SDK_HOME}" > ./local.properties echo "nodejs.dir=${NODE_HOME}" >> ./local.properties - +export LD_LIBRARY_PATH=${OHOS_SDK_HOME}/20/ets/ets1.2/build-tools/ets2panda/lib/ echo "use sdk:"${OHOS_SDK_HOME} is_ohpm=true @@ -466,6 +415,18 @@ echo ${arg_project}" 执行npm/ohpm install" if ${is_ohpm}; then ohpm install if [ ! -f "hvigorw" ]; then + # Historical reasons need to be compatible with NODE_HOME path issue + if grep -q "\${NODE_HOME}/bin/node" hvigorw ; then + # node home path include "bin" + if [ ! -x "${NODE_HOME}/bin/node" ];then + export NODE_HOME=$(dirname ${NODE_HOME}) + fi + else + # node home path does not include "bin" + if [ -x "${NODE_HOME}/bin/node" ];then + export NODE_HOME=${NODE_HOME} + fi + fi hvigorw clean --no-daemon hvigorw assembleHap --mode module -p product=default -p debuggable=false --no-daemon else