diff --git a/Changelog.txt b/Changelog.txt index 4b35122..354b6b1 100644 --- a/Changelog.txt +++ b/Changelog.txt @@ -2,6 +2,12 @@ 2、登录TreeATE的默认用户名/密码: admin/123 3、加载Example中的测试工程，点击Play(测试) +V2.0.0 +------------------- +1、变更TreeATE的License为LGPL v3 +2、保留TreeATEDev的License为GPL v3 +3、增加对C++测试用例的支持 + V1.2.2 ------------------- 1、让TreeATE Dev支持多工程的编辑； diff --git a/Example/Example.pro b/Example/Example.pro index c2dce7a..ee5e98d 100644 --- a/Example/Example.pro +++ b/Example/Example.pro @@ -1,4 +1,5 @@ TEMPLATE = subdirs SUBDIRS += \ - LocalSqlite + LocalSqlite \ + TestCppDemo diff --git a/Example/LocalSqlite/localsqlite.cpp b/Example/LocalSqlite/localsqlite.cpp index ee87ead..575b785 100644 --- a/Example/LocalSqlite/localsqlite.cpp +++ b/Example/LocalSqlite/localsqlite.cpp @@ -2,11 +2,11 @@ /// @brief demo of the output to database model /// @author David Yin 2018-12 willage.yin@163.com /// -/// @license GNU GPL v3 +/// @license GNU LGPL v3 /// -/// Distributed under the GNU GPL v3 License +/// Distributed under the GNU LGPL v3 License /// (See accompanying file LICENSE or copy at -/// http://www.gnu.org/licenses/gpl.html) +/// http://www.gnu.org/licenses/lgpl-3.0.html) /// #include "localsqlite.h" diff --git a/Example/LocalSqlite/localsqlite.h b/Example/LocalSqlite/localsqlite.h index 9840028..afec2f5 100644 --- a/Example/LocalSqlite/localsqlite.h +++ b/Example/LocalSqlite/localsqlite.h @@ -2,11 +2,11 @@ /// @brief demo of the output to database model /// @author David Yin 2018-12 willage.yin@163.com /// -/// @license GNU GPL v3 +/// @license GNU LGPL v3 /// -/// Distributed under the GNU GPL v3 License +/// Distributed under the GNU LGPL v3 License /// (See accompanying file LICENSE or copy at -/// http://www.gnu.org/licenses/gpl.html) +/// http://www.gnu.org/licenses/lgpl-3.0.html) /// #ifndef LOCALSQLITE_H diff --git a/Example/TestCppDemo/Readme.md b/Example/TestCppDemo/Readme.md new file mode 100644 index 0000000..a9020fc --- /dev/null +++ b/Example/TestCppDemo/Readme.md @@ -0,0 +1,7 @@ +# TestCppDemo +C++测试用例样例 + +# 注意事项 +* 与Python和JavaScript的测试工程一样，测试用例组件需要与后缀tp和tpx同文件名； +* 编译TestCppDemo时依赖了TACppBase.lib +* 开发完成生成TestCppDemo.dll后，发布时需要依赖DevLangCpp.dll，删除该测试工程的源代码； diff --git a/Example/TestCppDemo/TestCppDemo.dll b/Example/TestCppDemo/TestCppDemo.dll new file mode 100644 index 0000000..a04214e Binary files /dev/null and b/Example/TestCppDemo/TestCppDemo.dll differ diff --git a/Example/TestCppDemo/TestCppDemo.pro b/Example/TestCppDemo/TestCppDemo.pro new file mode 100644 index 0000000..1ceb50c --- /dev/null +++ b/Example/TestCppDemo/TestCppDemo.pro @@ -0,0 +1,28 @@ +#------------------------------------------------- +# +# Project created by QtCreator 2020-05-03T17:30:11 +# +#------------------------------------------------- + +QT -= gui + +TARGET = TestCppDemo +TEMPLATE = lib + +DEFINES += TESTCPPDEMO_LIBRARY + +CONFIG(release, debug|release): DESTDIR = ../../bin +CONFIG(debug, debug|release): DESTDIR = ../../bind + +INCLUDEPATH += ../../Libs/TACppBase +LIBS += -L$$DESTDIR/libs/ -lTACppBase + +SOURCES += testcppdemo.cpp + +HEADERS += testcppdemo.h\ + testcppdemo_global.h + +unix { + target.path = /usr/lib + INSTALLS += target +} diff --git a/Example/TestCppDemo/TestCppDemo.tp b/Example/TestCppDemo/TestCppDemo.tp new file mode 100644 index 0000000..f867261 --- /dev/null +++ b/Example/TestCppDemo/TestCppDemo.tp @@ -0,0 +1,92 @@ +{ + "Desc": "demo", + "Name": "testdemo", + "Parameter": { + "Name1": "gfedcba", + "Name2": "abcdefg" + }, + "Public": { + "Models": [ + { + "Com": "TA_MsgBox.dll", + "Obj": "ta" + }, + { + "Com": "Sleep.js", + "Obj": "bb" + } + ], + "Parameter": [ + { + "Desc": "asd", + "Name": "Gabc", + "Value": "123" + }, + { + "Desc": "111", + "Name": "Gdd", + "Value": "111" + }, + { + "Desc": "all of this", + "Name": "Gall", + "Value": "22.3" + } + ] + }, + "TestSuite": [ + { + "Desc": "suite2 test", + "Name": "suite2", + "Parameter": { + "Name1": "2", + "Name2": "2" + }, + "TestCase": [ + { + "Desc": "描述2", + "Name": "test2", + "Parameter": { + "Name1": "1", + "Name2": "2" + } + }, + { + "Desc": "描述1", + "Name": "test1", + "Parameter": { + "Name1": "1", + "Name2": "2" + } + } + ] + }, + { + "Desc": "suite1描述", + "Name": "suite1", + "Parameter": { + "Name1": "2", + "Name2": "2" + }, + "TestCase": [ + { + "Desc": "描述1", + "Name": "test1", + "Parameter": { + "Name1": "1", + "Name2": "2" + } + }, + { + "Desc": "描述2", + "Name": "test2", + "Parameter": { + "Name1": "1", + "Name2": "2" + } + } + ] + } + ], + "Ver": "1.1.0" +} diff --git a/Example/TestCppDemo/TestCppDemo.tpx b/Example/TestCppDemo/TestCppDemo.tpx new file mode 100644 index 0000000..31ec317 --- /dev/null +++ b/Example/TestCppDemo/TestCppDemo.tpx @@ -0,0 +1,79 @@ +{ + "BarCodeReg": "abc\\d{1}", + "Desc": "It's demo test", + "GUIPlugins": [ + { + "Com": "GUI_TA_MsgBox.dll", + "Name": "msg" + } + ], + "Instance": [ + { + "File": "TestCppDemo.tp", + "Name": "Demo11", + "Parameter": [ + { + "Desc": "asd", + "Name": "Gabc", + "Value": "123" + }, + { + "Desc": "111", + "Name": "Gdd", + "Value": "111" + }, + { + "Desc": "all of this", + "Name": "Gall", + "Value": "22.3" + } + ] + }, + { + "File": "TestCppDemo.tp", + "Name": "Demo2", + "Parameter": [ + { + "Desc": "asd", + "Name": "Gabc", + "Value": "123" + }, + { + "Desc": "111", + "Name": "Gdd", + "Value": "111" + }, + { + "Desc": "all of this", + "Name": "Gall", + "Value": "22.3" + } + ] + }, + { + "File": "TestCppDemo.tp", + "Name": "Demo3", + "Parameter": [ + { + "Desc": "asd", + "Name": "Gabc", + "Value": "123" + }, + { + "Desc": "111", + "Name": "Gdd", + "Value": "111" + }, + { + "Desc": "all of this", + "Name": "Gall", + "Value": "22.3" + } + ] + } + ], + "LoopCount": 1, + "Name": "TestDemos", + "failedToStop": false, + "stoppedForLoop": false +} diff --git a/Example/TestCppDemo/libs/GUI_TA_MsgBox.dll b/Example/TestCppDemo/libs/GUI_TA_MsgBox.dll new file mode 100644 index 0000000..541afaf Binary files /dev/null and b/Example/TestCppDemo/libs/GUI_TA_MsgBox.dll differ diff --git a/Example/TestCppDemo/libs/TA_MsgBox.dll b/Example/TestCppDemo/libs/TA_MsgBox.dll new file mode 100644 index 0000000..1c1bece Binary files /dev/null and b/Example/TestCppDemo/libs/TA_MsgBox.dll differ diff --git a/Example/TestCppDemo/testcppdemo.cpp b/Example/TestCppDemo/testcppdemo.cpp new file mode 100644 index 0000000..2791ff9 --- /dev/null +++ b/Example/TestCppDemo/testcppdemo.cpp @@ -0,0 +1,95 @@ +/// +/// @project TreeATE +/// @brief This is test item sample class for cpp language +/// @author David Yin 2020-05 willage.yin@163.com +/// +/// @license GNU LGPL v3 +/// +/// Distributed under the GNU LGPL v3 License +/// (See accompanying file LICENSE or copy at +/// http://www.gnu.org/licenses/lgpl-3.0.html) +/// +#include "testcppdemo.h" +#include + +void* CreateTestInst(const char *strValue) +{ + Q_UNUSED(strValue) + return new TestCppDemo(); +} + +TestCppDemo::TestCppDemo() +{ +} + +int TestCppDemo::setup_testdemo() +{ + OutputError("setup_testdemo中文"); + + QString name = GetProjectName(); + OutputError("GetProjectName:" + name); + QString ver = GetProjectVer(); + OutputError("GetProjectVer:" + ver); + return 0; +} + +int TestCppDemo::teardown_testdemo() +{ + OutputError("teardown_testdemo"); + return 0; +} + +int TestCppDemo::setup_suite1() +{ + OutputError("setup_suite1"); + QString ret = GetUserName(); + OutputError("GetUserName:" + ret); + return 0; +} + +int TestCppDemo::teardown_suite1() +{ + OutputError("teardown_suite1"); + QString ret = GetWorkLine(); + OutputError("GetWorkLine:" + ret); + ret = GetWorkStation(); + OutputError("GetWorkStation:" + ret); + return 0; +} + +int TestCppDemo::setup_suite2() +{ + OutputError("setup_suite2"); + QString ret = GetProjectBarcode(); + OutputError("GetProjectBarcode:" + ret); + return 0; +} + +int TestCppDemo::teardown_suite2() +{ + OutputError("teardown_suite2"); + QString ret = GetProjectDesc(); + OutputError("GetProjectDesc:" + ret); + QString rst = GetTotalRst(); + OutputError("GetTotalRst:" + rst); + return 0; +} + +int TestCppDemo::test_test1() +{ + OutputError("test_test1"); + + for(int i = 0; i < 100; i++) { + QThread::msleep(300); + if(IsStopped()) { + break; + } + } + OutputRst(getParaValue("Name2"), getParaValue("Gabc"), "0"); + return 0; +} + +int TestCppDemo::test_test2() +{ + return 0; +} diff --git a/Example/TestCppDemo/testcppdemo.h b/Example/TestCppDemo/testcppdemo.h new file mode 100644 index 0000000..feaecb0 --- /dev/null +++ b/Example/TestCppDemo/testcppdemo.h @@ -0,0 +1,37 @@ +/// +/// @project TreeATE +/// @brief This is test item sample class for cpp language +/// @author David Yin 2020-05 willage.yin@163.com +/// +/// @license GNU LGPL v3 +/// +/// Distributed under the GNU LGPL v3 License +/// (See accompanying file LICENSE or copy at +/// http://www.gnu.org/licenses/lgpl-3.0.html) +/// +#ifndef TESTCPPDEMO_H +#define TESTCPPDEMO_H + +#include "testcppdemo_global.h" +#include "tacppbase.h" + +extern "C" TESTCPPDEMOSHARED_EXPORT void* CreateTestInst(const char *strValue); + +class TESTCPPDEMOSHARED_EXPORT TestCppDemo : public TACppBase +{ + Q_OBJECT +public: + TestCppDemo(); + +public slots: + int setup_testdemo(); + int teardown_testdemo(); + int setup_suite1(); + int teardown_suite1(); + int setup_suite2(); + int teardown_suite2(); + int test_test1(); + int test_test2(); +}; + +#endif // TESTCPPDEMO_H diff --git a/Example/TestCppDemo/testcppdemo_global.h b/Example/TestCppDemo/testcppdemo_global.h new file mode 100644 index 0000000..c9b7931 --- /dev/null +++ b/Example/TestCppDemo/testcppdemo_global.h @@ -0,0 +1,12 @@ +#ifndef TESTCPPDEMO_GLOBAL_H +#define TESTCPPDEMO_GLOBAL_H + +#include + +#if defined(TESTCPPDEMO_LIBRARY) +# define TESTCPPDEMOSHARED_EXPORT Q_DECL_EXPORT +#else +# define TESTCPPDEMOSHARED_EXPORT Q_DECL_IMPORT +#endif + +#endif // TESTCPPDEMO_GLOBAL_H diff --git a/Example/TestDemo/libs/GUI_TA_MsgBox.dll b/Example/TestDemo/libs/GUI_TA_MsgBox.dll new file mode 100644 index 0000000..541afaf Binary files /dev/null and b/Example/TestDemo/libs/GUI_TA_MsgBox.dll differ diff --git a/Example/TestDemo/libs/TA_MsgBox.dll b/Example/TestDemo/libs/TA_MsgBox.dll new file mode 100644 index 0000000..1c1bece Binary files /dev/null and b/Example/TestDemo/libs/TA_MsgBox.dll differ diff --git a/Example/TestDemoPy/libs/GUI_TA_MsgBox.dll b/Example/TestDemoPy/libs/GUI_TA_MsgBox.dll new file mode 100644 index 0000000..541afaf Binary files /dev/null and b/Example/TestDemoPy/libs/GUI_TA_MsgBox.dll differ diff --git a/Example/TestDemoPy/libs/TA_MsgBox.dll b/Example/TestDemoPy/libs/TA_MsgBox.dll new file mode 100644 index 0000000..1c1bece Binary files /dev/null and b/Example/TestDemoPy/libs/TA_MsgBox.dll differ diff --git a/LICENSE b/LICENSE index 94a9ed0..8a8bf45 100644 --- a/LICENSE +++ b/LICENSE @@ -1,674 +1,324 @@ - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The GNU General Public License is a free, copyleft license for -software and other kinds of works. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -the GNU General Public License is intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - To protect your rights, we need to prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if -you modify it: responsibilities to respect the freedom of others. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they -know their rights. - - Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it. - - For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions. - - Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users. - - Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Use with the GNU Affero General Public License. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU Affero General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - - If the program does terminal interaction, make it output a short -notice like this when it starts in an interactive mode: - - Copyright (C) - This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, your program's commands -might be different; for a GUI interface, you would use an "about box". - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU GPL, see -. - - The GNU General Public License does not permit incorporating your program -into proprietary programs. If your program is a subroutine library, you -may consider it more useful to permit linking proprietary applications with -the library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. But first, please read -. + + GNU LESSER GENERAL PUBLIC LICENSE + + Version 3, 29 June 2007 + + + + Copyright ? 2007 Free Software Foundation, Inc. + + Everyone is permitted to copy and distribute verbatim copies of this + + license document, but changing it is not allowed. + + + +This version of the GNU Lesser General Public License incorporates + +the terms and conditions of version 3 of the GNU General Public + +License, supplemented by the additional permissions listed below. + + + +0. Additional Definitions. + + + + As used herein, “this License” refers to version 3 of the GNU Lesser + +General Public License, and the “GNU GPL” refers to version 3 of the + +GNU General Public License. + + + + “The Library” refers to a covered work governed by this License, + +other than an Application or a Combined Work as defined below. + + + + An “Application” is any work that makes use of an interface provided + +by the Library, but which is not otherwise based on the Library. + +Defining a subclass of a class defined by the Library is deemed a mode + +of using an interface provided by the Library. + + + + A “Combined Work” is a work produced by combining or linking an + +Application with the Library. The particular version of the Library + +with which the Combined Work was made is also called the “Linked + +Version”. + + + + The “Minimal Corresponding Source” for a Combined Work means the + +Corresponding Source for the Combined Work, excluding any source code + +for portions of the Combined Work that, considered in isolation, are + +based on the Application, and not on the Linked Version. + + + + The “Corresponding Application Code” for a Combined Work means the + +object code and/or source code for the Application, including any data + +and utility programs needed for reproducing the Combined Work from the + +Application, but excluding the System Libraries of the Combined Work. + + + +1. Exception to Section 3 of the GNU GPL. + + + + You may convey a covered work under sections 3 and 4 of this License + +without being bound by section 3 of the GNU GPL. + + + +2. Conveying Modified Versions. + + + + If you modify a copy of the Library, and, in your modifications, a + +facility refers to a function or data to be supplied by an Application + +that uses the facility (other than as an argument passed when the + +facility is invoked), then you may convey a copy of the modified + +version: + + + + a) under this License, provided that you make a good faith effort + + to ensure that, in the event an Application does not supply the + + function or data, the facility still operates, and performs + + whatever part of its purpose remains meaningful, or + + + + b) under the GNU GPL, with none of the additional permissions of + + this License applicable to that copy. + + + +3. Object Code Incorporating Material from Library Header Files. + + + + The object code form of an Application may incorporate material from + +a header file that is part of the Library. You may convey such object + +code under terms of your choice, provided that, if the incorporated + +material is not limited to numerical parameters, data structure + +layouts and accessors, or small macros, inline functions and templates + +(ten or fewer lines in length), you do both of the following: + + + + a) Give prominent notice with each copy of the object code that + + the Library is used in it and that the Library and its use are + + covered by this License. + + + + b) Accompany the object code with a copy of the GNU GPL and this + + license document. + + + +4. Combined Works. + + + + You may convey a Combined Work under terms of your choice that, taken + +together, effectively do not restrict modification of the portions of + +the Library contained in the Combined Work and reverse engineering for + +debugging such modifications, if you also do each of the following: + + + + a) Give prominent notice with each copy of the Combined Work that + + the Library is used in it and that the Library and its use are + + covered by this License. + + + + b) Accompany the Combined Work with a copy of the GNU GPL and this + + license document. + + + + c) For a Combined Work that displays copyright notices during + + execution, include the copyright notice for the Library among + + these notices, as well as a reference directing the user to the + + copies of the GNU GPL and this license document. + + + + d) Do one of the following: + + + + 0) Convey the Minimal Corresponding Source under the terms of + + this License, and the Corresponding Application Code in a form + + suitable for, and under terms that permit, the user to + + recombine or relink the Application with a modified version of + + the Linked Version to produce a modified Combined Work, in the + + manner specified by section 6 of the GNU GPL for conveying + + Corresponding Source. + + + + 1) Use a suitable shared library mechanism for linking with + + the Library. A suitable mechanism is one that (a) uses at run + + time a copy of the Library already present on the user's + + computer system, and (b) will operate properly with a modified + + version of the Library that is interface-compatible with the + + Linked Version. + + + + e) Provide Installation Information, but only if you would + + otherwise be required to provide such information under section 6 + + of the GNU GPL, and only to the extent that such information is + + necessary to install and execute a modified version of the + + Combined Work produced by recombining or relinking the Application + + with a modified version of the Linked Version. (If you use option + + 4d0, the Installation Information must accompany the Minimal + + Corresponding Source and Corresponding Application Code. If you + + use option 4d1, you must provide the Installation Information in + + the manner specified by section 6 of the GNU GPL for conveying + + Corresponding Source.) + + + +5. Combined Libraries. + + + + You may place library facilities that are a work based on the Library + +side by side in a single library together with other library + +facilities that are not Applications and are not covered by this + +License, and convey such a combined library under terms of your + +choice, if you do both of the following: + + + + a) Accompany the combined library with a copy of the same work + + based on the Library, uncombined with any other library + + facilities, conveyed under the terms of this License. + + + + b) Give prominent notice with the combined library that part of + + it is a work based on the Library, and explaining where to find + + the accompanying uncombined form of the same work. + + + +6. Revised Versions of the GNU Lesser General Public License. + + + + The Free Software Foundation may publish revised and/or new versions + +of the GNU Lesser General Public License from time to time. Such new + +versions will be similar in spirit to the present version, but may + +differ in detail to address new problems or concerns. + + + +Each version is given a distinguishing version number. If the Library + +as you received it specifies that a certain numbered version of the + +GNU Lesser General Public License “or any later version” applies to + +it, you have the option of following the terms and conditions either + +of that published version or of any later version published by the + +Free Software Foundation. If the Library as you received it does not + +specify a version number of the GNU Lesser General Public License, + +you may choose any version of the GNU Lesser General Public License + +ever published by the Free Software Foundation. + + + +If the Library as you received it specifies that a proxy can decide + +whether future versions of the GNU Lesser General Public License shall + +apply, that proxy's public statement of acceptance of any version is + +permanent authorization for you to choose that version for the Library. \ No newline at end of file diff --git a/LICENSE-TreeATEDev b/LICENSE-TreeATEDev new file mode 100644 index 0000000..94a9ed0 --- /dev/null +++ b/LICENSE-TreeATEDev @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. diff --git a/Libs/Libs.pro b/Libs/Libs.pro index f89f03d..a3feca1 100644 --- a/Libs/Libs.pro +++ b/Libs/Libs.pro @@ -1,4 +1,5 @@ TEMPLATE = subdirs SUBDIRS += \ - TALocalSocket + TALocalSocket \ + TACppBase diff --git a/Libs/TACppBase/TACppBase.pro b/Libs/TACppBase/TACppBase.pro new file mode 100644 index 0000000..fb5881f --- /dev/null +++ b/Libs/TACppBase/TACppBase.pro @@ -0,0 +1,22 @@ +#------------------------------------------------- +# +# Project created by QtCreator 2020-05-03T15:38:01 +# +#------------------------------------------------- + +QT -= gui + +TARGET = TACppBase +TEMPLATE = lib +CONFIG += staticlib + +CONFIG(release, debug|release): DESTDIR = ../../bin/libs +CONFIG(debug, debug|release): DESTDIR = ../../bind/libs + +SOURCES += tacppbase.cpp + +HEADERS += tacppbase.h +unix { + target.path = /usr/lib + INSTALLS += target +} diff --git a/Libs/TACppBase/tacppbase.cpp b/Libs/TACppBase/tacppbase.cpp new file mode 100644 index 0000000..d2ce1fa --- /dev/null +++ b/Libs/TACppBase/tacppbase.cpp @@ -0,0 +1,189 @@ +/// +/// @project TreeATE +/// @brief This is test item base class for cpp language +/// @author David Yin 2020-05 willage.yin@163.com +/// +/// @license GNU LGPL v3 +/// +/// Distributed under the GNU LGPL v3 License +/// (See accompanying file LICENSE or copy at +/// http://www.gnu.org/licenses/lgpl-3.0.html) +/// +#include "tacppbase.h" +#include + +TACppBase::TACppBase() +{ +} + +void TACppBase::addModel(const QString &strObjName, QObject* obj) +{ + m_models.insert(strObjName, obj); + if(strObjName == "__ate") { + m_ate = obj; + } + else if(strObjName == "__aterun") { + m_ateRun = obj; + } +} + +void TACppBase::addPublicPara(const QString& strName, const QString& strValue) +{ + m_publicPara.insert(strName, strValue); +} + +void TACppBase::setLocalPara(const QString& strName, const QString& strValue) +{ + m_localPara.insert(strName, strValue); +} + +QObject* TACppBase::getObj(const QString& strName) +{ + auto itor = m_models.find(strName); + if( itor != m_models.end()) { + return *itor; + } + + return NULL; +} + +QString TACppBase::getParaValue(const QString& strName) +{ + auto itor = m_localPara.find(strName); + if(itor != m_localPara.end()) { + return *itor; + } + else { + auto itPublic = m_publicPara.find(strName); + if(itPublic != m_publicPara.end()) { + return *itPublic; + } + } + return ""; +} + +bool TACppBase::OutputRst(const QString& strName, const QString& strValue, const QString& strStand) +{ + bool bRet = false; + if(m_ate) { + QMetaObject::invokeMethod(m_ate, "OutputRst", + Q_RETURN_ARG(bool, bRet), + Q_ARG(QString, strName), + Q_ARG(QString, strValue), + Q_ARG(QString, strStand)); + } + return bRet; +} + +bool TACppBase::OutputRstEx(const QString& strName, const QString& strValue, const QString& strStand, int nRst) +{ + bool bRet = false; + if(m_ate) { + QMetaObject::invokeMethod(m_ate, "OutputRstEx", + Q_RETURN_ARG(bool, bRet), + Q_ARG(QString, strName), + Q_ARG(QString, strValue), + Q_ARG(QString, strStand), + Q_ARG(int, nRst)); + } + return bRet; +} + +void TACppBase::OutputError(const QString& strOutput) +{ + if(m_ate) { + QMetaObject::invokeMethod(m_ate, "OutputError", + Q_ARG(QString, strOutput)); + } +} + +QString TACppBase::GetProjectName() +{ + QString strValue; + if(m_ate) { + QMetaObject::invokeMethod(m_ate, "GetProjectName", + Q_RETURN_ARG(QString, strValue)); + } + return strValue; +} + +QString TACppBase::GetProjectVer() +{ + QString strValue; + if(m_ate) { + QMetaObject::invokeMethod(m_ate, "GetProjectVer", + Q_RETURN_ARG(QString, strValue)); + } + return strValue; +} + +QString TACppBase::GetProjectBarcode() +{ + QString strValue; + if(m_ate) { + QMetaObject::invokeMethod(m_ate, "GetProjectBarcode", + Q_RETURN_ARG(QString, strValue)); + } + return strValue; +} + +QString TACppBase::GetProjectDesc() +{ + QString strValue; + if(m_ate) { + QMetaObject::invokeMethod(m_ate, "GetProjectDesc", + Q_RETURN_ARG(QString, strValue)); + } + return strValue; +} + +QString TACppBase::GetWorkLine() +{ + QString strValue; + if(m_ate) { + QMetaObject::invokeMethod(m_ate, "GetWorkLine", + Q_RETURN_ARG(QString, strValue)); + } + return strValue; +} + +QString TACppBase::GetWorkStation() +{ + QString strValue; + if(m_ate) { + QMetaObject::invokeMethod(m_ate, "GetWorkStation", + Q_RETURN_ARG(QString, strValue)); + } + return strValue; +} + +QString TACppBase::GetUserName() +{ + QString strValue; + if(m_ate) { + QMetaObject::invokeMethod(m_ate, "GetUserName", + Q_RETURN_ARG(QString, strValue)); + } + return strValue; +} + +int TACppBase::GetTotalRst() +{ + int iRet = -1; + if(m_ate) { + QMetaObject::invokeMethod(m_ate, "GetTotalRst", + Q_RETURN_ARG(int, iRet)); + } + return iRet; +} + +// __aterun object +bool TACppBase::IsStopped() +{ + bool bRet = false; + if(m_ateRun) { + QMetaObject::invokeMethod(m_ateRun, "IsStopped", + Q_RETURN_ARG(bool, bRet)); + } + return bRet; +} diff --git a/Libs/TACppBase/tacppbase.h b/Libs/TACppBase/tacppbase.h new file mode 100644 index 0000000..02397c0 --- /dev/null +++ b/Libs/TACppBase/tacppbase.h @@ -0,0 +1,56 @@ +/// +/// @project TreeATE +/// @brief This is test item base class for cpp language +/// @author David Yin 2020-05 willage.yin@163.com +/// +/// @license GNU LGPL v3 +/// +/// Distributed under the GNU LGPL v3 License +/// (See accompanying file LICENSE or copy at +/// http://www.gnu.org/licenses/lgpl-3.0.html) +/// +#ifndef TACPPBASE_H +#define TACPPBASE_H +#include +#include + +class TACppBase : public QObject +{ + Q_OBJECT +public: + TACppBase(); + +public slots: + void addModel(const QString &strObjName, QObject* obj); + void addPublicPara(const QString& strName, const QString& strValue); + void setLocalPara(const QString& strName, const QString& strValue); + +protected: + QObject* getObj(const QString& strName); + QString getParaValue(const QString& strName); + + // __ate object + bool OutputRst(const QString& strName, const QString& strValue, const QString& strStand); + bool OutputRstEx(const QString& strName, const QString& strValue, const QString& strStand, int nRst); + void OutputError(const QString& strOutput); + QString GetProjectName(); + QString GetProjectVer(); + QString GetProjectBarcode(); + QString GetProjectDesc(); + QString GetWorkLine(); + QString GetWorkStation(); + QString GetUserName(); + int GetTotalRst(); + + // __aterun object + bool IsStopped(); + +private: + QMap m_models; + QMap m_publicPara; + QMap m_localPara; + QObject* m_ate; + QObject* m_ateRun; +}; + +#endif // TACPPBASE_H diff --git a/Libs/TALocalSocket/talocalsocket.cpp b/Libs/TALocalSocket/talocalsocket.cpp index 545e9fe..da3f499 100644 --- a/Libs/TALocalSocket/talocalsocket.cpp +++ b/Libs/TALocalSocket/talocalsocket.cpp @@ -2,11 +2,11 @@ /// @brief Protocol of TreeATE between GUI and models /// @author David Yin 2018-12 willage.yin@163.com /// -/// @license GNU GPL v3 +/// @license GNU LGPL v3 /// -/// Distributed under the GNU GPL v3 License +/// Distributed under the GNU LGPL v3 License /// (See accompanying file LICENSE or copy at -/// http://www.gnu.org/licenses/gpl.html) +/// http://www.gnu.org/licenses/lgpl-3.0.html) /// #include "talocalsocket.h" @@ -151,7 +151,7 @@ bool TALocalSocket::returnFromServer(int mSecs, QString &data) return false; } - QByteArray buf = m_lsClient->readAll(); + QByteArray buf = m_lsClient->readAll(); // is Async Reply, success to receive at server if(((uchar)buf.at(0) == TA_LOCAL_START_REP) && buf.at(1) == TA_LOCAL_FLAG_SYNC) { int rLen = buf.at(2); diff --git a/Libs/TALocalSocket/talocalsocket.h b/Libs/TALocalSocket/talocalsocket.h index d5ddbfd..f2bb25c 100644 --- a/Libs/TALocalSocket/talocalsocket.h +++ b/Libs/TALocalSocket/talocalsocket.h @@ -2,11 +2,11 @@ /// @brief Protocol of TreeATE between GUI and models /// @author David Yin 2018-12 willage.yin@163.com /// -/// @license GNU GPL v3 +/// @license GNU LGPL v3 /// -/// Distributed under the GNU GPL v3 License +/// Distributed under the GNU LGPL v3 License /// (See accompanying file LICENSE or copy at -/// http://www.gnu.org/licenses/gpl.html) +/// http://www.gnu.org/licenses/lgpl-3.0.html) /// #ifndef TALOCALSOCKET_H diff --git a/Plugins/DevLangCpp/DevLangCpp.pro b/Plugins/DevLangCpp/DevLangCpp.pro new file mode 100644 index 0000000..f764c80 --- /dev/null +++ b/Plugins/DevLangCpp/DevLangCpp.pro @@ -0,0 +1,25 @@ +#------------------------------------------------- +# +# Project created by QtCreator 2020-04-03T14:36:33 +# +#------------------------------------------------- + +QT -= gui + +TARGET = DevLangCpp +TEMPLATE = lib + +DEFINES += DEVLANGCPP_LIBRARY + +CONFIG(release, debug|release): DESTDIR = ../../bin +CONFIG(debug, debug|release): DESTDIR = ../../bind + +SOURCES += devlangcpp.cpp + +HEADERS += devlangcpp.h\ + devlangcpp_global.h + +unix { + target.path = /usr/lib + INSTALLS += target +} diff --git a/Plugins/DevLangCpp/devlangcpp.cpp b/Plugins/DevLangCpp/devlangcpp.cpp new file mode 100644 index 0000000..6d1302e --- /dev/null +++ b/Plugins/DevLangCpp/devlangcpp.cpp @@ -0,0 +1,163 @@ +/// +/// @project TreeATE +/// @brief Support cpp language test item +/// @author David Yin 2020-05 willage.yin@163.com +/// +/// @license GNU LGPL v3 +/// +/// Distributed under the GNU LGPL v3 License +/// (See accompanying file LICENSE or copy at +/// http://www.gnu.org/licenses/lgpl-3.0.html) +/// + +#include "devlangcpp.h" + +#include +#include +#include +#include +#include + +void* CreateLanguageInst(const char *strLangName) +{ + if(QString(strLangName) == "cpp") + return new DevLangCpp(); + + return NULL; +} + + +DevLangCpp::DevLangCpp() +{ + m_pObj = NULL; +} + +DevLangCpp::~DevLangCpp() +{ + if(m_pObj) { + delete m_pObj; + m_pObj = NULL; + } + if(m_libTest.isLoaded()) + m_libTest.unload(); +} + +typedef void* (*CreateInst)(const char*); + +bool DevLangCpp::loadScript(const QStringList& scriptFiles) +{ + if(scriptFiles.count() != 1) { + m_lastErr = tr("[DevLangCpp] No dll files for test."); + return false; + } + + m_libTest.setFileName(scriptFiles.at(0)); + if(!m_libTest.load()) { + m_lastErr = tr("Warning:") + m_libTest.errorString(); + return false; + } + + CreateInst myFunction = (CreateInst) m_libTest.resolve("CreateTestInst"); + if (NULL == myFunction) + { + m_lastErr = tr("Warning:") + m_libTest.errorString(); + m_libTest.unload(); + return false; + } + + m_pObj = (QObject*)myFunction(""); + if(NULL == m_pObj) + { + m_libTest.unload(); + m_lastErr = tr("Warning:") + tr("Failed to create the test instance."); + return false; + } + + return true; +} + +void DevLangCpp::addModel(const QString &strObjName, QObject* obj) +{ + if(m_pObj == NULL) { + m_lastErr = tr("[DevLangCpp] Not found the test object."); + return; + } + + const QString funcName = "addModel"; + const QMetaObject* metaObj = m_pObj->metaObject(); + if(metaObj) { + if(!QMetaObject::invokeMethod(m_pObj, funcName.toUtf8().data(), + Q_ARG(QString, strObjName), + Q_ARG(QObject*, obj))) + { + m_lastErr = tr("[DevLangCpp] Failed invoke method: ") + funcName; + } + } + else { + m_lastErr = tr("[DevLangCpp] The test object was invaild."); + return; + } + return; +} + +bool DevLangCpp::invokeFunc(const QString funcName, const TA_MapParaValue& para) +{ + if(m_pObj == NULL) { + m_lastErr = tr("[DevLangCpp] Not found the test object."); + return false; + } + + const QMetaObject* metaObj = m_pObj->metaObject(); + if(metaObj) { + for(TA_MapParaValue::const_iterator itor = para.cbegin(); itor != para.cend(); + ++itor) { + if(!QMetaObject::invokeMethod(m_pObj, funcName.toUtf8().data(), + Q_ARG(QString, itor.key()), + Q_ARG(QString, itor.value()))) + { + m_lastErr = tr("[DevLangCpp] Failed invoke method: ") + funcName; + return false; + } + } + } + else { + m_lastErr = tr("[DevLangCpp] The test object was invaild."); + return false; + } + return true; +} + +bool DevLangCpp::initPublicPara(const TA_MapParaValue& publicPara) +{ + return invokeFunc("addPublicPara", publicPara); +} + +int DevLangCpp::executeScript(const QString& funcName, const TA_MapParaValue& localValue) +{ + int iRet = -1; + if(m_pObj == NULL) { + m_lastErr = tr("[DevLangCpp] Not found the test object."); + return iRet; + } + + if(!invokeFunc("setLocalPara", localValue)) { + return iRet; + } + + const QMetaObject* metaObj = m_pObj->metaObject(); + if(metaObj) { + if(!QMetaObject::invokeMethod(m_pObj, funcName.toUtf8().data(), + Q_RETURN_ARG(int, iRet))) + { + m_lastErr = tr("[DevLangCpp] Failed invoke method: ") + funcName; + iRet = -2; + } + } + else { + iRet = -3; + m_lastErr = tr("[DevLangCpp] The test object was invaild."); + return iRet; + } + + return iRet; +} diff --git a/Plugins/DevLangCpp/devlangcpp.h b/Plugins/DevLangCpp/devlangcpp.h new file mode 100644 index 0000000..97fdab2 --- /dev/null +++ b/Plugins/DevLangCpp/devlangcpp.h @@ -0,0 +1,42 @@ +/// +/// @project TreeATE +/// @brief Support cpp language test item +/// @author David Yin 2020-05 willage.yin@163.com +/// +/// @license GNU LGPL v3 +/// +/// Distributed under the GNU LGPL v3 License +/// (See accompanying file LICENSE or copy at +/// http://www.gnu.org/licenses/lgpl-3.0.html) +/// +#ifndef DEVLANGCPP_H +#define DEVLANGCPP_H + +#include "devlangcpp_global.h" +#include "imutlilang.h" + +extern "C" DEVLANGCPPSHARED_EXPORT void* CreateLanguageInst(const char *strLangName); + +#include + +class DevLangCpp : public IMutliLang +{ + Q_OBJECT +public: + DevLangCpp(); + virtual ~DevLangCpp(); + + virtual bool loadScript(const QStringList& scriptFiles); + virtual void addModel(const QString &strObjName, QObject* obj); + virtual bool initPublicPara(const TA_MapParaValue& publicPara); + virtual int executeScript(const QString& funcName, const TA_MapParaValue& localValue); + +protected: + bool invokeFunc(const QString funcName, const TA_MapParaValue& para); + +private: + QObject* m_pObj; + QLibrary m_libTest; +}; + +#endif // DEVLANGCPP_H diff --git a/Plugins/DevLangCpp/devlangcpp_global.h b/Plugins/DevLangCpp/devlangcpp_global.h new file mode 100644 index 0000000..3853552 --- /dev/null +++ b/Plugins/DevLangCpp/devlangcpp_global.h @@ -0,0 +1,12 @@ +#ifndef DEVLANGCPP_GLOBAL_H +#define DEVLANGCPP_GLOBAL_H + +#include + +#if defined(DEVLANGCPP_LIBRARY) +# define DEVLANGCPPSHARED_EXPORT Q_DECL_EXPORT +#else +# define DEVLANGCPPSHARED_EXPORT Q_DECL_IMPORT +#endif + +#endif // DEVLANGCPP_GLOBAL_H diff --git a/Plugins/DevLangCpp/imutlilang.h b/Plugins/DevLangCpp/imutlilang.h new file mode 100644 index 0000000..111f267 --- /dev/null +++ b/Plugins/DevLangCpp/imutlilang.h @@ -0,0 +1,35 @@ +/// +/// @project TreeATE +/// @brief mutli-language interface for testrunner +/// @author David Yin 2019-01 willage.yin@163.com +/// +/// @license GNU GPL v3 +/// +/// Distributed under the GNU GPL v3 License +/// (See accompanying file LICENSE or copy at +/// http://www.gnu.org/licenses/gpl.html) +/// + +#ifndef IMUTLILANG_H +#define IMUTLILANG_H + +#include +#include + +typedef QMap TA_MapParaValue; + +class IMutliLang : public QObject +{ +public: + virtual bool loadScript(const QStringList& scriptFiles) = 0; + virtual void addModel(const QString &strObjName, QObject* obj) = 0; + virtual bool initPublicPara(const TA_MapParaValue& publicPara) = 0; + virtual int executeScript(const QString& funcName, const TA_MapParaValue& localValue) = 0; + + QString getLastErr() { return m_lastErr; } + +protected: + QString m_lastErr; +}; + +#endif // IMUTLILANG_H diff --git a/Plugins/DevLangPython/devlangchoose.cpp b/Plugins/DevLangPython/devlangchoose.cpp index 67ea81b..d8e7c38 100644 --- a/Plugins/DevLangPython/devlangchoose.cpp +++ b/Plugins/DevLangPython/devlangchoose.cpp @@ -1,3 +1,13 @@ +/// @project TreeATE +/// @brief parser test for Python +/// @author David Yin 2019-01 willage.yin@163.com +/// +/// @license GNU LGPL v3 +/// +/// Distributed under the GNU LGPL v3 License +/// (See accompanying file LICENSE or copy at +/// http://www.gnu.org/licenses/lgpl-3.0.html) +/// #include "devlangchoose.h" #include "langpy.h" diff --git a/Plugins/DevLangPython/langpy.cpp b/Plugins/DevLangPython/langpy.cpp index dd6be07..51eee72 100644 --- a/Plugins/DevLangPython/langpy.cpp +++ b/Plugins/DevLangPython/langpy.cpp @@ -3,11 +3,11 @@ /// @brief parser test for Python /// @author David Yin 2019-01 willage.yin@163.com /// -/// @license GNU GPL v3 +/// @license GNU LGPL v3 /// -/// Distributed under the GNU GPL v3 License +/// Distributed under the GNU LGPL v3 License /// (See accompanying file LICENSE or copy at -/// http://www.gnu.org/licenses/gpl.html) +/// http://www.gnu.org/licenses/lgpl-3.0.html) /// #include "stdinc.h" @@ -36,7 +36,7 @@ void LangPy::strOut(const QString &out) } bool LangPy::loadScript(const QStringList &scriptFiles) -{ +{ for(QStringList::const_reverse_iterator itor = scriptFiles.rbegin(); itor != scriptFiles.rend(); ++itor) { diff --git a/Plugins/DevLangPython/langpy.h b/Plugins/DevLangPython/langpy.h index a887240..e22c11b 100644 --- a/Plugins/DevLangPython/langpy.h +++ b/Plugins/DevLangPython/langpy.h @@ -3,11 +3,11 @@ /// @brief parser test for Python /// @author David Yin 2019-01 willage.yin@163.com /// -/// @license GNU GPL v3 +/// @license GNU LGPL v3 /// -/// Distributed under the GNU GPL v3 License +/// Distributed under the GNU LGPL v3 License /// (See accompanying file LICENSE or copy at -/// http://www.gnu.org/licenses/gpl.html) +/// http://www.gnu.org/licenses/lgpl-3.0.html) /// #ifndef LANGPY_H #define LANGPY_H diff --git a/Plugins/GUI_TA_MsgBox/gui_ta_msgbox.cpp b/Plugins/GUI_TA_MsgBox/gui_ta_msgbox.cpp index d022877..555facb 100644 --- a/Plugins/GUI_TA_MsgBox/gui_ta_msgbox.cpp +++ b/Plugins/GUI_TA_MsgBox/gui_ta_msgbox.cpp @@ -2,11 +2,11 @@ /// @brief MsgBox GUI Instance /// @author David Yin 2018-12 willage.yin@163.com /// -/// @license GNU GPL v3 +/// @license GNU LGPL v3 /// -/// Distributed under the GNU GPL v3 License +/// Distributed under the GNU LGPL v3 License /// (See accompanying file LICENSE or copy at -/// http://www.gnu.org/licenses/gpl.html) +/// http://www.gnu.org/licenses/lgpl-3.0.html) /// #include "gui_ta_msgbox.h" diff --git a/Plugins/GUI_TA_MsgBox/gui_ta_msgbox.h b/Plugins/GUI_TA_MsgBox/gui_ta_msgbox.h index b706802..728c48c 100644 --- a/Plugins/GUI_TA_MsgBox/gui_ta_msgbox.h +++ b/Plugins/GUI_TA_MsgBox/gui_ta_msgbox.h @@ -2,11 +2,11 @@ /// @brief Plugin of the MsgBox GUI Instance /// @author David Yin 2018-12 willage.yin@163.com /// -/// @license GNU GPL v3 +/// @license GNU LGPL v3 /// -/// Distributed under the GNU GPL v3 License +/// Distributed under the GNU LGPL v3 License /// (See accompanying file LICENSE or copy at -/// http://www.gnu.org/licenses/gpl.html) +/// http://www.gnu.org/licenses/lgpl-3.0.html) /// #ifndef GUI_TA_MSGBOX_H diff --git a/Plugins/GUI_TA_MsgBox/msgboxdlg.cpp b/Plugins/GUI_TA_MsgBox/msgboxdlg.cpp index f5bf668..0273420 100644 --- a/Plugins/GUI_TA_MsgBox/msgboxdlg.cpp +++ b/Plugins/GUI_TA_MsgBox/msgboxdlg.cpp @@ -2,11 +2,11 @@ /// @brief Timeout Dialog /// @author David Yin 2018-12 willage.yin@163.com /// -/// @license GNU GPL v3 +/// @license GNU LGPL v3 /// -/// Distributed under the GNU GPL v3 License +/// Distributed under the GNU LGPL v3 License /// (See accompanying file LICENSE or copy at -/// http://www.gnu.org/licenses/gpl.html) +/// http://www.gnu.org/licenses/lgpl-3.0.html) /// diff --git a/Plugins/GUI_TA_MsgBox/msgboxdlg.h b/Plugins/GUI_TA_MsgBox/msgboxdlg.h index 9f8dfe1..de653b0 100644 --- a/Plugins/GUI_TA_MsgBox/msgboxdlg.h +++ b/Plugins/GUI_TA_MsgBox/msgboxdlg.h @@ -2,11 +2,11 @@ /// @brief Timeout Dialog /// @author David Yin 2018-12 willage.yin@163.com /// -/// @license GNU GPL v3 +/// @license GNU LGPL v3 /// -/// Distributed under the GNU GPL v3 License +/// Distributed under the GNU LGPL v3 License /// (See accompanying file LICENSE or copy at -/// http://www.gnu.org/licenses/gpl.html) +/// http://www.gnu.org/licenses/lgpl-3.0.html) /// #ifndef MSGBOXDLG_H diff --git a/Plugins/Plugins.pro b/Plugins/Plugins.pro index bdf7268..4280814 100644 --- a/Plugins/Plugins.pro +++ b/Plugins/Plugins.pro @@ -3,4 +3,5 @@ TEMPLATE = subdirs SUBDIRS += \ GUI_TA_MsgBox \ TA_MsgBox \ - DevLangPython + DevLangPython \ + DevLangCpp diff --git a/Plugins/TA_MsgBox/ta_msgbox.cpp b/Plugins/TA_MsgBox/ta_msgbox.cpp index be4d9cf..3f1af4a 100644 --- a/Plugins/TA_MsgBox/ta_msgbox.cpp +++ b/Plugins/TA_MsgBox/ta_msgbox.cpp @@ -2,11 +2,11 @@ /// @brief common of the MessageBox /// @author David Yin 2018-12 willage.yin@163.com /// -/// @license GNU GPL v3 +/// @license GNU LGPL v3 /// -/// Distributed under the GNU GPL v3 License +/// Distributed under the GNU LGPL v3 License /// (See accompanying file LICENSE or copy at -/// http://www.gnu.org/licenses/gpl.html) +/// http://www.gnu.org/licenses/lgpl-3.0.html) /// #include "ta_msgbox.h" diff --git a/Plugins/TA_MsgBox/ta_msgbox.h b/Plugins/TA_MsgBox/ta_msgbox.h index ea243a5..637f9b5 100644 --- a/Plugins/TA_MsgBox/ta_msgbox.h +++ b/Plugins/TA_MsgBox/ta_msgbox.h @@ -2,11 +2,11 @@ /// @brief common of the MessageBox /// @author David Yin 2018-12 willage.yin@163.com /// -/// @license GNU GPL v3 +/// @license GNU LGPL v3 /// -/// Distributed under the GNU GPL v3 License +/// Distributed under the GNU LGPL v3 License /// (See accompanying file LICENSE or copy at -/// http://www.gnu.org/licenses/gpl.html) +/// http://www.gnu.org/licenses/lgpl-3.0.html) /// #ifndef TA_MSGBOX_H diff --git a/Setup/setup.iss b/Setup/setup.iss index e74a777..8be5c8a 100644 --- a/Setup/setup.iss +++ b/Setup/setup.iss @@ -2,7 +2,7 @@ ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! #define MyAppName "TreeATE" -#define MyAppVersion "1.2.2" +#define MyAppVersion "2.0.0" #define MyAppPublisher "David Yin" #define MyAppURL "https://blog.csdn.net/vivasoft/column/info/31202" #define MyAppExeName "TreeATE.exe" @@ -37,6 +37,7 @@ Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{ Source: "D:\Projects\build-TreeATE-Desktop_Qt_5_7_0_MSVC2013_32bit-Release\bin\*"; DestDir: "{app}"; Flags: recursesubdirs replacesameversion Source: "..\Example\TestDemo\*"; DestDir: "{app}\Example\TestDemo\"; Flags: recursesubdirs Source: "..\Example\TestDemoPy\*"; DestDir: "{app}\Example\TestDemoPy\"; Flags: recursesubdirs +Source: "..\Example\TestCppDemo\*"; DestDir: "{app}\Example\TestCppDemo\"; Flags: recursesubdirs ; NOTE: Don't use "Flags: ignoreversion" on any shared system files [Icons] diff --git a/Src/TestEngine/ate_te.rc b/Src/TestEngine/ate_te.rc index c09aafd..bd929af 100644 --- a/Src/TestEngine/ate_te.rc +++ b/Src/TestEngine/ate_te.rc @@ -5,8 +5,8 @@ #endif VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,1,3,1 - PRODUCTVERSION 1,1,3,1 + FILEVERSION 2,0,0,1 + PRODUCTVERSION 2,0,0,1 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS VS_FF_DEBUG @@ -23,9 +23,9 @@ VS_VERSION_INFO VERSIONINFO BEGIN VALUE "CompanyName", "David Yin\0" VALUE "FileDescription", "Test Engine for TreeATE\0" - VALUE "FileVersion", "1,1,2,1" - VALUE "ProductVersion", "1,1,2,1" - VALUE "LegalCopyright", "Copyright 2019(C) David Yin\0" + VALUE "FileVersion", "2,0,0,1" + VALUE "ProductVersion", "2,0,0,1" + VALUE "LegalCopyright", "Copyright 2020(C) David Yin\0" VALUE "LegalTrademarks", "Tree ATE\0" VALUE "OriginalFilename", "TestEngine.exe\0" VALUE "ProductName", "TreeATE\0" diff --git a/Src/TestEngine/ioutput.h b/Src/TestEngine/ioutput.h index d007796..94d1f61 100644 --- a/Src/TestEngine/ioutput.h +++ b/Src/TestEngine/ioutput.h @@ -2,11 +2,11 @@ /// @brief Output Interface /// @author David Yin 2018-12 willage.yin@163.com /// -/// @license GNU GPL v3 +/// @license GNU LGPL v3 /// -/// Distributed under the GNU GPL v3 License +/// Distributed under the GNU LGPL v3 License /// (See accompanying file LICENSE or copy at -/// http://www.gnu.org/licenses/gpl.html) +/// http://www.gnu.org/licenses/lgpl-3.0.html) /// #ifndef IOUTPUT_H diff --git a/Src/TestEngine/langqs.cpp b/Src/TestEngine/langqs.cpp index 5774a8f..70ed070 100644 --- a/Src/TestEngine/langqs.cpp +++ b/Src/TestEngine/langqs.cpp @@ -3,11 +3,11 @@ /// @brief parser test for QtScript /// @author David Yin 2019-01 willage.yin@163.com /// -/// @license GNU GPL v3 +/// @license GNU LGPL v3 /// -/// Distributed under the GNU GPL v3 License +/// Distributed under the GNU LGPL v3 License /// (See accompanying file LICENSE or copy at -/// http://www.gnu.org/licenses/gpl.html) +/// http://www.gnu.org/licenses/lgpl-3.0.html) /// #include "stdinc.h" diff --git a/Src/TestEngine/langqs.h b/Src/TestEngine/langqs.h index e727ba7..0acd97e 100644 --- a/Src/TestEngine/langqs.h +++ b/Src/TestEngine/langqs.h @@ -3,11 +3,11 @@ /// @brief parser test for QtScript /// @author David Yin 2019-01 willage.yin@163.com /// -/// @license GNU GPL v3 +/// @license GNU LGPL v3 /// -/// Distributed under the GNU GPL v3 License +/// Distributed under the GNU LGPL v3 License /// (See accompanying file LICENSE or copy at -/// http://www.gnu.org/licenses/gpl.html) +/// http://www.gnu.org/licenses/lgpl-3.0.html) /// #ifndef LANGQS_H diff --git a/Src/TestEngine/main.cpp b/Src/TestEngine/main.cpp index 6f09edb..c30d049 100644 --- a/Src/TestEngine/main.cpp +++ b/Src/TestEngine/main.cpp @@ -2,11 +2,11 @@ /// @brief TestEngine main /// @author David Yin 2018-12 willage.yin@163.com /// -/// @license GNU GPL v3 +/// @license GNU LGPL v3 /// -/// Distributed under the GNU GPL v3 License +/// Distributed under the GNU LGPL v3 License /// (See accompanying file LICENSE or copy at -/// http://www.gnu.org/licenses/gpl.html) +/// http://www.gnu.org/licenses/lgpl-3.0.html) /// #include "stdinc.h" @@ -68,7 +68,7 @@ int main(int argc, char *argv[]) qInstallMessageHandler(customMessageHandler); QCoreApplication app(argc, argv); QCoreApplication::setApplicationName("TestEngine"); - QCoreApplication::setApplicationVersion("1.1.0"); + QCoreApplication::setApplicationVersion("1.3.0"); MainTask mainTask(&app); QTimer::singleShot(0, &mainTask, SLOT(run())); diff --git a/Src/TestEngine/maintask.cpp b/Src/TestEngine/maintask.cpp index 0da0f42..0a376f4 100644 --- a/Src/TestEngine/maintask.cpp +++ b/Src/TestEngine/maintask.cpp @@ -3,11 +3,11 @@ /// @brief TestEngine's main task /// @author David Yin 2019-01 willage.yin@163.com /// -/// @license GNU GPL v3 +/// @license GNU LGPL v3 /// -/// Distributed under the GNU GPL v3 License +/// Distributed under the GNU LGPL v3 License /// (See accompanying file LICENSE or copy at -/// http://www.gnu.org/licenses/gpl.html) +/// http://www.gnu.org/licenses/lgpl-3.0.html) /// #include "stdinc.h" diff --git a/Src/TestEngine/maintask.h b/Src/TestEngine/maintask.h index 83559cc..c282e09 100644 --- a/Src/TestEngine/maintask.h +++ b/Src/TestEngine/maintask.h @@ -3,11 +3,11 @@ /// @brief TestEngine's main task /// @author David Yin 2019-01 willage.yin@163.com /// -/// @license GNU GPL v3 +/// @license GNU LGPL v3 /// -/// Distributed under the GNU GPL v3 License +/// Distributed under the GNU LGPL v3 License /// (See accompanying file LICENSE or copy at -/// http://www.gnu.org/licenses/gpl.html) +/// http://www.gnu.org/licenses/lgpl-3.0.html) /// #ifndef MAINTASK_H diff --git a/Src/TestEngine/outputlocal.cpp b/Src/TestEngine/outputlocal.cpp index aafb2d3..7e9c869 100644 --- a/Src/TestEngine/outputlocal.cpp +++ b/Src/TestEngine/outputlocal.cpp @@ -2,11 +2,11 @@ /// @brief Let's test result output and save the local with file. /// @author David Yin 2018-12 willage.yin@163.com /// -/// @license GNU GPL v3 +/// @license GNU LGPL v3 /// -/// Distributed under the GNU GPL v3 License +/// Distributed under the GNU LGPL v3 License /// (See accompanying file LICENSE or copy at -/// http://www.gnu.org/licenses/gpl.html) +/// http://www.gnu.org/licenses/lgpl-3.0.html) /// #include "stdinc.h" diff --git a/Src/TestEngine/outputlocal.h b/Src/TestEngine/outputlocal.h index 40da14a..2818ff5 100644 --- a/Src/TestEngine/outputlocal.h +++ b/Src/TestEngine/outputlocal.h @@ -2,11 +2,11 @@ /// @brief Let's test result output and save the local with file. /// @author David Yin 2018-12 willage.yin@163.com /// -/// @license GNU GPL v3 +/// @license GNU LGPL v3 /// -/// Distributed under the GNU GPL v3 License +/// Distributed under the GNU LGPL v3 License /// (See accompanying file LICENSE or copy at -/// http://www.gnu.org/licenses/gpl.html) +/// http://www.gnu.org/licenses/lgpl-3.0.html) /// #ifndef OUTPUTLOCAL_H diff --git a/Src/TestEngine/outputmgr.cpp b/Src/TestEngine/outputmgr.cpp index 5a5f4ac..b8b0142 100644 --- a/Src/TestEngine/outputmgr.cpp +++ b/Src/TestEngine/outputmgr.cpp @@ -2,11 +2,11 @@ /// @brief Output model manager /// @author David Yin 2018-12 willage.yin@163.com /// -/// @license GNU GPL v3 +/// @license GNU LGPL v3 /// -/// Distributed under the GNU GPL v3 License +/// Distributed under the GNU LGPL v3 License /// (See accompanying file LICENSE or copy at -/// http://www.gnu.org/licenses/gpl.html) +/// http://www.gnu.org/licenses/lgpl-3.0.html) /// #include "stdinc.h" diff --git a/Src/TestEngine/outputmgr.h b/Src/TestEngine/outputmgr.h index 9b72fb7..41b351b 100644 --- a/Src/TestEngine/outputmgr.h +++ b/Src/TestEngine/outputmgr.h @@ -2,11 +2,11 @@ /// @brief Output model manager /// @author David Yin 2018-12 willage.yin@163.com /// -/// @license GNU GPL v3 +/// @license GNU LGPL v3 /// -/// Distributed under the GNU GPL v3 License +/// Distributed under the GNU LGPL v3 License /// (See accompanying file LICENSE or copy at -/// http://www.gnu.org/licenses/gpl.html) +/// http://www.gnu.org/licenses/lgpl-3.0.html) /// #ifndef OUTPUTMGR_H diff --git a/Src/TestEngine/outputstd.cpp b/Src/TestEngine/outputstd.cpp index a2fc092..7ee846c 100644 --- a/Src/TestEngine/outputstd.cpp +++ b/Src/TestEngine/outputstd.cpp @@ -2,11 +2,11 @@ /// @brief Standard output /// @author David Yin 2018-12 willage.yin@163.com /// -/// @license GNU GPL v3 +/// @license GNU LGPL v3 /// -/// Distributed under the GNU GPL v3 License +/// Distributed under the GNU LGPL v3 License /// (See accompanying file LICENSE or copy at -/// http://www.gnu.org/licenses/gpl.html) +/// http://www.gnu.org/licenses/lgpl-3.0.html) /// #include "stdinc.h" diff --git a/Src/TestEngine/outputstd.h b/Src/TestEngine/outputstd.h index 711787a..954ec68 100644 --- a/Src/TestEngine/outputstd.h +++ b/Src/TestEngine/outputstd.h @@ -2,11 +2,11 @@ /// @brief Standard output /// @author David Yin 2018-12 willage.yin@163.com /// -/// @license GNU GPL v3 +/// @license GNU LGPL v3 /// -/// Distributed under the GNU GPL v3 License +/// Distributed under the GNU LGPL v3 License /// (See accompanying file LICENSE or copy at -/// http://www.gnu.org/licenses/gpl.html) +/// http://www.gnu.org/licenses/lgpl-3.0.html) /// #ifndef OUTPUTSTD_H diff --git a/Src/TestEngine/resultmgr.cpp b/Src/TestEngine/resultmgr.cpp index 92ad13f..fc93cc6 100644 --- a/Src/TestEngine/resultmgr.cpp +++ b/Src/TestEngine/resultmgr.cpp @@ -2,11 +2,11 @@ /// @brief Test results manager /// @author David Yin 2018-12 willage.yin@163.com /// -/// @license GNU GPL v3 +/// @license GNU LGPL v3 /// -/// Distributed under the GNU GPL v3 License +/// Distributed under the GNU LGPL v3 License /// (See accompanying file LICENSE or copy at -/// http://www.gnu.org/licenses/gpl.html) +/// http://www.gnu.org/licenses/lgpl-3.0.html) /// #include "stdinc.h" diff --git a/Src/TestEngine/resultmgr.h b/Src/TestEngine/resultmgr.h index 75ef6b3..4516756 100644 --- a/Src/TestEngine/resultmgr.h +++ b/Src/TestEngine/resultmgr.h @@ -2,11 +2,11 @@ /// @brief Test results manager /// @author David Yin 2018-12 willage.yin@163.com /// -/// @license GNU GPL v3 +/// @license GNU LGPL v3 /// -/// Distributed under the GNU GPL v3 License +/// Distributed under the GNU LGPL v3 License /// (See accompanying file LICENSE or copy at -/// http://www.gnu.org/licenses/gpl.html) +/// http://www.gnu.org/licenses/lgpl-3.0.html) /// #ifndef RESULTMGR_H diff --git a/Src/TestEngine/stdinc.h b/Src/TestEngine/stdinc.h index 905dddb..ddf1052 100644 --- a/Src/TestEngine/stdinc.h +++ b/Src/TestEngine/stdinc.h @@ -2,11 +2,11 @@ /// @brief some define of global /// @author David Yin 2018-12 willage.yin@163.com /// -/// @license GNU GPL v3 +/// @license GNU LGPL v3 /// -/// Distributed under the GNU GPL v3 License +/// Distributed under the GNU LGPL v3 License /// (See accompanying file LICENSE or copy at -/// http://www.gnu.org/licenses/gpl.html) +/// http://www.gnu.org/licenses/lgpl-3.0.html) /// #ifndef STDINC_H diff --git a/Src/TestEngine/testctrl.cpp b/Src/TestEngine/testctrl.cpp index 3659778..e27f7fd 100644 --- a/Src/TestEngine/testctrl.cpp +++ b/Src/TestEngine/testctrl.cpp @@ -2,11 +2,11 @@ /// @brief Stop the current testing with command line /// @author David Yin 2018-12 willage.yin@163.com /// -/// @license GNU GPL v3 +/// @license GNU LGPL v3 /// -/// Distributed under the GNU GPL v3 License +/// Distributed under the GNU LGPL v3 License /// (See accompanying file LICENSE or copy at -/// http://www.gnu.org/licenses/gpl.html) +/// http://www.gnu.org/licenses/lgpl-3.0.html) /// #include "stdinc.h" diff --git a/Src/TestEngine/testctrl.h b/Src/TestEngine/testctrl.h index b81b1ab..66b1909 100644 --- a/Src/TestEngine/testctrl.h +++ b/Src/TestEngine/testctrl.h @@ -2,11 +2,11 @@ /// @brief Stop the current testing with command line /// @author David Yin 2018-12 willage.yin@163.com /// -/// @license GNU GPL v3 +/// @license GNU LGPL v3 /// -/// Distributed under the GNU GPL v3 License +/// Distributed under the GNU LGPL v3 License /// (See accompanying file LICENSE or copy at -/// http://www.gnu.org/licenses/gpl.html) +/// http://www.gnu.org/licenses/lgpl-3.0.html) /// #ifndef TESTCTRL_H diff --git a/Src/TestEngine/testrststruct.h b/Src/TestEngine/testrststruct.h index d095772..8a2fe5a 100644 --- a/Src/TestEngine/testrststruct.h +++ b/Src/TestEngine/testrststruct.h @@ -2,11 +2,11 @@ /// @brief Test Result struct /// @author David Yin 2018-12 willage.yin@163.com /// -/// @license GNU GPL v3 +/// @license GNU LGPL v3 /// -/// Distributed under the GNU GPL v3 License +/// Distributed under the GNU LGPL v3 License /// (See accompanying file LICENSE or copy at -/// http://www.gnu.org/licenses/gpl.html) +/// http://www.gnu.org/licenses/lgpl-3.0.html) /// #ifndef TESTRSTSTRUCT_H diff --git a/Src/TestEngine/testrunner.cpp b/Src/TestEngine/testrunner.cpp index 75003c3..ca2c11a 100644 --- a/Src/TestEngine/testrunner.cpp +++ b/Src/TestEngine/testrunner.cpp @@ -2,11 +2,11 @@ /// @brief Test runner, parse the mutli-language and configure file /// @author David Yin 2018-12 willage.yin@163.com /// -/// @license GNU GPL v3 +/// @license GNU LGPL v3 /// -/// Distributed under the GNU GPL v3 License +/// Distributed under the GNU LGPL v3 License /// (See accompanying file LICENSE or copy at -/// http://www.gnu.org/licenses/gpl.html) +/// http://www.gnu.org/licenses/lgpl-3.0.html) /// #include "stdinc.h" @@ -100,6 +100,42 @@ bool TestRunner::initScript(const QString& prjPath) return false; } } + else if(UnitMgr::Cpp == lang) { + if(m_pCurretLang) + delete m_pCurretLang; + + QDir dir; + dir.setPath(qApp->applicationDirPath()); + QStringList cppDlls = dir.entryList(QStringList() << "DevLangCpp*.dll", QDir::Files); + if(cppDlls.count() <= 0) { + m_lastErr = TA_TR("Can't found the DevLangCpp*.dll"); + TA_OUT_DEBUG_INFO << m_lastErr; + return false; + } + const QString strDllFile(cppDlls.at(0)); + QLibrary myLib(strDllFile); + if(!myLib.load()) { + m_lastErr = TA_TR("Failed to load the ") + strDllFile; + TA_OUT_DEBUG_INFO << m_lastErr; + return false; + } + + CreateInst myFunction = (CreateInst) myLib.resolve("CreateLanguageInst"); + if (NULL == myFunction) + { + m_lastErr = TA_TR("Failed to resolve the ") + strDllFile; + TA_OUT_DEBUG_INFO << m_lastErr; + return false; + } + + m_pCurretLang = (IMutliLang*)myFunction("cpp"); + if(m_pCurretLang == NULL) + { + m_lastErr = TA_TR("The current language is NULL."); + TA_OUT_DEBUG_INFO << m_lastErr; + return false; + } + } // load script if(!m_pCurretLang->loadScript(m_pUnitMgr->getScript())) { diff --git a/Src/TestEngine/testrunner.h b/Src/TestEngine/testrunner.h index fb9d9d1..017702a 100644 --- a/Src/TestEngine/testrunner.h +++ b/Src/TestEngine/testrunner.h @@ -2,11 +2,11 @@ /// @brief Test runner, parse the mutli-language and configure file /// @author David Yin 2018-12 willage.yin@163.com /// -/// @license GNU GPL v3 +/// @license GNU LGPL v3 /// -/// Distributed under the GNU GPL v3 License +/// Distributed under the GNU LGPL v3 License /// (See accompanying file LICENSE or copy at -/// http://www.gnu.org/licenses/gpl.html) +/// http://www.gnu.org/licenses/lgpl-3.0.html) /// #ifndef TESTRUNNER_H diff --git a/Src/TestEngine/unitmgr.cpp b/Src/TestEngine/unitmgr.cpp index 370b78c..f48c1f4 100644 --- a/Src/TestEngine/unitmgr.cpp +++ b/Src/TestEngine/unitmgr.cpp @@ -2,11 +2,11 @@ /// @brief Load and manage the test items. /// @author David Yin 2018-12 willage.yin@163.com /// -/// @license GNU GPL v3 +/// @license GNU LGPL v3 /// -/// Distributed under the GNU GPL v3 License +/// Distributed under the GNU LGPL v3 License /// (See accompanying file LICENSE or copy at -/// http://www.gnu.org/licenses/gpl.html) +/// http://www.gnu.org/licenses/lgpl-3.0.html) /// #include "stdinc.h" @@ -69,6 +69,7 @@ bool UnitMgr::LoadUnitConfig(const QString& strFileName) // This file name same to the configure file name QString strJs = m_strPrjPath + "/" + cfgFileInfo.completeBaseName() + ".js"; QString strPy = m_strPrjPath + "/" + cfgFileInfo.completeBaseName() + ".py"; + QString strCppDll = m_strPrjPath + "/" + cfgFileInfo.completeBaseName() + ".dll"; QFileInfo scpFileInfo(strJs); if(scpFileInfo.isFile()){ @@ -77,6 +78,13 @@ bool UnitMgr::LoadUnitConfig(const QString& strFileName) return loadScriptCom(getModelList(), m_strPrjPath, "js"); } + scpFileInfo.setFile(strCppDll); + if(scpFileInfo.isFile()) { + m_scriptFiles.append(strCppDll); + m_currLang = UnitMgr::Cpp; + return true; + } + // try again for python scpFileInfo.setFile(strPy); if(!scpFileInfo.isFile()) { @@ -170,26 +178,6 @@ bool UnitMgr::loadScriptCom(const QVariantList& vlModels, const QString& strPath { m_scriptFiles.append(strScriptFile); } - - - /* - QFile scriptFile(strScriptFile); - if (!scriptFile.open(QIODevice::ReadOnly)) - { - m_lastErr = strScriptFile + scriptFile.errorString(); - return false; - } - - QByteArray bData(scriptFile.readAll()); - // process unicode - if(!bData.isEmpty() && bData.at(0) == 0x0E) - { - bData = bData.remove(0, 1); - bData = QByteArray::fromBase64(bData); - } - QString contents(bData); - scriptFile.close(); - script += contents;*/ } return true; diff --git a/Src/TestEngine/unitmgr.h b/Src/TestEngine/unitmgr.h index 4b298fa..83289da 100644 --- a/Src/TestEngine/unitmgr.h +++ b/Src/TestEngine/unitmgr.h @@ -2,11 +2,11 @@ /// @brief Load and manage the test items. /// @author David Yin 2018-12 willage.yin@163.com /// -/// @license GNU GPL v3 +/// @license GNU LGPL v3 /// -/// Distributed under the GNU GPL v3 License +/// Distributed under the GNU LGPL v3 License /// (See accompanying file LICENSE or copy at -/// http://www.gnu.org/licenses/gpl.html) +/// http://www.gnu.org/licenses/lgpl-3.0.html) /// @@ -30,7 +30,8 @@ class UnitMgr typedef enum eTaLang{ JavaScript, - Python + Python, + Cpp }TaLang; bool LoadUnitConfig(const QString& strFileName); diff --git a/Src/TreeATE/aboutdialog.cpp b/Src/TreeATE/aboutdialog.cpp index 5d21370..6f68e91 100644 --- a/Src/TreeATE/aboutdialog.cpp +++ b/Src/TreeATE/aboutdialog.cpp @@ -2,11 +2,11 @@ /// @brief about this system /// @author David Yin 2018-12 willage.yin@163.com /// -/// @license GNU GPL v3 +/// @license GNU LGPL v3 /// -/// Distributed under the GNU GPL v3 License +/// Distributed under the GNU LGPL v3 License /// (See accompanying file LICENSE or copy at -/// http://www.gnu.org/licenses/gpl.html) +/// http://www.gnu.org/licenses/lgpl-3.0.html) /// #include "aboutdialog.h" diff --git a/Src/TreeATE/aboutdialog.h b/Src/TreeATE/aboutdialog.h index 0d63a9a..f2b16e7 100644 --- a/Src/TreeATE/aboutdialog.h +++ b/Src/TreeATE/aboutdialog.h @@ -2,11 +2,11 @@ /// @brief about this system /// @author David Yin 2018-12 willage.yin@163.com /// -/// @license GNU GPL v3 +/// @license GNU LGPL v3 /// -/// Distributed under the GNU GPL v3 License +/// Distributed under the GNU LGPL v3 License /// (See accompanying file LICENSE or copy at -/// http://www.gnu.org/licenses/gpl.html) +/// http://www.gnu.org/licenses/lgpl-3.0.html) /// #ifndef ABOUTDIALOG_H diff --git a/Src/TreeATE/aboutdialog.ui b/Src/TreeATE/aboutdialog.ui index b61d799..2443e5c 100644 --- a/Src/TreeATE/aboutdialog.ui +++ b/Src/TreeATE/aboutdialog.ui @@ -68,14 +68,14 @@ - Version: 1.2.2 + Version: 2.0.0 - Copyright 2019 David Yin + Copyright 2020 David Yin @@ -89,7 +89,7 @@ - <html><head/><body><p>License: <a href="https://www.gnu.org/licenses/gpl.html"><span style=" text-decoration: underline; color:#007af4;">GNU GPL v3</span></a></p></body></html> + <html><head/><body><p>License: <a href="https://www.gnu.org/licenses/lgpl-3.0.html"><span style=" text-decoration: underline; color:#007af4;">GNU LGPL v3</span></a></p></body></html> diff --git a/Src/TreeATE/ate.rc b/Src/TreeATE/ate.rc index 7afcc20..ca4f1b4 100644 --- a/Src/TreeATE/ate.rc +++ b/Src/TreeATE/ate.rc @@ -7,8 +7,8 @@ IDI_ICON1 ICON DISCARDABLE "ATE.ico" #endif VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,2,2,1 - PRODUCTVERSION 1,2,2,1 + FILEVERSION 2,0,0,1 + PRODUCTVERSION 2,0,0,1 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS VS_FF_DEBUG @@ -25,10 +25,10 @@ VS_VERSION_INFO VERSIONINFO BEGIN VALUE "CompanyName", "David Yin\0" VALUE "FileDescription", "TreeATE for manufactory automatic testing\0" - VALUE "FileVersion", "1,2,2,1" - VALUE "ProductVersion", "1,2,2,1" + VALUE "FileVersion", "2,0,0,1" + VALUE "ProductVersion", "2,0,0,1" VALUE "LegalCopyright", "Copyright 2020(C) David Yin\0" - VALUE "LegalTrademarks", "Tree ATE\0" + VALUE "LegalTrademarks", "TreeATE\0" VALUE "OriginalFilename", "TreeATE.exe\0" VALUE "ProductName", "TreeATE\0" VALUE "InternalName", "TreeATE.exe\0" diff --git a/Src/TreeATE/login.cpp b/Src/TreeATE/login.cpp index cbb00ab..7a11d9f 100644 --- a/Src/TreeATE/login.cpp +++ b/Src/TreeATE/login.cpp @@ -2,11 +2,11 @@ /// @brief login the TreeATE dialog /// @author David Yin 2018-12 willage.yin@163.com /// -/// @license GNU GPL v3 +/// @license GNU LGPL v3 /// -/// Distributed under the GNU GPL v3 License +/// Distributed under the GNU LGPL v3 License /// (See accompanying file LICENSE or copy at -/// http://www.gnu.org/licenses/gpl.html) +/// http://www.gnu.org/licenses/lgpl-3.0.html) /// #include "login.h" diff --git a/Src/TreeATE/login.h b/Src/TreeATE/login.h index 9ed1db3..ca9a0b5 100644 --- a/Src/TreeATE/login.h +++ b/Src/TreeATE/login.h @@ -2,11 +2,11 @@ /// @brief login the TreeATE dialog /// @author David Yin 2018-12 willage.yin@163.com /// -/// @license GNU GPL v3 +/// @license GNU LGPL v3 /// -/// Distributed under the GNU GPL v3 License +/// Distributed under the GNU LGPL v3 License /// (See accompanying file LICENSE or copy at -/// http://www.gnu.org/licenses/gpl.html) +/// http://www.gnu.org/licenses/lgpl-3.0.html) /// #ifndef LOGIN_H diff --git a/Src/TreeATE/main.cpp b/Src/TreeATE/main.cpp index 59f79a6..022492e 100644 --- a/Src/TreeATE/main.cpp +++ b/Src/TreeATE/main.cpp @@ -2,11 +2,11 @@ /// @brief TreeATE main function /// @author David Yin 2018-12 willage.yin@163.com /// -/// @license GNU GPL v3 +/// @license GNU LGPL v3 /// -/// Distributed under the GNU GPL v3 License +/// Distributed under the GNU LGPL v3 License /// (See accompanying file LICENSE or copy at -/// http://www.gnu.org/licenses/gpl.html) +/// http://www.gnu.org/licenses/lgpl-3.0.html) /// #include "mainwindow.h" diff --git a/Src/TreeATE/mainwindow.cpp b/Src/TreeATE/mainwindow.cpp index 436df77..483c1a8 100644 --- a/Src/TreeATE/mainwindow.cpp +++ b/Src/TreeATE/mainwindow.cpp @@ -2,11 +2,11 @@ /// @brief TreeATE's main window /// @author David Yin 2018-12 willage.yin@163.com /// -/// @license GNU GPL v3 +/// @license GNU LGPL v3 /// -/// Distributed under the GNU GPL v3 License +/// Distributed under the GNU LGPL v3 License /// (See accompanying file LICENSE or copy at -/// http://www.gnu.org/licenses/gpl.html) +/// http://www.gnu.org/licenses/lgpl-3.0.html) /// #include "mainwindow.h" diff --git a/Src/TreeATE/mainwindow.h b/Src/TreeATE/mainwindow.h index 1d431da..b040e46 100644 --- a/Src/TreeATE/mainwindow.h +++ b/Src/TreeATE/mainwindow.h @@ -2,11 +2,11 @@ /// @brief TreeATE's main window /// @author David Yin 2018-12 willage.yin@163.com /// -/// @license GNU GPL v3 +/// @license GNU LGPL v3 /// -/// Distributed under the GNU GPL v3 License +/// Distributed under the GNU LGPL v3 License /// (See accompanying file LICENSE or copy at -/// http://www.gnu.org/licenses/gpl.html) +/// http://www.gnu.org/licenses/lgpl-3.0.html) /// #ifndef MAINWINDOW_H diff --git a/Src/TreeATE/manybarcodedlg.cpp b/Src/TreeATE/manybarcodedlg.cpp index b6703f0..bc36976 100644 --- a/Src/TreeATE/manybarcodedlg.cpp +++ b/Src/TreeATE/manybarcodedlg.cpp @@ -2,11 +2,11 @@ /// @brief Scan the barcode for every one of the test project /// @author David Yin 2018-12 willage.yin@163.com /// -/// @license GNU GPL v3 +/// @license GNU LGPL v3 /// -/// Distributed under the GNU GPL v3 License +/// Distributed under the GNU LGPL v3 License /// (See accompanying file LICENSE or copy at -/// http://www.gnu.org/licenses/gpl.html) +/// http://www.gnu.org/licenses/lgpl-3.0.html) /// #include "manybarcodedlg.h" diff --git a/Src/TreeATE/manybarcodedlg.h b/Src/TreeATE/manybarcodedlg.h index 3b1cc26..ef2fbdd 100644 --- a/Src/TreeATE/manybarcodedlg.h +++ b/Src/TreeATE/manybarcodedlg.h @@ -2,11 +2,11 @@ /// @brief Scan the barcode for every one of the test project /// @author David Yin 2018-12 willage.yin@163.com /// -/// @license GNU GPL v3 +/// @license GNU LGPL v3 /// -/// Distributed under the GNU GPL v3 License +/// Distributed under the GNU LGPL v3 License /// (See accompanying file LICENSE or copy at -/// http://www.gnu.org/licenses/gpl.html) +/// http://www.gnu.org/licenses/lgpl-3.0.html) /// #ifndef MANYBARCODEDLG_H diff --git a/Src/TreeATE/pluginsmgr.cpp b/Src/TreeATE/pluginsmgr.cpp index e238b53..2dbb153 100644 --- a/Src/TreeATE/pluginsmgr.cpp +++ b/Src/TreeATE/pluginsmgr.cpp @@ -2,11 +2,11 @@ /// @brief Plugins Manger /// @author David Yin 2018-12 willage.yin@163.com /// -/// @license GNU GPL v3 +/// @license GNU LGPL v3 /// -/// Distributed under the GNU GPL v3 License +/// Distributed under the GNU LGPL v3 License /// (See accompanying file LICENSE or copy at -/// http://www.gnu.org/licenses/gpl.html) +/// http://www.gnu.org/licenses/lgpl-3.0.html) /// #include "pluginsmgr.h" diff --git a/Src/TreeATE/pluginsmgr.h b/Src/TreeATE/pluginsmgr.h index cdc15bb..050e56a 100644 --- a/Src/TreeATE/pluginsmgr.h +++ b/Src/TreeATE/pluginsmgr.h @@ -2,11 +2,11 @@ /// @brief Plugins Manager /// @author David Yin 2018-12 willage.yin@163.com /// -/// @license GNU GPL v3 +/// @license GNU LGPL v3 /// -/// Distributed under the GNU GPL v3 License +/// Distributed under the GNU LGPL v3 License /// (See accompanying file LICENSE or copy at -/// http://www.gnu.org/licenses/gpl.html) +/// http://www.gnu.org/licenses/lgpl-3.0.html) /// diff --git a/Src/TreeATE/prjoptdlg.cpp b/Src/TreeATE/prjoptdlg.cpp index dfba656..3126a12 100644 --- a/Src/TreeATE/prjoptdlg.cpp +++ b/Src/TreeATE/prjoptdlg.cpp @@ -2,11 +2,11 @@ /// @brief Test Project option dialog /// @author David Yin 2018-12 willage.yin@163.com /// -/// @license GNU GPL v3 +/// @license GNU LGPL v3 /// -/// Distributed under the GNU GPL v3 License +/// Distributed under the GNU LGPL v3 License /// (See accompanying file LICENSE or copy at -/// http://www.gnu.org/licenses/gpl.html) +/// http://www.gnu.org/licenses/lgpl-3.0.html) /// #include "prjoptdlg.h" diff --git a/Src/TreeATE/prjoptdlg.h b/Src/TreeATE/prjoptdlg.h index 3afaad9..681f01d 100644 --- a/Src/TreeATE/prjoptdlg.h +++ b/Src/TreeATE/prjoptdlg.h @@ -2,11 +2,11 @@ /// @brief Test Project option dialog /// @author David Yin 2018-12 willage.yin@163.com /// -/// @license GNU GPL v3 +/// @license GNU LGPL v3 /// -/// Distributed under the GNU GPL v3 License +/// Distributed under the GNU LGPL v3 License /// (See accompanying file LICENSE or copy at -/// http://www.gnu.org/licenses/gpl.html) +/// http://www.gnu.org/licenses/lgpl-3.0.html) /// #ifndef PRJOPTDLG_H diff --git a/Src/TreeATE/projectmgr.cpp b/Src/TreeATE/projectmgr.cpp index fe607bb..1d41495 100644 --- a/Src/TreeATE/projectmgr.cpp +++ b/Src/TreeATE/projectmgr.cpp @@ -3,11 +3,11 @@ /// and barcode regex. /// @author David Yin 2018-12 willage.yin@163.com /// -/// @license GNU GPL v3 +/// @license GNU LGPL v3 /// -/// Distributed under the GNU GPL v3 License +/// Distributed under the GNU LGPL v3 License /// (See accompanying file LICENSE or copy at -/// http://www.gnu.org/licenses/gpl.html) +/// http://www.gnu.org/licenses/lgpl-3.0.html) /// #include "projectmgr.h" diff --git a/Src/TreeATE/projectmgr.h b/Src/TreeATE/projectmgr.h index dd20901..dd483ad 100644 --- a/Src/TreeATE/projectmgr.h +++ b/Src/TreeATE/projectmgr.h @@ -3,11 +3,11 @@ /// and barcode regex. /// @author David Yin 2018-12 willage.yin@163.com /// -/// @license GNU GPL v3 +/// @license GNU LGPL v3 /// -/// Distributed under the GNU GPL v3 License +/// Distributed under the GNU LGPL v3 License /// (See accompanying file LICENSE or copy at -/// http://www.gnu.org/licenses/gpl.html) +/// http://www.gnu.org/licenses/lgpl-3.0.html) /// #ifndef PROJECTMGR_H diff --git a/Src/TreeATE/statusdelegate.cpp b/Src/TreeATE/statusdelegate.cpp index d07876d..bdffd94 100644 --- a/Src/TreeATE/statusdelegate.cpp +++ b/Src/TreeATE/statusdelegate.cpp @@ -2,11 +2,11 @@ /// @brief The test status delegate on the main window /// @author David Yin 2018-12 willage.yin@163.com /// -/// @license GNU GPL v3 +/// @license GNU LGPL v3 /// -/// Distributed under the GNU GPL v3 License +/// Distributed under the GNU LGPL v3 License /// (See accompanying file LICENSE or copy at -/// http://www.gnu.org/licenses/gpl.html) +/// http://www.gnu.org/licenses/lgpl-3.0.html) /// #include "statusdelegate.h" diff --git a/Src/TreeATE/statusdelegate.h b/Src/TreeATE/statusdelegate.h index cafdae4..74d3258 100644 --- a/Src/TreeATE/statusdelegate.h +++ b/Src/TreeATE/statusdelegate.h @@ -2,11 +2,11 @@ /// @brief The test status delegate on the main window /// @author David Yin 2018-12 willage.yin@163.com /// -/// @license GNU GPL v3 +/// @license GNU LGPL v3 /// -/// Distributed under the GNU GPL v3 License +/// Distributed under the GNU LGPL v3 License /// (See accompanying file LICENSE or copy at -/// http://www.gnu.org/licenses/gpl.html) +/// http://www.gnu.org/licenses/lgpl-3.0.html) /// #ifndef STATUSDELEGATE_H diff --git a/Src/TreeATE/syscfgdlg.cpp b/Src/TreeATE/syscfgdlg.cpp index f5879ec..19bd0e3 100644 --- a/Src/TreeATE/syscfgdlg.cpp +++ b/Src/TreeATE/syscfgdlg.cpp @@ -2,11 +2,11 @@ /// @brief TreeATE system option /// @author David Yin 2018-12 willage.yin@163.com /// -/// @license GNU GPL v3 +/// @license GNU LGPL v3 /// -/// Distributed under the GNU GPL v3 License +/// Distributed under the GNU LGPL v3 License /// (See accompanying file LICENSE or copy at -/// http://www.gnu.org/licenses/gpl.html) +/// http://www.gnu.org/licenses/lgpl-3.0.html) /// #include "syscfgdlg.h" diff --git a/Src/TreeATE/syscfgdlg.h b/Src/TreeATE/syscfgdlg.h index df489c4..5439a24 100644 --- a/Src/TreeATE/syscfgdlg.h +++ b/Src/TreeATE/syscfgdlg.h @@ -2,11 +2,11 @@ /// @brief TreeATE system option /// @author David Yin 2018-12 willage.yin@163.com /// -/// @license GNU GPL v3 +/// @license GNU LGPL v3 /// -/// Distributed under the GNU GPL v3 License +/// Distributed under the GNU LGPL v3 License /// (See accompanying file LICENSE or copy at -/// http://www.gnu.org/licenses/gpl.html) +/// http://www.gnu.org/licenses/lgpl-3.0.html) /// #ifndef SYSCFGDLG_H diff --git a/Src/TreeATE/tadefine.h b/Src/TreeATE/tadefine.h index dcebdef..74f7251 100644 --- a/Src/TreeATE/tadefine.h +++ b/Src/TreeATE/tadefine.h @@ -2,11 +2,11 @@ /// @brief global define /// @author David Yin 2018-12 willage.yin@163.com /// -/// @license GNU GPL v3 +/// @license GNU LGPL v3 /// -/// Distributed under the GNU GPL v3 License +/// Distributed under the GNU LGPL v3 License /// (See accompanying file LICENSE or copy at -/// http://www.gnu.org/licenses/gpl.html) +/// http://www.gnu.org/licenses/lgpl-3.0.html) /// #ifndef TADEFINE_H diff --git a/Src/TreeATE/talineedit.cpp b/Src/TreeATE/talineedit.cpp index 626e01f..c562b78 100644 --- a/Src/TreeATE/talineedit.cpp +++ b/Src/TreeATE/talineedit.cpp @@ -2,11 +2,11 @@ /// @brief auto focus LineEdit /// @author David Yin 2018-12 willage.yin@163.com /// -/// @license GNU GPL v3 +/// @license GNU LGPL v3 /// -/// Distributed under the GNU GPL v3 License +/// Distributed under the GNU LGPL v3 License /// (See accompanying file LICENSE or copy at -/// http://www.gnu.org/licenses/gpl.html) +/// http://www.gnu.org/licenses/lgpl-3.0.html) /// #include "talineedit.h" diff --git a/Src/TreeATE/talineedit.h b/Src/TreeATE/talineedit.h index 55b9925..c530eb0 100644 --- a/Src/TreeATE/talineedit.h +++ b/Src/TreeATE/talineedit.h @@ -2,11 +2,11 @@ /// @brief auto focus LineEdit /// @author David Yin 2018-12 willage.yin@163.com /// -/// @license GNU GPL v3 +/// @license GNU LGPL v3 /// -/// Distributed under the GNU GPL v3 License +/// Distributed under the GNU LGPL v3 License /// (See accompanying file LICENSE or copy at -/// http://www.gnu.org/licenses/gpl.html) +/// http://www.gnu.org/licenses/lgpl-3.0.html) /// #ifndef TALINEEDIT_H #define TALINEEDIT_H diff --git a/Src/TreeATE/talogin.h b/Src/TreeATE/talogin.h index a1e6093..831b8a2 100644 --- a/Src/TreeATE/talogin.h +++ b/Src/TreeATE/talogin.h @@ -2,11 +2,11 @@ /// @brief Login Dialog Interface /// @author David Yin 2018-12 willage.yin@163.com /// -/// @license GNU GPL v3 +/// @license GNU LGPL v3 /// -/// Distributed under the GNU GPL v3 License +/// Distributed under the GNU LGPL v3 License /// (See accompanying file LICENSE or copy at -/// http://www.gnu.org/licenses/gpl.html) +/// http://www.gnu.org/licenses/lgpl-3.0.html) /// #ifndef TALOGIN_H diff --git a/Src/TreeATE/tasizedockwidget.cpp b/Src/TreeATE/tasizedockwidget.cpp index 95b3301..5457cec 100644 --- a/Src/TreeATE/tasizedockwidget.cpp +++ b/Src/TreeATE/tasizedockwidget.cpp @@ -3,11 +3,11 @@ /// @brief For default size of the DockWidget /// @author David Yin 2018-12 willage.yin@163.com /// -/// @license GNU GPL v3 +/// @license GNU LGPL v3 /// -/// Distributed under the GNU GPL v3 License +/// Distributed under the GNU LGPL v3 License /// (See accompanying file LICENSE or copy at -/// http://www.gnu.org/licenses/gpl.html) +/// http://www.gnu.org/licenses/lgpl-3.0.html) /// #include "tasizedockwidget.h" diff --git a/Src/TreeATE/tasizedockwidget.h b/Src/TreeATE/tasizedockwidget.h index a9bbb4d..040fbbc 100644 --- a/Src/TreeATE/tasizedockwidget.h +++ b/Src/TreeATE/tasizedockwidget.h @@ -3,11 +3,11 @@ /// @brief For default size of the DockWidget /// @author David Yin 2018-12 willage.yin@163.com /// -/// @license GNU GPL v3 +/// @license GNU LGPL v3 /// -/// Distributed under the GNU GPL v3 License +/// Distributed under the GNU LGPL v3 License /// (See accompanying file LICENSE or copy at -/// http://www.gnu.org/licenses/gpl.html) +/// http://www.gnu.org/licenses/lgpl-3.0.html) /// #ifndef TASIZEDOCKWIDGET_H diff --git a/Src/TreeATE/testmanger.cpp b/Src/TreeATE/testmanger.cpp index e1317c1..8443e86 100644 --- a/Src/TreeATE/testmanger.cpp +++ b/Src/TreeATE/testmanger.cpp @@ -2,11 +2,11 @@ /// @brief Test perform manager. load test items, /// start the testing or stop the testing. /// @author David Yin 2018-12 willage.yin@163.com-12 willage.yin@163.com -/// @license GNU GPL v3 +/// @license GNU LGPL v3 /// -/// Distributed under the GNU GPL v3 License +/// Distributed under the GNU LGPL v3 License /// (See accompanying file LICENSE or copy at -/// http://www.gnu.org/licenses/gpl.html) +/// http://www.gnu.org/licenses/lgpl-3.0.html) /// #include "testmanger.h" diff --git a/Src/TreeATE/testmanger.h b/Src/TreeATE/testmanger.h index 79bfbf8..c4cdc6c 100644 --- a/Src/TreeATE/testmanger.h +++ b/Src/TreeATE/testmanger.h @@ -3,11 +3,11 @@ /// start the testing or stop the testing. /// @author David Yin 2018-12 willage.yin@163.com /// -/// @license GNU GPL v3 +/// @license GNU LGPL v3 /// -/// Distributed under the GNU GPL v3 License +/// Distributed under the GNU LGPL v3 License /// (See accompanying file LICENSE or copy at -/// http://www.gnu.org/licenses/gpl.html) +/// http://www.gnu.org/licenses/lgpl-3.0.html) /// #ifndef TESTMANGER_H diff --git a/Src/TreeATE/testproccess.cpp b/Src/TreeATE/testproccess.cpp index 9cd0b0d..98ce7fe 100644 --- a/Src/TreeATE/testproccess.cpp +++ b/Src/TreeATE/testproccess.cpp @@ -2,11 +2,11 @@ /// @brief Process the standard output from TestEngine /// @author David Yin 2018-12 willage.yin@163.com /// -/// @license GNU GPL v3 +/// @license GNU LGPL v3 /// -/// Distributed under the GNU GPL v3 License +/// Distributed under the GNU LGPL v3 License /// (See accompanying file LICENSE or copy at -/// http://www.gnu.org/licenses/gpl.html) +/// http://www.gnu.org/licenses/lgpl-3.0.html) /// #include "testproccess.h" diff --git a/Src/TreeATE/testproccess.h b/Src/TreeATE/testproccess.h index 5d6392f..2fc3464 100644 --- a/Src/TreeATE/testproccess.h +++ b/Src/TreeATE/testproccess.h @@ -2,11 +2,11 @@ /// @brief Process the standard output from TestEngine /// @author David Yin 2018-12 willage.yin@163.com /// -/// @license GNU GPL v3 +/// @license GNU LGPL v3 /// -/// Distributed under the GNU GPL v3 License +/// Distributed under the GNU LGPL v3 License /// (See accompanying file LICENSE or copy at -/// http://www.gnu.org/licenses/gpl.html) +/// http://www.gnu.org/licenses/lgpl-3.0.html) /// #ifndef TESTPROCCESS_H diff --git a/Src/TreeATEDev/LICENSE b/Src/TreeATEDev/LICENSE new file mode 100644 index 0000000..94a9ed0 --- /dev/null +++ b/Src/TreeATEDev/LICENSE @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. diff --git a/Src/TreeATEDev/aboutdlg.cpp b/Src/TreeATEDev/aboutdlg.cpp index 0be98e1..1297f72 100644 --- a/Src/TreeATEDev/aboutdlg.cpp +++ b/Src/TreeATEDev/aboutdlg.cpp @@ -1,5 +1,5 @@ /// -/// @project TreeATE +/// @project TreeATE Dev /// @brief about this /// @author David Yin 2018-12 willage.yin@163.com /// diff --git a/Src/TreeATEDev/aboutdlg.h b/Src/TreeATEDev/aboutdlg.h index 0780ccb..472181d 100644 --- a/Src/TreeATEDev/aboutdlg.h +++ b/Src/TreeATEDev/aboutdlg.h @@ -1,5 +1,5 @@ /// -/// @project TreeATE +/// @project TreeATE Dev /// @brief about this /// @author David Yin 2018-12 willage.yin@163.com /// diff --git a/Src/TreeATEDev/ate_dev.rc b/Src/TreeATEDev/ate_dev.rc index 8a8c7fc..3b0f884 100644 --- a/Src/TreeATEDev/ate_dev.rc +++ b/Src/TreeATEDev/ate_dev.rc @@ -7,8 +7,8 @@ IDI_ICON1 ICON DISCARDABLE "ATE_dev.ico" #endif VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,2,2,1 - PRODUCTVERSION 1,2,2,1 + FILEVERSION 1,2,2,2 + PRODUCTVERSION 1,2,2,2 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS VS_FF_DEBUG @@ -25,12 +25,12 @@ VS_VERSION_INFO VERSIONINFO BEGIN VALUE "CompanyName", "David Yin\0" VALUE "FileDescription", "TreeATE Developer Tools for TreeATE\0" - VALUE "FileVersion", "1,2,2,1" - VALUE "ProductVersion", "1,2,2,1" + VALUE "FileVersion", "1,2,2,2" + VALUE "ProductVersion", "1,2,2,2" VALUE "LegalCopyright", "Copyright 2020(C) David Yin\0" - VALUE "LegalTrademarks", "Tree ATE\0" + VALUE "LegalTrademarks", "TreeATE Dev\0" VALUE "OriginalFilename", "TreeATEDev.exe\0" - VALUE "ProductName", "TreeATE\0" + VALUE "ProductName", "TreeATE Dev\0" VALUE "InternalName", "TreeATEDev.exe\0" END END diff --git a/Src/TreeATEDev/dlgfind.cpp b/Src/TreeATEDev/dlgfind.cpp index 86d1580..ca56232 100644 --- a/Src/TreeATEDev/dlgfind.cpp +++ b/Src/TreeATEDev/dlgfind.cpp @@ -1,3 +1,15 @@ +/// +/// @project TreeATE Dev +/// @brief Find Dialog +/// @author David Yin 2019-4 willage.yin@163.com +/// +/// @license GNU GPL v3 +/// +/// Distributed under the GNU GPL v3 License +/// (See accompanying file LICENSE or copy at +/// http://www.gnu.org/licenses/gpl.html) +/// + #include "dlgfind.h" #include "ui_dlgfind.h" diff --git a/Src/TreeATEDev/dlgfind.h b/Src/TreeATEDev/dlgfind.h index a305798..069fa66 100644 --- a/Src/TreeATEDev/dlgfind.h +++ b/Src/TreeATEDev/dlgfind.h @@ -1,3 +1,15 @@ +/// +/// @project TreeATE Dev +/// @brief Find Dialog +/// @author David Yin 2019-4 willage.yin@163.com +/// +/// @license GNU GPL v3 +/// +/// Distributed under the GNU GPL v3 License +/// (See accompanying file LICENSE or copy at +/// http://www.gnu.org/licenses/gpl.html) +/// + #ifndef DLGFIND_H #define DLGFIND_H diff --git a/Src/TreeATEDev/main.cpp b/Src/TreeATEDev/main.cpp index 32655df..801de43 100644 --- a/Src/TreeATEDev/main.cpp +++ b/Src/TreeATEDev/main.cpp @@ -1,5 +1,5 @@ /// -/// @project TreeATE +/// @project TreeATE Dev /// @brief TreeATEDev's main function /// @author David Yin 2018-12 willage.yin@163.com /// diff --git a/Src/TreeATEDev/mainwindow.cpp b/Src/TreeATEDev/mainwindow.cpp index c1b536c..18a1f5e 100644 --- a/Src/TreeATEDev/mainwindow.cpp +++ b/Src/TreeATEDev/mainwindow.cpp @@ -1,5 +1,5 @@ /// -/// @project TreeATE +/// @project TreeATE Dev /// @brief MainWindow of the TreeATEDev /// @author David Yin 2018-12 willage.yin@163.com /// diff --git a/Src/TreeATEDev/mainwindow.h b/Src/TreeATEDev/mainwindow.h index 3eb88c6..ab12585 100644 --- a/Src/TreeATEDev/mainwindow.h +++ b/Src/TreeATEDev/mainwindow.h @@ -1,5 +1,5 @@ /// -/// @project TreeATE +/// @project TreeATE Dev /// @brief MainWindow of the TreeATEDev /// @author David Yin 2018-12 willage.yin@163.com /// diff --git a/Src/TreeATEDev/newprjdlg.h b/Src/TreeATEDev/newprjdlg.h index 8c27bc1..a658e0e 100644 --- a/Src/TreeATEDev/newprjdlg.h +++ b/Src/TreeATEDev/newprjdlg.h @@ -1,5 +1,5 @@ /// -/// @project TreeATE +/// @project TreeATE Dev /// @brief New project dialog /// @author David Yin 2018-12 willage.yin@163.com /// diff --git a/Src/TreeATEDev/tacsvparser.cpp b/Src/TreeATEDev/tacsvparser.cpp index a94ad1c..6603cef 100644 --- a/Src/TreeATEDev/tacsvparser.cpp +++ b/Src/TreeATEDev/tacsvparser.cpp @@ -1,5 +1,5 @@ /// -/// @project TreeATE +/// @project TreeATE Dev /// @brief This is CSV file parser /// @author David Yin 2019-01 willage.yin@163.com /// diff --git a/Src/TreeATEDev/tacsvparser.h b/Src/TreeATEDev/tacsvparser.h index ac7e0f5..0491efd 100644 --- a/Src/TreeATEDev/tacsvparser.h +++ b/Src/TreeATEDev/tacsvparser.h @@ -1,5 +1,5 @@ /// -/// @project TreeATE +/// @project TreeATE Dev /// @brief This is CSV file parser /// @author David Yin 2019-01 willage.yin@163.com /// diff --git a/Src/TreeATEDev/taprjcfgwidget.cpp b/Src/TreeATEDev/taprjcfgwidget.cpp index b4e6dfc..a28ac83 100644 --- a/Src/TreeATEDev/taprjcfgwidget.cpp +++ b/Src/TreeATEDev/taprjcfgwidget.cpp @@ -1,5 +1,5 @@ /// -/// @project TreeATE +/// @project TreeATE Dev /// @brief Test Project Configure (TPX) file Widget /// @author David Yin 2018-12 willage.yin@163.com /// diff --git a/Src/TreeATEDev/taprjcfgwidget.h b/Src/TreeATEDev/taprjcfgwidget.h index be19fdc..4429002 100644 --- a/Src/TreeATEDev/taprjcfgwidget.h +++ b/Src/TreeATEDev/taprjcfgwidget.h @@ -1,5 +1,5 @@ /// -/// @project TreeATE +/// @project TreeATE Dev /// @brief Test Project Configure (TPX) file Widget /// @author David Yin 2018-12 willage.yin@163.com /// diff --git a/Src/TreeATEDev/tapropertymgr.cpp b/Src/TreeATEDev/tapropertymgr.cpp index 3843c3b..0a58cba 100644 --- a/Src/TreeATEDev/tapropertymgr.cpp +++ b/Src/TreeATEDev/tapropertymgr.cpp @@ -1,5 +1,5 @@ /// -/// @project TreeATE +/// @project TreeATE Dev /// @brief Property manager for different model /// @author David Yin 2018-12 willage.yin@163.com /// diff --git a/Src/TreeATEDev/tapropertymgr.h b/Src/TreeATEDev/tapropertymgr.h index 33a0f1b..861b49e 100644 --- a/Src/TreeATEDev/tapropertymgr.h +++ b/Src/TreeATEDev/tapropertymgr.h @@ -1,5 +1,5 @@ /// -/// @project TreeATE +/// @project TreeATE Dev /// @brief Property manager for different model /// @author David Yin 2018-12 willage.yin@163.com /// diff --git a/Src/TreeATEDev/tascriptedit.cpp b/Src/TreeATEDev/tascriptedit.cpp index eb40c29..94d276e 100644 --- a/Src/TreeATEDev/tascriptedit.cpp +++ b/Src/TreeATEDev/tascriptedit.cpp @@ -1,5 +1,5 @@ /// -/// @project TreeATE +/// @project TreeATE Dev /// @brief script eidt widget /// @author David Yin 2018-12 willage.yin@163.com /// diff --git a/Src/TreeATEDev/tascriptedit.h b/Src/TreeATEDev/tascriptedit.h index 2bf81c0..d6e896a 100644 --- a/Src/TreeATEDev/tascriptedit.h +++ b/Src/TreeATEDev/tascriptedit.h @@ -1,5 +1,5 @@ /// -/// @project TreeATE +/// @project TreeATE Dev /// @brief script edit widget /// @author David Yin 2018-12 willage.yin@163.com /// diff --git a/Src/TreeATEDev/testunititem.cpp b/Src/TreeATEDev/testunititem.cpp index f8d6377..7e29d5d 100644 --- a/Src/TreeATEDev/testunititem.cpp +++ b/Src/TreeATEDev/testunititem.cpp @@ -48,7 +48,7 @@ ** ****************************************************************************/ /// -/// @project TreeATE +/// @project TreeATE Dev /// @brief TestUnitItem class for TestUnitModel /// @author David Yin 2018-12 willage.yin@163.com /// diff --git a/Src/TreeATEDev/testunititem.h b/Src/TreeATEDev/testunititem.h index e1cab42..de089d2 100644 --- a/Src/TreeATEDev/testunititem.h +++ b/Src/TreeATEDev/testunititem.h @@ -48,7 +48,7 @@ ** ****************************************************************************/ /// -/// @project TreeATE +/// @project TreeATE Dev /// @brief TestUnitItem class for TestUnitModel /// @author David Yin 2018-12 willage.yin@163.com /// diff --git a/Src/TreeATEDev/testunitsmodel.cpp b/Src/TreeATEDev/testunitsmodel.cpp index e9f5a6c..fdbecc4 100644 --- a/Src/TreeATEDev/testunitsmodel.cpp +++ b/Src/TreeATEDev/testunitsmodel.cpp @@ -48,7 +48,7 @@ ** ****************************************************************************/ /// -/// @project TreeATE +/// @project TreeATE Dev /// @brief Test Unit's model for QTreeView /// @author David Yin 2018-12 willage.yin@163.com /// diff --git a/Src/TreeATEDev/testunitsmodel.h b/Src/TreeATEDev/testunitsmodel.h index e0b6291..a0d7261 100644 --- a/Src/TreeATEDev/testunitsmodel.h +++ b/Src/TreeATEDev/testunitsmodel.h @@ -48,7 +48,7 @@ ** ****************************************************************************/ /// -/// @project TreeATE +/// @project TreeATE Dev /// @brief Test Unit's model for QTreeView /// @author David Yin 2018-12 willage.yin@163.com /// diff --git a/Src/TreeResults/ate_rst.rc b/Src/TreeResults/ate_rst.rc index 800dcea..64e85cc 100644 --- a/Src/TreeResults/ate_rst.rc +++ b/Src/TreeResults/ate_rst.rc @@ -7,8 +7,8 @@ IDI_ICON1 ICON DISCARDABLE "ATE_rst.ico" #endif VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,0,0,1 - PRODUCTVERSION 1,0,0,1 + FILEVERSION 2,0,0,1 + PRODUCTVERSION 2,0,0,1 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS VS_FF_DEBUG @@ -25,10 +25,10 @@ VS_VERSION_INFO VERSIONINFO BEGIN VALUE "CompanyName", "David Yin\0" VALUE "FileDescription", "Test Results View for TreeATE\0" - VALUE "FileVersion", "1,0,0,1" - VALUE "ProductVersion", "1,0,0,1" - VALUE "LegalCopyright", "Copyright 2019(C) David Yin\0" - VALUE "LegalTrademarks", "Tree ATE\0" + VALUE "FileVersion", "2,0,0,1" + VALUE "ProductVersion", "2,0,0,1" + VALUE "LegalCopyright", "Copyright 2020(C) David Yin\0" + VALUE "LegalTrademarks", "TreeATE\0" VALUE "OriginalFilename", "TreeResults.exe\0" VALUE "ProductName", "TreeATE\0" VALUE "InternalName", "TreeResults.exe\0" diff --git a/Src/TreeResults/main.cpp b/Src/TreeResults/main.cpp index 556cc54..1a2ecb4 100644 --- a/Src/TreeResults/main.cpp +++ b/Src/TreeResults/main.cpp @@ -3,11 +3,11 @@ /// @brief main function of the test results manager /// @author David Yin 2018-12 willage.yin@163.com /// -/// @license GNU GPL v3 +/// @license GNU LGPL v3 /// -/// Distributed under the GNU GPL v3 License +/// Distributed under the GNU LGPL v3 License /// (See accompanying file LICENSE or copy at -/// http://www.gnu.org/licenses/gpl.html) +/// http://www.gnu.org/licenses/lgpl-3.0.html) /// #include "mainwindow.h" diff --git a/Src/TreeResults/mainwindow.cpp b/Src/TreeResults/mainwindow.cpp index c8767f2..7ead471 100644 --- a/Src/TreeResults/mainwindow.cpp +++ b/Src/TreeResults/mainwindow.cpp @@ -3,11 +3,11 @@ /// @brief MainWindow of the test results /// @author David Yin 2018-12 willage.yin@163.com /// -/// @license GNU GPL v3 +/// @license GNU LGPL v3 /// -/// Distributed under the GNU GPL v3 License +/// Distributed under the GNU LGPL v3 License /// (See accompanying file LICENSE or copy at -/// http://www.gnu.org/licenses/gpl.html) +/// http://www.gnu.org/licenses/lgpl-3.0.html) /// #include "mainwindow.h" diff --git a/Src/TreeResults/mainwindow.h b/Src/TreeResults/mainwindow.h index 3ad03df..1d4588f 100644 --- a/Src/TreeResults/mainwindow.h +++ b/Src/TreeResults/mainwindow.h @@ -3,11 +3,11 @@ /// @brief MainWindow of the test results manager /// @author David Yin 2018-12 willage.yin@163.com /// -/// @license GNU GPL v3 +/// @license GNU LGPL v3 /// -/// Distributed under the GNU GPL v3 License +/// Distributed under the GNU LGPL v3 License /// (See accompanying file LICENSE or copy at -/// http://www.gnu.org/licenses/gpl.html) +/// http://www.gnu.org/licenses/lgpl-3.0.html) /// #ifndef MAINWINDOW_H diff --git a/Src/TreeResults/tasqlquerymodel.cpp b/Src/TreeResults/tasqlquerymodel.cpp index 75e7a10..f0a8f11 100644 --- a/Src/TreeResults/tasqlquerymodel.cpp +++ b/Src/TreeResults/tasqlquerymodel.cpp @@ -3,11 +3,11 @@ /// @brief TASqlQueryModel /// @author David Yin 2018-12 willage.yin@163.com /// -/// @license GNU GPL v3 +/// @license GNU LGPL v3 /// -/// Distributed under the GNU GPL v3 License +/// Distributed under the GNU LGPL v3 License /// (See accompanying file LICENSE or copy at -/// http://www.gnu.org/licenses/gpl.html) +/// http://www.gnu.org/licenses/lgpl-3.0.html) /// #include "tasqlquerymodel.h" diff --git a/Src/TreeResults/tasqlquerymodel.h b/Src/TreeResults/tasqlquerymodel.h index 8cf90d7..7bc34b4 100644 --- a/Src/TreeResults/tasqlquerymodel.h +++ b/Src/TreeResults/tasqlquerymodel.h @@ -3,11 +3,11 @@ /// @brief TASqlQueryModel class /// @author David Yin 2018-12 willage.yin@163.com /// -/// @license GNU GPL v3 +/// @license GNU LGPL v3 /// -/// Distributed under the GNU GPL v3 License +/// Distributed under the GNU LGPL v3 License /// (See accompanying file LICENSE or copy at -/// http://www.gnu.org/licenses/gpl.html) +/// http://www.gnu.org/licenses/lgpl-3.0.html) /// #ifndef TASQLQUERYMODEL_H