owl-cli 6.158.0 → 6.160.0

package/.eslintrc.json

@@ -1,3 +1,3 @@
-{
-    "extends": "standard"
+{
+    "extends": "standard"
 }

package/.vscode/launch.json

@@ -1,23 +1,23 @@
-{
-    // 使用 IntelliSense 了解相关属性。 
-    // 悬停以查看现有属性的描述。
-    // 欲了解更多信息，请访问: https://go.microsoft.com/fwlink/?linkid=830387
-    "version": "0.2.0",
-    "configurations": [
-        {
-            "type": "node",
-            "request": "launch",
-            "name": "owl",
-            "program": "${workspaceFolder}/buildScripts/owl.js",
-            "args": [
-                "/Users/zhengxiangyang/work/owl/owl_models/huarentong_models",
-                "/Users/zhengxiangyang/work/owl/generatedApps",
-                "/Users/zhengxiangyang/work/owl/owl-cli/template",
-                "release"
-            ]
-            
-
-
-        }
-    ]
+{
+    // 使用 IntelliSense 了解相关属性。 
+    // 悬停以查看现有属性的描述。
+    // 欲了解更多信息，请访问: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "type": "node",
+            "request": "launch",
+            "name": "owl",
+            "program": "${workspaceFolder}/buildScripts/owl.js",
+            "args": [
+                "/Users/zhengxiangyang/work/owl/owl_models/huarentong_models",
+                "/Users/zhengxiangyang/work/owl/generatedApps",
+                "/Users/zhengxiangyang/work/owl/owl-cli/template",
+                "release"
+            ]
+            
+
+
+        }
+    ]
 }

package/.vscode/settings.json

