Match-id-85e351b59a45944eae0285b9faaba2520cde027c

build/build.sh

@@ -95,39 +95,16 @@ function build_run_package()
 
     RUN_PKG_NAME="${PACKAGENAME}-${VERSION}-${CPUARCH}.run"
     DATE=$(date -u "+%Y-%m-%d")
-    bash ${OPENSRC}/${MAKESELF_DIR}/makeself.sh --nomd5 --nocrc --help-header scripts/help.info --packaging-date ${DATE} \
+    bash ${OPENSRC}/makeself-release-2.4.2/makeself.sh --nomd5 --nocrc --help-header scripts/help.info --packaging-date ${DATE} \
     --tar-extra "--mtime=${DATE}" run_pkg "${RUN_PKG_NAME}" ascend-docker-runtime ./run_main.sh
     mv ${RUN_PKG_NAME} ${OUTPUT}
 }
 
-function make_clean()
+function clean()
 {
     [ -d "${OUTPUT}" ] && cd ${OUTPUT}&&rm -rf *
 }
 
-function make_unzip()
-{
-    cd ${OPENSRC}
-    CJSONS=$(find . -name "cJSON.*")
-    CJSONSLIB=${INSTALLHELPERDIR}/deb/src/cjson
-    /bin/cp -f ${CJSONS} ${CJSONSLIB}
-
-    MAKESELF_DIR=$(find . -name "makeself-release-*")
-
-    cd ${PLATFORM}/HuaweiSecureC
-    SECURECSRC=$(find . -name "src")
-    SECURECINC=$(find . -name "include")
-
-    SECURECLIB=${INSTALLHELPERDIR}/deb/src/HuaweiSecureC
-    /bin/cp -f ${SECURECSRC}/* ${SECURECLIB}
-    /bin/cp -f ${SECURECINC}/* ${SECURECLIB}
-
-    SECURECLIB=${CLIDIR}/src/HuaweiSecureC
-    /bin/cp -f ${SECURECSRC}/* ${SECURECLIB}
-    /bin/cp -f ${SECURECINC}/* ${SECURECLIB}
-}
-
-make_clean
-make_unzip
+clean
 build_bin
 build_run_package

cli/src/CMakeLists.txt

@@ -6,7 +6,7 @@ set(CMAKE_C_STANDARD 11)
 message(STATUS "CMAKE_SHARED_LIBRARY_LINK_C_FLAGS = " ${CMAKE_SHARED_LIBRARY_LINK_C_FLAGS})
 set(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS "")
 
-include_directories("${PROJECT_SOURCE_DIR}/HuaweiSecureC")
+include_directories("${PROJECT_SOURCE_DIR}/../../platform/HuaweiSecureC/include")
 aux_source_directory(. SRC)
 add_subdirectory(HuaweiSecureC)
 add_executable(ascend-docker-cli ${SRC})

cli/src/HuaweiSecureC/CMakeLists.txt

@@ -1,6 +1,6 @@
 # 查找当前目录下的所有源文件
 # 并将名称保存到 LIB_SRC 变量
-aux_source_directory(. LIB_SRC)
+aux_source_directory(${CMAKE_CURRENT_SOURCE_DIR}/../../../platform/HuaweiSecureC/src LIB_SRC)
 
 #生成链接库
 add_library(HuaweiSecureC ${LIB_SRC})

install/deb/src/CMakeLists.txt

@@ -10,8 +10,8 @@ set(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS "")
 
 #导入头文件所在路径
 #PROJECT_SOURCE_DIR为cmake宏
-include_directories("${PROJECT_SOURCE_DIR}/cjson")
-include_directories("${PROJECT_SOURCE_DIR}/HuaweiSecureC")
+include_directories("../../../opensource/cJSON-1.7.14")
+include_directories("../../../platform/HuaweiSecureC/include")
 
 # 查找当前目录下的所有源文件
 # 并将名称保存到 SRC 变量

install/deb/src/HuaweiSecureC/CMakeLists.txt

@@ -1,6 +1,6 @@
 # 查找当前目录下的所有源文件
 # 并将名称保存到 LIB_SRC 变量
-aux_source_directory(. LIB_SRC)
+aux_source_directory(../../../../platform/HuaweiSecureC/src LIB_SRC)
 
 #生成链接库
 add_library(HuaweiSecureC ${LIB_SRC})

install/deb/src/cjson/CMakeLists.txt

@@ -1,6 +1,6 @@
 # 查找当前目录下的所有源文件
 # 并将名称保存到 LIB_SRC 变量
-aux_source_directory(. LIB_SRC)
+aux_source_directory(../../../../opensource/cJSON-1.7.14/ LIB_SRC)
 
 #生成链接库
 add_library(cjson ${LIB_SRC})