diff --git a/CommKrnl.dll b/CommKrnl.dll index 28e3bd2..0e2a65e 100644 Binary files a/CommKrnl.dll and b/CommKrnl.dll differ diff --git a/MathKrnl.dll b/MathKrnl.dll index beec6d5..8ab8ef2 100644 Binary files a/MathKrnl.dll and b/MathKrnl.dll differ diff --git a/TSCrypt.dll b/TSCrypt.dll index e2998da..cde8cd6 100644 Binary files a/TSCrypt.dll and b/TSCrypt.dll differ diff --git a/TSL.exe b/TSL.exe index 7aae3e2..1d58e87 100644 Binary files a/TSL.exe and b/TSL.exe differ diff --git a/TSLDebugModule.dll b/TSLDebugModule.dll index 23565d0..88163db 100644 Binary files a/TSLDebugModule.dll and b/TSLDebugModule.dll differ diff --git a/TSLInterp.dll b/TSLInterp.dll index 334be9a..dd760fe 100644 Binary files a/TSLInterp.dll and b/TSLInterp.dll differ diff --git a/TSLPlugin.dll b/TSLPlugin.dll index b92b934..1be395a 100644 Binary files a/TSLPlugin.dll and b/TSLPlugin.dll differ diff --git a/TSSVRAPI.DLL b/TSSVRAPI.DLL index cfd30b5..34e8286 100644 Binary files a/TSSVRAPI.DLL and b/TSSVRAPI.DLL differ diff --git a/designer/ctl_mgr/resource.tfm/t_bconfig_cmd_shower.tfm b/designer/ctl_mgr/resource.tfm/t_bconfig_cmd_shower.tfm index 711f3f9..c8bf812 100644 --- a/designer/ctl_mgr/resource.tfm/t_bconfig_cmd_shower.tfm +++ b/designer/ctl_mgr/resource.tfm/t_bconfig_cmd_shower.tfm @@ -36,7 +36,7 @@ object bconfig_cmd_shower:t_bconfig_cmd_shower align=alclient autogutterwidth=true caption="memo1" - height=166 + height=211 left=0 readonly=true top=0 diff --git a/designer/ctl_mgr/resource.tfm/t_compile_config.tfm b/designer/ctl_mgr/resource.tfm/t_compile_config.tfm index 8798751..091d18d 100644 --- a/designer/ctl_mgr/resource.tfm/t_compile_config.tfm +++ b/designer/ctl_mgr/resource.tfm/t_compile_config.tfm @@ -1,19 +1,19 @@ object ed_script:t_compile_config caption="编译选项设置" - height=634 + height=681 left=618 minmaxbox=false onclose=compile_config_close top=180 width=502 - wssizebox=false + wssizebox=true object bt_ok:tbtn caption="确定" height=31 - left=408 + left=405 onclick=bt_ok_clk parentcolor=false - top=551 + top=582 width=55 end object gp_dir:tgroupbox @@ -253,17 +253,17 @@ object ed_script:t_compile_config object bt_cancel:tbtn caption="取消" height=31 - left=335 + left=332 onclick=bt_cancel_clk - top=551 + top=582 width=55 end object gp_other:tgroupbox caption="其他" - height=100 - left=28 + height=129 + left=27 parentcolor=true - top=442 + top=440 width=437 object ck_gui:tcheckbtn caption="gui" @@ -290,30 +290,44 @@ object ed_script:t_compile_config end object lb_ico:tlabel left=17 - top=64 - width=39 + top=59 + width=66 height=25 - caption="图标" + caption=" 图 标:" end object ed_ico:tedit caption="edit3" height=25 - left=63 - top=64 - width=249 + left=94 + top=58 + width=277 end object bt_ico:tbtn caption="..." height=25 - left=319 + left=386 onclick=bt_ico_clk - top=64 + top=58 width=22 end + object l_namespace:tlabel + left=17 + top=93 + width=75 + height=25 + caption="namespace:" + end + object e_namespace:tedit + caption="edit1" + height=25 + left=94 + top=93 + width=278 + end end object f_op:topenfileadlg - left=68 - top=553 + left=15 + top=575 height=30 width=30 caption="openfileadlg1" @@ -346,9 +360,9 @@ object ed_script:t_compile_config object bt_cmd:tbtn caption="命令行" height=31 - left=202 + left=208 onclick=bt_cmd_clk - top=551 + top=582 width=92 end end \ No newline at end of file diff --git a/designer/ctl_mgr/t_compile_config.tsf b/designer/ctl_mgr/t_compile_config.tsf index 39b3002..6e2b073 100644 --- a/designer/ctl_mgr/t_compile_config.tsf +++ b/designer/ctl_mgr/t_compile_config.tsf @@ -45,6 +45,8 @@ type t_compile_config=class(tdcreateform) ed_tsg:tedit; bt_tsgadd:tbtn; bt_cmd:tbtn; + l_namespace:tlabel; + e_namespace:tedit; function Create(AOwner);override; //构造 begin f_sep := iofileseparator(); @@ -114,6 +116,7 @@ type t_compile_config=class(tdcreateform) ck_gui.Checked := r["buildgui"] ; ed_ico.text := r["buildico"]; ed_tsg.text := r["pkg"]; + e_namespace.text := r["nspace"]; //ck_s_rp.Checked := r["resourcekeepdir"]; end function get_config(); @@ -138,7 +141,8 @@ type t_compile_config=class(tdcreateform) r["buildgui"] := ck_gui.Checked; r["buildico"] := ed_ico.text; r["resourcekeepdir"] := ck_s_rp.Checked; - r["pgk"] := ed_tsg.text; + r["pgk"] := trim(ed_tsg.text); + r["nspace"] := trim(e_namespace.text); return r; end function clear_config();//清理 @@ -152,10 +156,11 @@ type t_compile_config=class(tdcreateform) ed_s_dirs.text := ""; ed_s_type.text := ""; ed_include_s.text := ""; - ck_strong.Checked := ""; - ck_gui.Checked := ""; + ck_strong.Checked := false; + ck_gui.Checked := false; ed_ico.text := ""; - ck_s_rp.Checked := ""; + ck_s_rp.Checked := false; + e_namespace.text := ""; flibpath := ""; end function bt_outputname_clk(o;e);virtual; @@ -395,6 +400,7 @@ type t_compile_config=class(tdcreateform) function createoutputname(n); begin tp := get_type(); + sp := iofileseparator(); for i:= length(n) downto 1 do begin if n[i]="." and i>1 then @@ -403,7 +409,7 @@ type t_compile_config=class(tdcreateform) break; end end - if not nv then nv := "."+iofileseparator()+"default"; + if not nv then nv := "."+sp+"default"; return nv+tp; end function set_base_dir(v); @@ -442,7 +448,13 @@ type t_compile_config=class(tdcreateform) if r[length(r)]="\n" then r +=format('--manifest="%s" ',d["buildfile"]+".manifest"); else r +=format('\r\n--manifest="%s" ',d["buildfile"]+".manifest"); -{$endif} +{$endif} + if d["nspace"] then + begin + if r[length(r)]="\n" then r+=format("--setpkg2ns=%s ",d["nspace"]); + else + r+=format("\r\n--setpkg2ns=%s ",d["nspace"]); + end return r; end function f_b_a_param(d,n); diff --git a/designer/utslcodeeditor.tsf b/designer/utslcodeeditor.tsf index f54ef0b..3be71ae 100644 --- a/designer/utslcodeeditor.tsf +++ b/designer/utslcodeeditor.tsf @@ -5103,7 +5103,11 @@ type TEditerEchoWnd=class(TSynMemoNorm) // begin r +=format(' --manifest="%s" ',d["buildfile"]+".manifest"); end -{$endif} +{$endif} + if d["nspace"] then + begin + r+=format("--setpkg2ns=%s ",d["nspace"]); + end return r; end function f_b_a_param(d,n); diff --git a/plugin/TSLCPLUGIN.DLL b/plugin/TSLCPLUGIN.DLL index 7e57de0..46257b5 100644 Binary files a/plugin/TSLCPLUGIN.DLL and b/plugin/TSLCPLUGIN.DLL differ diff --git a/protocol.dll b/protocol.dll index fbc6d7d..0d7def0 100644 Binary files a/protocol.dll and b/protocol.dll differ diff --git a/tsjni.dll b/tsjni.dll index fbc03aa..02ba9cc 100644 Binary files a/tsjni.dll and b/tsjni.dll differ diff --git a/tsleditor.exe b/tsleditor.exe index 929eb4f..853fb13 100644 Binary files a/tsleditor.exe and b/tsleditor.exe differ diff --git a/tslkrnl.dll b/tslkrnl.dll index 370fa09..99a1136 100644 Binary files a/tslkrnl.dll and b/tslkrnl.dll differ diff --git a/tslvcltool.exe b/tslvcltool.exe index 82f96e9..c5277a7 100644 Binary files a/tslvcltool.exe and b/tslvcltool.exe differ diff --git a/tsnet.dll b/tsnet.dll index 9d65827..f14dfed 100644 Binary files a/tsnet.dll and b/tsnet.dll differ diff --git a/whatsnew.txt b/whatsnew.txt index ba86f00..9c006bf 100644 --- a/whatsnew.txt +++ b/whatsnew.txt @@ -1,3 +1,20 @@ +更新日志--------2024-07-10 + 升级:支持缺省加载tslpkg目录里的*.pkg.load包。 + 升级:TSL命令行支持--build=模式下将无命名空间的函数打包成指定namespace的函数。理论上多套应用包括同名公共函数均可以采用此模式独立打包。 + 升级:新增tslobjects函数获得内存里的对象信息,支持tslobjects(0)仅获得引用技术或者tslobjects(1)获得对象本身。 + 升级:LINUX下实现ts_moduleinfo。 + 升级:LINUX支持遇到严重错误时记录stacktrace以及模块信息等,和WINDOWS类似,但暂时未记录寄存器信息。 + 修正:极为特殊应用下的内核瑕疵。 + 修正:JDBC驱动链接模式下sqltable batchinsert时,在表无主键的情况下,生成SQL的列名时对列名的检测存在的问题。 + 修正:JDBC驱动链接模式下数据库中timestamp with time zone类型进行了修改,根据JVM中时区配置进行数据存取。 + +更新日志--------2024-07-08 + 修正:修正内核面向对象特殊应用的相关问题。 + +更新日志--------2024-07-05 + 升级:提供对obj.aaa++ --的支持,优化obj.aaa+=等的性能。 + 升级:UNIT中的变量和常量可能存调试器中手工输入变量输出的表现不正常的问题。 + 更新日志--------2024-07-02 修正:TSL编辑器等本地调试因为协议升级造成的问题。