Browse Source

Merge branch 'fix/buildChange' into 'release'

jsDoc去除括号,去除多余的jsDdoc编译

See merge request o2oa/o2oa!2943

(cherry picked from commit 9fef41ce5e797f39bae307ab07c1085c761aedac)

56e2ca65 打包去除()
胡起 5 years ago
parent
commit
0411058175
2 changed files with 2 additions and 2 deletions
  1. 1 1
      gulpfile.js
  2. 1 1
      package.json

+ 1 - 1
gulpfile.js

@@ -835,7 +835,7 @@ function build_web_api() {
 
 function build_doc(){
     return getGitV().then(function(arr){
-        return (shell.task('jsdoc -c o2web/jsdoc.conf.json -q version=\'('+arr[0]+'-'+arr[1]+')\''))();
+        return (shell.task('jsdoc -c o2web/jsdoc.conf.json -q version='+arr[0]+'-'+arr[1]+''))();
     });
 }
 exports.build_api = gulp.series(build_doc, build_web_api);

+ 1 - 1
package.json

@@ -14,7 +14,7 @@
                 "preperation:rpi": "gulp preperation --e raspi",
                 "build_server": "gulp build_server",
                 "build_server_script": "cd o2server && mvn clean && mvn install",
-                "build_web": "npm run build_api_version && gulp build_web",
+                "build_web": "gulp build_web",
                 "build_api_version": "jsdoc -c o2web/jsdoc.conf.json -q version=${VAPI}",
                 "build_api": "jsdoc -c o2web/jsdoc.conf.json -q version=",
                 "build_parallel": "npm run build_server && npm run build_web",