commit 5cce3cf3e0d089873cbe49d5a8c17c9c43b0edb9
| author | 斟酌 鵬兄 <tgckpg@gmail.com> |
|---|
| date | 2021-09-05T15:30:07Z |
|---|
| subject | Merge branch 'core-master' into Astro |
|---|
commit 5cce3cf3e0d089873cbe49d5a8c17c9c43b0edb9
Merge: c631b19 01dca50
Author: 斟酌 鵬兄 <tgckpg@gmail.com>
Date: 2021-09-05T15:30:07Z
Merge branch 'core-master' into Astro
.dockerignore | 1 +
README.md | 26 +++++-------------
botan-rebuild.py | 2 +-
botanjs/compressor/closure.py | 5 ++--
botanjs/compressor/yui.py | 6 ++++-
botanjs/dummy.py | 2 +-
botanjs/service/jclassresv.py | 43 ++++++++++++++++++++---------
botanjs/service/jwork.py | 5 ++--
botanjs/service/webapi.py | 11 ++++++--
botanjs/src/externs/_AstXObject_.js | 2 +-
main.py | 2 +-
settings.ini | 2 +-
windows/app/Dockerfile | 12 +++++++++
windows/docker-compose.yml | 41 ++++++++++++++++++++++++++++
windows/jre/Dockerfile | 9 +++++++
windows/pyrt/dockerfile | 54 +++++++++++++++++++++++++++++++++++++
windows/redis/Dockerfile | 27 +++++++++++++++++++
17 files changed, 206 insertions(+), 44 deletions(-)
diff --cc botanjs/src/externs/_AstXObject_.js
index df21c32,0000000..eed12e9
mode 100644,000000..100644
--- a/botanjs/src/externs/_AstXObject_.js
+++ b/botanjs/src/externs/_AstXObject_.js
@@@ -1,2 -1,0 +1,2 @@@
+/** @type {Object} */
- _AstXObject_ = {};
++var _AstXObject_ = {};