@@ -1,3 +1,3 @@
-{
-    "git.ignoreLimitWarning": true
+{
+    "git.ignoreLimitWarning": true
 }

package/bin/createTables.js

@@ -1,94 +1,94 @@
-#!/usr/bin/env node
-
-const { lstatSync, readdirSync,readFileSync } = require('fs')
-const fs = require('fs')
-const { join,resolve } = require('path')
-const {spawnSync} = require('child_process')
-const os = require('os')
-const mysql      = require('mysql');
-var connection = null;
-var allSqls = [];
-
-let cwd = process.cwd();
-
-const isDirectory = source => lstatSync(source).isDirectory()
-const getDirectories = source =>
-    readdirSync(resolve(cwd, source)).map(name => join(source, name)).filter(isDirectory)
-
-const isAppDir = function (dir) {
-    try {
-        return fs.existsSync(join(dir, 'sql','createTables.sql'))
-    } catch (e) {
-        return false
-    }
-}
-
-
-function execSqls(sqls, idx){
-    let sql = sqls[idx];
-    sql = sql.trim();
-    if(!sql){
-        console.log(idx + " empty line.");
-        if(idx < sqls.length-1){
-            execSqls(sqls,idx+1);
-            return;
-        }
-    }
-    else{
-        connection.query(sql,function(error, results, fields){
-            if (error){
-                console.log(idx +" failed " + sql );
-                console.log(error.sqlMessage);
-                /*if(idx < sqls.length-1){
-                    execSqls(sqls,idx+1);
-                }*/
-            }
-            else{
-                console.log(" 成功执行 " + idx);
-                if(idx < sqls.length-1){
-                    execSqls(sqls,idx+1);
-                }
-            }
-
-        });
-    }
-
-}
-
-function buildAppDir (dir) {
-    let content = readFileSync(resolve(dir,"sql/createTables.sql"), {encoding: 'utf-8'});
-    let sqls = content.split(";");
-    allSqls = allSqls.concat(sqls);
-}
-
-function buildDir(d){
-    console.log("processing " + d);
-    if(isAppDir(d)){
-        buildAppDir(d);
-    }else{
-        var dirs = getDirectories(d);
-        dirs.map(dir=>{
-            var fulldir = resolve(d,dir);
-            buildDir(fulldir);
-        });
-    }
-}
-
-var configFile = resolve(cwd,"owlconfig.json");
-
-if(process.argv.length>2){
-    configFile = resolve(cwd, process.argv[2]);
-}
-
-var content = readFileSync(configFile, {encoding: 'utf-8'})
-var owlconfig = JSON.parse(content)
-
-connection = mysql.createConnection(owlconfig.mysql);
-
-
-var full = resolve(cwd,owlconfig.generatedApps);
-buildDir(full);
-console.log("collect all sqls, total=" + allSqls.length);
-execSqls(allSqls,0);
-
-
+#!/usr/bin/env node
+
+const { lstatSync, readdirSync,readFileSync } = require('fs')
+const fs = require('fs')
+const { join,resolve } = require('path')
+const {spawnSync} = require('child_process')
+const os = require('os')
+const mysql      = require('mysql');
+var connection = null;
+var allSqls = [];
+
+let cwd = process.cwd();
+
+const isDirectory = source => lstatSync(source).isDirectory()
+const getDirectories = source =>
+    readdirSync(resolve(cwd, source)).map(name => join(source, name)).filter(isDirectory)
+
+const isAppDir = function (dir) {
+    try {
+        return fs.existsSync(join(dir, 'sql','createTables.sql'))
+    } catch (e) {
+        return false
+    }
+}
+
+
+function execSqls(sqls, idx){
+    let sql = sqls[idx];
+    sql = sql.trim();
+    if(!sql){
+        console.log(idx + " empty line.");
+        if(idx < sqls.length-1){
+            execSqls(sqls,idx+1);
+            return;
+        }
+    }
+    else{
+        connection.query(sql,function(error, results, fields){
+            if (error){
+                console.log(idx +" failed " + sql );
+                console.log(error.sqlMessage);
+                /*if(idx < sqls.length-1){
+                    execSqls(sqls,idx+1);
+                }*/
+            }
+            else{
+                console.log(" 成功执行 " + idx);
+                if(idx < sqls.length-1){
+                    execSqls(sqls,idx+1);
+                }
+            }
+
+        });
+    }
+
+}
+
+function buildAppDir (dir) {
+    let content = readFileSync(resolve(dir,"sql/createTables.sql"), {encoding: 'utf-8'});
+    let sqls = content.split(";");
+    allSqls = allSqls.concat(sqls);
+}
+
+function buildDir(d){
+    console.log("processing " + d);
+    if(isAppDir(d)){
+        buildAppDir(d);
+    }else{
+        var dirs = getDirectories(d);
+        dirs.map(dir=>{
+            var fulldir = resolve(d,dir);
+            buildDir(fulldir);
+        });
+    }
+}
+
+var configFile = resolve(cwd,"owlconfig.json");
+
+if(process.argv.length>2){
+    configFile = resolve(cwd, process.argv[2]);
+}
+
+var content = readFileSync(configFile, {encoding: 'utf-8'})
+var owlconfig = JSON.parse(content)
+
+connection = mysql.createConnection(owlconfig.mysql);
+
+
+var full = resolve(cwd,owlconfig.generatedApps);
+buildDir(full);
+console.log("collect all sqls, total=" + allSqls.length);
+execSqls(allSqls,0);
+
+

package/bin/deploy.js

@@ -1,66 +1,66 @@
-#!/usr/bin/env node
-
-const { lstatSync, readdirSync,readFileSync } = require('fs')
-const fs = require('fs')
-const { join,resolve } = require('path')
-const {spawnSync} = require('child_process')
-const os = require('os')
-let cwd = process.cwd();
-
-const isDirectory = source => lstatSync(source).isDirectory()
-const getDirectories = source =>
-  readdirSync(resolve(cwd, source)).map(name => join(source, name)).filter(isDirectory)
-
-const isAppDir = function (dir) {
-  try {
-    return fs.existsSync(join(dir, 'build.xml'))
-  } catch (e) {
-    return false
-  }
-}
-var target = null;
-if(process.argv.length>2){
-  target = process.argv[2];
-  console.log("deploying " + target);
-}
-
-
-function buildAppDir (dir) {
-  var platform = os.platform()
-  var ant = platform === 'win32' ? 'ant.bat' : 'ant'
-  if(target){
-    if(dir.indexOf(target)>=0){
-      spawnSync(ant,[],{cwd:resolve(cwd, dir),stdio: 'inherit'});
-    }
-  }
-  else{
-    spawnSync(ant,[],{cwd:resolve(cwd, dir),stdio: 'inherit'});
-  }
-
-}
-
-function buildDir(d){
-  console.log("processing " + d);
-  if(isAppDir(d)){
-    buildAppDir(d);
-  }else{
-    var dirs = getDirectories(d);
-    dirs.map(dir=>{
-        var fulldir = resolve(d,dir);
-        buildDir(fulldir);
-   });
-  }
-}
-
-var configFile = resolve(cwd,"owlconfig.json");
-
-
-
-var content = readFileSync(configFile, {encoding: 'utf-8'})
-var owlconfig = JSON.parse(content)
-
-var full = resolve(cwd,owlconfig.generatedApps);
-buildDir(full);
-
-
-
+#!/usr/bin/env node
+
+const { lstatSync, readdirSync,readFileSync } = require('fs')
+const fs = require('fs')
+const { join,resolve } = require('path')
+const {spawnSync} = require('child_process')
+const os = require('os')
+let cwd = process.cwd();
+
+const isDirectory = source => lstatSync(source).isDirectory()
+const getDirectories = source =>
+  readdirSync(resolve(cwd, source)).map(name => join(source, name)).filter(isDirectory)
+
+const isAppDir = function (dir) {
+  try {
+    return fs.existsSync(join(dir, 'build.xml'))
+  } catch (e) {
+    return false
+  }
+}
+var target = null;
+if(process.argv.length>2){
+  target = process.argv[2];
+  console.log("deploying " + target);
+}
+
+
+function buildAppDir (dir) {
+  var platform = os.platform()
+  var ant = platform === 'win32' ? 'ant.bat' : 'ant'
+  if(target){
+    if(dir.indexOf(target)>=0){
+      spawnSync(ant,[],{cwd:resolve(cwd, dir),stdio: 'inherit'});
+    }
+  }
+  else{
+    spawnSync(ant,[],{cwd:resolve(cwd, dir),stdio: 'inherit'});
+  }
+
+}
+
+function buildDir(d){
+  console.log("processing " + d);
+  if(isAppDir(d)){
+    buildAppDir(d);
+  }else{
+    var dirs = getDirectories(d);
+    dirs.map(dir=>{
+        var fulldir = resolve(d,dir);
+        buildDir(fulldir);
+   });
+  }
+}
+
+var configFile = resolve(cwd,"owlconfig.json");
+
+
+
+var content = readFileSync(configFile, {encoding: 'utf-8'})
+var owlconfig = JSON.parse(content)
+
+var full = resolve(cwd,owlconfig.generatedApps);
+buildDir(full);
+
+
+