diff --git a/src/gen/cmd_gen.js b/src/gen/cmd_gen.js index cff2b185e3a48ea6eb10a88740d6df5987b64f25..2ca2fce0a902afb023fe3f46ca312e2e010ab5e8 100644 --- a/src/gen/cmd_gen.js +++ b/src/gen/cmd_gen.js @@ -22,7 +22,7 @@ var fs = require('fs'); let ops = stdio.getopt({ 'filename': { key: 'f', args: 1, description: ".d.ts file", default: "" }, - 'directory': { key: 'dir', args: 1, description: ".d.ts directory", default: "" }, + 'directory': { key: 'd', args: 1, description: ".d.ts directory", default: "" }, 'out': { key: 'o', args: 1, description: "output directory", default: "." }, 'loglevel': { key: 'l', args: 1, description: "Log Level : 0~3", default: "1" } }); diff --git a/src/gen/extend/build_gn.js b/src/gen/extend/build_gn.js index d7d401562f2f544f47d5b589723a3ae986b1c096..1074acbcb4880b58ff7a0528dfbb5a0d0b8fde14 100644 --- a/src/gen/extend/build_gn.js +++ b/src/gen/extend/build_gn.js @@ -48,8 +48,11 @@ ohos_shared_library("[implName]") ` /**创建nodejs编译文件,用于在ubuntu测试 */ -function generateGN(destDir, implName, license) { - let ss = gnTemplete.replaceAll("[implName]", implName) +function generateGN(destDir, implName, license, partName) { + let subsystemName = implName; + let gnFile = gnTemplete.replaceAll("[implName]", implName); + gnFile = gnFile.replaceAll("[subsystemName]", subsystemName); + gnFile = gnFile.replaceAll("[partName]", partName); if (license) { let s2 = license.substring(2, license.length - 2).split("\n"); license = ""; @@ -62,7 +65,7 @@ function generateGN(destDir, implName, license) { } } } - writeFile(re.pathJoin(destDir, "BUILD.gn"), null != license ? (license + "\n" + ss) : ss) + writeFile(re.pathJoin(destDir, "BUILD.gn"), null != license ? (license + "\n" + gnFile) : gnFile) } module.exports = { diff --git a/src/gen/generate.js b/src/gen/generate.js index 14e5aa6ebb8433b11262432a5b26958c6869b4a9..dc8e8006ca8c5bc7faa2646389c9a71d0ea8d8e8 100644 --- a/src/gen/generate.js +++ b/src/gen/generate.js @@ -139,8 +139,9 @@ function generateAll(structOfTs, destDir, moduleName) { implCpp = implCpp.replaceAll("[implCpp_detail]", result.implCpp) writeFile(re.pathJoin(destDir, "%s.cpp".format(ns0.name)), null != license ? (license + "\n" + implCpp) : implCpp) + let partName = moduleName.replace('.', '_') generateGYP(destDir, ns0.name, license)//生成ubuntu下测试的编译脚本 - generateGN(destDir, ns0.name, license)//生成BUILD.gn for ohos + generateGN(destDir, ns0.name, license, partName)//生成BUILD.gn for ohos generateBase(destDir, license)//x_napi_tool.h/cpp }