From 15295165a3eec562a8daf7050f7f8bbec433d686 Mon Sep 17 00:00:00 2001 From: Edouard DUPIN Date: Thu, 5 Jan 2017 21:28:23 +0100 Subject: [PATCH] Change licence APACHE-2 to MPL-2 ==> force source redistribution and permit static link --- LICENSE | 373 ++++++++++++++++++++++++++++++++++++++++ README.md | 6 +- doc/mainpage.md | 8 +- etk/Color.cpp | 2 +- etk/Color.hpp | 2 +- etk/Hash.hpp | 2 +- etk/Noise.cpp | 2 +- etk/Noise.hpp | 2 +- etk/archive/Archive.cpp | 2 +- etk/archive/Archive.hpp | 2 +- etk/archive/Zip.cpp | 2 +- etk/archive/Zip.hpp | 2 +- etk/debug.cpp | 2 +- etk/debug.hpp | 2 +- etk/etk.cpp | 2 +- etk/etk.hpp | 2 +- etk/math/Matrix.hpp | 2 +- etk/math/Matrix2.cpp | 2 +- etk/math/Matrix2.hpp | 2 +- etk/math/Matrix4.cpp | 2 +- etk/math/Matrix4.hpp | 2 +- etk/math/Plane.hpp | 2 +- etk/math/Vector2D.cpp | 2 +- etk/math/Vector2D.hpp | 2 +- etk/math/Vector3D.cpp | 2 +- etk/math/Vector3D.hpp | 2 +- etk/math/Vector4D.cpp | 2 +- etk/math/Vector4D.hpp | 2 +- etk/os/FSNode.cpp | 2 +- etk/os/FSNode.hpp | 2 +- etk/os/FSNodeRight.cpp | 2 +- etk/os/FSNodeRight.hpp | 2 +- etk/os/Fifo.hpp | 2 +- etk/stdTools.cpp | 2 +- etk/stdTools.hpp | 2 +- etk/tool.cpp | 2 +- etk/tool.hpp | 2 +- etk/types.hpp | 2 +- license.txt | 13 -- lutin_etk-test.py | 2 +- lutin_etk.py | 2 +- test/main.cpp | 2 +- test/testArchive.hpp | 2 +- test/testColor.hpp | 2 +- test/testFSNode.hpp | 2 +- test/testHash.hpp | 2 +- test/testStdShared.hpp | 2 +- 47 files changed, 423 insertions(+), 63 deletions(-) create mode 100644 LICENSE delete mode 100644 license.txt diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..fa0086a --- /dev/null +++ b/LICENSE @@ -0,0 +1,373 @@ +Mozilla Public License Version 2.0 +================================== + +1. Definitions +-------------- + +1.1. "Contributor" + means each individual or legal entity that creates, contributes to + the creation of, or owns Covered Software. + +1.2. "Contributor Version" + means the combination of the Contributions of others (if any) used + by a Contributor and that particular Contributor's Contribution. + +1.3. "Contribution" + means Covered Software of a particular Contributor. + +1.4. "Covered Software" + means Source Code Form to which the initial Contributor has attached + the notice in Exhibit A, the Executable Form of such Source Code + Form, and Modifications of such Source Code Form, in each case + including portions thereof. + +1.5. "Incompatible With Secondary Licenses" + means + + (a) that the initial Contributor has attached the notice described + in Exhibit B to the Covered Software; or + + (b) that the Covered Software was made available under the terms of + version 1.1 or earlier of the License, but not also under the + terms of a Secondary License. + +1.6. "Executable Form" + means any form of the work other than Source Code Form. + +1.7. "Larger Work" + means a work that combines Covered Software with other material, in + a separate file or files, that is not Covered Software. + +1.8. "License" + means this document. + +1.9. "Licensable" + means having the right to grant, to the maximum extent possible, + whether at the time of the initial grant or subsequently, any and + all of the rights conveyed by this License. + +1.10. "Modifications" + means any of the following: + + (a) any file in Source Code Form that results from an addition to, + deletion from, or modification of the contents of Covered + Software; or + + (b) any new file in Source Code Form that contains any Covered + Software. + +1.11. "Patent Claims" of a Contributor + means any patent claim(s), including without limitation, method, + process, and apparatus claims, in any patent Licensable by such + Contributor that would be infringed, but for the grant of the + License, by the making, using, selling, offering for sale, having + made, import, or transfer of either its Contributions or its + Contributor Version. + +1.12. "Secondary License" + means either the GNU General Public License, Version 2.0, the GNU + Lesser General Public License, Version 2.1, the GNU Affero General + Public License, Version 3.0, or any later versions of those + licenses. + +1.13. "Source Code Form" + means the form of the work preferred for making modifications. + +1.14. "You" (or "Your") + means an individual or a legal entity exercising rights under this + License. For legal entities, "You" includes any entity that + controls, is controlled by, or is under common control with You. For + purposes of this definition, "control" means (a) the power, direct + or indirect, to cause the direction or management of such entity, + whether by contract or otherwise, or (b) ownership of more than + fifty percent (50%) of the outstanding shares or beneficial + ownership of such entity. + +2. License Grants and Conditions +-------------------------------- + +2.1. Grants + +Each Contributor hereby grants You a world-wide, royalty-free, +non-exclusive license: + +(a) under intellectual property rights (other than patent or trademark) + Licensable by such Contributor to use, reproduce, make available, + modify, display, perform, distribute, and otherwise exploit its + Contributions, either on an unmodified basis, with Modifications, or + as part of a Larger Work; and + +(b) under Patent Claims of such Contributor to make, use, sell, offer + for sale, have made, import, and otherwise transfer either its + Contributions or its Contributor Version. + +2.2. Effective Date + +The licenses granted in Section 2.1 with respect to any Contribution +become effective for each Contribution on the date the Contributor first +distributes such Contribution. + +2.3. Limitations on Grant Scope + +The licenses granted in this Section 2 are the only rights granted under +this License. No additional rights or licenses will be implied from the +distribution or licensing of Covered Software under this License. +Notwithstanding Section 2.1(b) above, no patent license is granted by a +Contributor: + +(a) for any code that a Contributor has removed from Covered Software; + or + +(b) for infringements caused by: (i) Your and any other third party's + modifications of Covered Software, or (ii) the combination of its + Contributions with other software (except as part of its Contributor + Version); or + +(c) under Patent Claims infringed by Covered Software in the absence of + its Contributions. + +This License does not grant any rights in the trademarks, service marks, +or logos of any Contributor (except as may be necessary to comply with +the notice requirements in Section 3.4). + +2.4. Subsequent Licenses + +No Contributor makes additional grants as a result of Your choice to +distribute the Covered Software under a subsequent version of this +License (see Section 10.2) or under the terms of a Secondary License (if +permitted under the terms of Section 3.3). + +2.5. Representation + +Each Contributor represents that the Contributor believes its +Contributions are its original creation(s) or it has sufficient rights +to grant the rights to its Contributions conveyed by this License. + +2.6. Fair Use + +This License is not intended to limit any rights You have under +applicable copyright doctrines of fair use, fair dealing, or other +equivalents. + +2.7. Conditions + +Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted +in Section 2.1. + +3. Responsibilities +------------------- + +3.1. Distribution of Source Form + +All distribution of Covered Software in Source Code Form, including any +Modifications that You create or to which You contribute, must be under +the terms of this License. You must inform recipients that the Source +Code Form of the Covered Software is governed by the terms of this +License, and how they can obtain a copy of this License. You may not +attempt to alter or restrict the recipients' rights in the Source Code +Form. + +3.2. Distribution of Executable Form + +If You distribute Covered Software in Executable Form then: + +(a) such Covered Software must also be made available in Source Code + Form, as described in Section 3.1, and You must inform recipients of + the Executable Form how they can obtain a copy of such Source Code + Form by reasonable means in a timely manner, at a charge no more + than the cost of distribution to the recipient; and + +(b) You may distribute such Executable Form under the terms of this + License, or sublicense it under different terms, provided that the + license for the Executable Form does not attempt to limit or alter + the recipients' rights in the Source Code Form under this License. + +3.3. Distribution of a Larger Work + +You may create and distribute a Larger Work under terms of Your choice, +provided that You also comply with the requirements of this License for +the Covered Software. If the Larger Work is a combination of Covered +Software with a work governed by one or more Secondary Licenses, and the +Covered Software is not Incompatible With Secondary Licenses, this +License permits You to additionally distribute such Covered Software +under the terms of such Secondary License(s), so that the recipient of +the Larger Work may, at their option, further distribute the Covered +Software under the terms of either this License or such Secondary +License(s). + +3.4. Notices + +You may not remove or alter the substance of any license notices +(including copyright notices, patent notices, disclaimers of warranty, +or limitations of liability) contained within the Source Code Form of +the Covered Software, except that You may alter any license notices to +the extent required to remedy known factual inaccuracies. + +3.5. Application of Additional Terms + +You may choose to offer, and to charge a fee for, warranty, support, +indemnity or liability obligations to one or more recipients of Covered +Software. However, You may do so only on Your own behalf, and not on +behalf of any Contributor. You must make it absolutely clear that any +such warranty, support, indemnity, or liability obligation is offered by +You alone, and You hereby agree to indemnify every Contributor for any +liability incurred by such Contributor as a result of warranty, support, +indemnity or liability terms You offer. You may include additional +disclaimers of warranty and limitations of liability specific to any +jurisdiction. + +4. Inability to Comply Due to Statute or Regulation +--------------------------------------------------- + +If it is impossible for You to comply with any of the terms of this +License with respect to some or all of the Covered Software due to +statute, judicial order, or regulation then You must: (a) comply with +the terms of this License to the maximum extent possible; and (b) +describe the limitations and the code they affect. Such description must +be placed in a text file included with all distributions of the Covered +Software under this License. Except to the extent prohibited by statute +or regulation, such description must be sufficiently detailed for a +recipient of ordinary skill to be able to understand it. + +5. Termination +-------------- + +5.1. The rights granted under this License will terminate automatically +if You fail to comply with any of its terms. However, if You become +compliant, then the rights granted under this License from a particular +Contributor are reinstated (a) provisionally, unless and until such +Contributor explicitly and finally terminates Your grants, and (b) on an +ongoing basis, if such Contributor fails to notify You of the +non-compliance by some reasonable means prior to 60 days after You have +come back into compliance. Moreover, Your grants from a particular +Contributor are reinstated on an ongoing basis if such Contributor +notifies You of the non-compliance by some reasonable means, this is the +first time You have received notice of non-compliance with this License +from such Contributor, and You become compliant prior to 30 days after +Your receipt of the notice. + +5.2. If You initiate litigation against any entity by asserting a patent +infringement claim (excluding declaratory judgment actions, +counter-claims, and cross-claims) alleging that a Contributor Version +directly or indirectly infringes any patent, then the rights granted to +You by any and all Contributors for the Covered Software under Section +2.1 of this License shall terminate. + +5.3. In the event of termination under Sections 5.1 or 5.2 above, all +end user license agreements (excluding distributors and resellers) which +have been validly granted by You or Your distributors under this License +prior to termination shall survive termination. + +************************************************************************ +* * +* 6. Disclaimer of Warranty * +* ------------------------- * +* * +* Covered Software is provided under this License on an "as is" * +* basis, without warranty of any kind, either expressed, implied, or * +* statutory, including, without limitation, warranties that the * +* Covered Software is free of defects, merchantable, fit for a * +* particular purpose or non-infringing. The entire risk as to the * +* quality and performance of the Covered Software is with You. * +* Should any Covered Software prove defective in any respect, You * +* (not any Contributor) assume the cost of any necessary servicing, * +* repair, or correction. This disclaimer of warranty constitutes an * +* essential part of this License. No use of any Covered Software is * +* authorized under this License except under this disclaimer. * +* * +************************************************************************ + +************************************************************************ +* * +* 7. Limitation of Liability * +* -------------------------- * +* * +* Under no circumstances and under no legal theory, whether tort * +* (including negligence), contract, or otherwise, shall any * +* Contributor, or anyone who distributes Covered Software as * +* permitted above, be liable to You for any direct, indirect, * +* special, incidental, or consequential damages of any character * +* including, without limitation, damages for lost profits, loss of * +* goodwill, work stoppage, computer failure or malfunction, or any * +* and all other commercial damages or losses, even if such party * +* shall have been informed of the possibility of such damages. This * +* limitation of liability shall not apply to liability for death or * +* personal injury resulting from such party's negligence to the * +* extent applicable law prohibits such limitation. Some * +* jurisdictions do not allow the exclusion or limitation of * +* incidental or consequential damages, so this exclusion and * +* limitation may not apply to You. * +* * +************************************************************************ + +8. Litigation +------------- + +Any litigation relating to this License may be brought only in the +courts of a jurisdiction where the defendant maintains its principal +place of business and such litigation shall be governed by laws of that +jurisdiction, without reference to its conflict-of-law provisions. +Nothing in this Section shall prevent a party's ability to bring +cross-claims or counter-claims. + +9. Miscellaneous +---------------- + +This License represents the complete agreement concerning the subject +matter hereof. If any provision of this License is held to be +unenforceable, such provision shall be reformed only to the extent +necessary to make it enforceable. Any law or regulation which provides +that the language of a contract shall be construed against the drafter +shall not be used to construe this License against a Contributor. + +10. Versions of the License +--------------------------- + +10.1. New Versions + +Mozilla Foundation is the license steward. Except as provided in Section +10.3, no one other than the license steward has the right to modify or +publish new versions of this License. Each version will be given a +distinguishing version number. + +10.2. Effect of New Versions + +You may distribute the Covered Software under the terms of the version +of the License under which You originally received the Covered Software, +or under the terms of any subsequent version published by the license +steward. + +10.3. Modified Versions + +If you create software not governed by this License, and you want to +create a new license for such software, you may create and use a +modified version of this License if you rename the license and remove +any references to the name of the license steward (except to note that +such modified license differs from this License). + +10.4. Distributing Source Code Form that is Incompatible With Secondary +Licenses + +If You choose to distribute Source Code Form that is Incompatible With +Secondary Licenses under the terms of this version of the License, the +notice described in Exhibit B of this License must be attached. + +Exhibit A - Source Code Form License Notice +------------------------------------------- + + This Source Code Form is subject to the terms of the Mozilla Public + License, v. 2.0. If a copy of the MPL was not distributed with this + file, You can obtain one at http://mozilla.org/MPL/2.0/. + +If it is not possible or desirable to put the notice in a particular +file, then You may include the notice in a location (such as a LICENSE +file in a relevant directory) where a recipient would be likely to look +for such a notice. + +You may add additional accurate notices of copyright ownership. + +Exhibit B - "Incompatible With Secondary Licenses" Notice +--------------------------------------------------------- + + This Source Code Form is "Incompatible With Secondary Licenses", as + defined by the Mozilla Public License, v. 2.0. \ No newline at end of file diff --git a/README.md b/README.md index 2f4f448..ed5c775 100644 --- a/README.md +++ b/README.md @@ -59,15 +59,15 @@ Compile software: lutin -C -P etk-test -License (APACHE v2.0) +License (MPL v2.0) ===================== Copyright etk Edouard DUPIN -Licensed under the Apache License, Version 2.0 (the "License"); +Licensed under the Mozilla Public License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + https://www.mozilla.org/MPL/2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/doc/mainpage.md b/doc/mainpage.md index 28c88a7..98fd8ad 100644 --- a/doc/mainpage.md +++ b/doc/mainpage.md @@ -31,16 +31,16 @@ Are there any licensing restrictions? {#etk_mainpage_dependency} ETK is **FREE software** and _all sub-library are FREE and staticly linkable !!!_ -License (APACHE-2.0) {#etk_mainpage_licence} -==================== +License (MPL v2.0) {#etk_mainpage_licence} +================== Copyright etk Edouard DUPIN -Licensed under the Apache License, Version 2.0 (the "License"); +Licensed under the Mozilla Public License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - + Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/etk/Color.cpp b/etk/Color.cpp index 876c598..9856447 100644 --- a/etk/Color.cpp +++ b/etk/Color.cpp @@ -1,7 +1,7 @@ /** @file * @author Edouard DUPIN * @copyright 2011, Edouard DUPIN, all right reserved - * @license APACHE v2.0 (see license file) + * @license MPL v2.0 (see license file) */ #include diff --git a/etk/Color.hpp b/etk/Color.hpp index b1812d6..46a7f18 100644 --- a/etk/Color.hpp +++ b/etk/Color.hpp @@ -1,7 +1,7 @@ /** @file * @author Edouard DUPIN * @copyright 2011, Edouard DUPIN, all right reserved - * @license APACHE v2.0 (see license file) + * @license MPL v2.0 (see license file) */ #include diff --git a/etk/Hash.hpp b/etk/Hash.hpp index c146fd9..d390169 100644 --- a/etk/Hash.hpp +++ b/etk/Hash.hpp @@ -1,7 +1,7 @@ /** @file * @author Edouard DUPIN * @copyright 2011, Edouard DUPIN, all right reserved - * @license APACHE v2.0 (see license file) + * @license MPL v2.0 (see license file) */ #include diff --git a/etk/Noise.cpp b/etk/Noise.cpp index 0eb4022..ba2c849 100644 --- a/etk/Noise.cpp +++ b/etk/Noise.cpp @@ -1,7 +1,7 @@ /** @file * @author Edouard DUPIN * @copyright 2011, Edouard DUPIN, all right reserved - * @license APACHE v2.0 (see license file) + * @license MPL v2.0 (see license file) */ diff --git a/etk/Noise.hpp b/etk/Noise.hpp index 76239fe..131d4de 100644 --- a/etk/Noise.hpp +++ b/etk/Noise.hpp @@ -1,7 +1,7 @@ /** @file * @author Edouard DUPIN * @copyright 2011, Edouard DUPIN, all right reserved - * @license APACHE v2.0 (see license file) + * @license MPL v2.0 (see license file) */ #include diff --git a/etk/archive/Archive.cpp b/etk/archive/Archive.cpp index f454ad5..a4d8521 100644 --- a/etk/archive/Archive.cpp +++ b/etk/archive/Archive.cpp @@ -1,7 +1,7 @@ /** @file * @author Edouard DUPIN * @copyright 2011, Edouard DUPIN, all right reserved - * @license APACHE v2.0 (see license file) + * @license MPL v2.0 (see license file) */ #ifdef ETK_BUILD_MINIZIP diff --git a/etk/archive/Archive.hpp b/etk/archive/Archive.hpp index 6d4b2f1..25e088e 100644 --- a/etk/archive/Archive.hpp +++ b/etk/archive/Archive.hpp @@ -1,7 +1,7 @@ /** @file * @author Edouard DUPIN * @copyright 2011, Edouard DUPIN, all right reserved - * @license APACHE v2.0 (see license file) + * @license MPL v2.0 (see license file) */ #ifdef ETK_BUILD_MINIZIP diff --git a/etk/archive/Zip.cpp b/etk/archive/Zip.cpp index 582eefa..5fcac01 100644 --- a/etk/archive/Zip.cpp +++ b/etk/archive/Zip.cpp @@ -1,7 +1,7 @@ /** @file * @author Edouard DUPIN * @copyright 2011, Edouard DUPIN, all right reserved - * @license APACHE v2.0 (see license file) + * @license MPL v2.0 (see license file) */ #ifdef ETK_BUILD_MINIZIP diff --git a/etk/archive/Zip.hpp b/etk/archive/Zip.hpp index 01d1135..2a1cef6 100644 --- a/etk/archive/Zip.hpp +++ b/etk/archive/Zip.hpp @@ -1,7 +1,7 @@ /** @file * @author Edouard DUPIN * @copyright 2011, Edouard DUPIN, all right reserved - * @license APACHE v2.0 (see license file) + * @license MPL v2.0 (see license file) */ #pragma once diff --git a/etk/debug.cpp b/etk/debug.cpp index ae13c8f..7dd8902 100644 --- a/etk/debug.cpp +++ b/etk/debug.cpp @@ -1,7 +1,7 @@ /** @file * @author Edouard DUPIN * @copyright 2011, Edouard DUPIN, all right reserved - * @license APACHE v2.0 (see license file) + * @license MPL v2.0 (see license file) */ #include diff --git a/etk/debug.hpp b/etk/debug.hpp index 5259dbc..207737b 100644 --- a/etk/debug.hpp +++ b/etk/debug.hpp @@ -1,7 +1,7 @@ /** @file * @author Edouard DUPIN * @copyright 2011, Edouard DUPIN, all right reserved - * @license APACHE v2.0 (see license file) + * @license MPL v2.0 (see license file) */ #include diff --git a/etk/etk.cpp b/etk/etk.cpp index 5571fb2..2b41854 100644 --- a/etk/etk.cpp +++ b/etk/etk.cpp @@ -1,7 +1,7 @@ /** @file * @author Edouard DUPIN * @copyright 2011, Edouard DUPIN, all right reserved - * @license APACHE v2.0 (see license file) + * @license MPL v2.0 (see license file) */ #include diff --git a/etk/etk.hpp b/etk/etk.hpp index eea8c9a..9a1f1fa 100644 --- a/etk/etk.hpp +++ b/etk/etk.hpp @@ -1,7 +1,7 @@ /** @file * @author Edouard DUPIN * @copyright 2011, Edouard DUPIN, all right reserved - * @license APACHE v2.0 (see license file) + * @license MPL v2.0 (see license file) */ #pragma once diff --git a/etk/math/Matrix.hpp b/etk/math/Matrix.hpp index 93cd6e3..6e3513b 100644 --- a/etk/math/Matrix.hpp +++ b/etk/math/Matrix.hpp @@ -1,7 +1,7 @@ /** @file * @author Edouard DUPIN * @copyright 2011, Edouard DUPIN, all right reserved - * @license APACHE v2.0 (see license file) + * @license MPL v2.0 (see license file) */ #pragma once diff --git a/etk/math/Matrix2.cpp b/etk/math/Matrix2.cpp index 394cb99..0851420 100644 --- a/etk/math/Matrix2.cpp +++ b/etk/math/Matrix2.cpp @@ -1,7 +1,7 @@ /** @file * @author Edouard DUPIN * @copyright 2011, Edouard DUPIN, all right reserved - * @license APACHE v2.0 (see license file) + * @license MPL v2.0 (see license file) */ #include diff --git a/etk/math/Matrix2.hpp b/etk/math/Matrix2.hpp index cab58fd..4b68285 100644 --- a/etk/math/Matrix2.hpp +++ b/etk/math/Matrix2.hpp @@ -1,7 +1,7 @@ /** @file * @author Edouard DUPIN * @copyright 2011, Edouard DUPIN, all right reserved - * @license APACHE v2.0 (see license file) + * @license MPL v2.0 (see license file) */ #pragma once diff --git a/etk/math/Matrix4.cpp b/etk/math/Matrix4.cpp index 6f4040c..e9519c7 100644 --- a/etk/math/Matrix4.cpp +++ b/etk/math/Matrix4.cpp @@ -1,7 +1,7 @@ /** @file * @author Edouard DUPIN * @copyright 2011, Edouard DUPIN, all right reserved - * @license APACHE v2.0 (see license file) + * @license MPL v2.0 (see license file) */ #include diff --git a/etk/math/Matrix4.hpp b/etk/math/Matrix4.hpp index c6e2819..428a26c 100644 --- a/etk/math/Matrix4.hpp +++ b/etk/math/Matrix4.hpp @@ -1,7 +1,7 @@ /** @file * @author Edouard DUPIN * @copyright 2011, Edouard DUPIN, all right reserved - * @license APACHE v2.0 (see license file) + * @license MPL v2.0 (see license file) */ #include diff --git a/etk/math/Plane.hpp b/etk/math/Plane.hpp index 2c47bc9..30c5df1 100644 --- a/etk/math/Plane.hpp +++ b/etk/math/Plane.hpp @@ -1,7 +1,7 @@ /** @file * @author Edouard DUPIN * @copyright 2011, Edouard DUPIN, all right reserved - * @license APACHE v2.0 (see license file) + * @license MPL v2.0 (see license file) */ #include diff --git a/etk/math/Vector2D.cpp b/etk/math/Vector2D.cpp index 86240f6..8f5bdec 100644 --- a/etk/math/Vector2D.cpp +++ b/etk/math/Vector2D.cpp @@ -1,7 +1,7 @@ /** @file * @author Edouard DUPIN * @copyright 2011, Edouard DUPIN, all right reserved - * @license APACHE v2.0 (see license file) + * @license MPL v2.0 (see license file) */ #include diff --git a/etk/math/Vector2D.hpp b/etk/math/Vector2D.hpp index 2004e39..92c4729 100644 --- a/etk/math/Vector2D.hpp +++ b/etk/math/Vector2D.hpp @@ -1,7 +1,7 @@ /** @file * @author Edouard DUPIN * @copyright 2011, Edouard DUPIN, all right reserved - * @license APACHE v2.0 (see license file) + * @license MPL v2.0 (see license file) */ #include diff --git a/etk/math/Vector3D.cpp b/etk/math/Vector3D.cpp index 25f5999..7146133 100644 --- a/etk/math/Vector3D.cpp +++ b/etk/math/Vector3D.cpp @@ -1,7 +1,7 @@ /** @file * @author Edouard DUPIN * @copyright 2011, Edouard DUPIN, all right reserved - * @license APACHE v2.0 (see license file) + * @license MPL v2.0 (see license file) */ #include diff --git a/etk/math/Vector3D.hpp b/etk/math/Vector3D.hpp index fae9b19..b96c698 100644 --- a/etk/math/Vector3D.hpp +++ b/etk/math/Vector3D.hpp @@ -1,7 +1,7 @@ /** @file * @author Edouard DUPIN * @copyright 2011, Edouard DUPIN, all right reserved - * @license APACHE v2.0 (see license file) + * @license MPL v2.0 (see license file) */ #include diff --git a/etk/math/Vector4D.cpp b/etk/math/Vector4D.cpp index 8b55692..a17c874 100644 --- a/etk/math/Vector4D.cpp +++ b/etk/math/Vector4D.cpp @@ -1,7 +1,7 @@ /** @file * @author Edouard DUPIN * @copyright 2011, Edouard DUPIN, all right reserved - * @license APACHE v2.0 (see license file) + * @license MPL v2.0 (see license file) */ #include diff --git a/etk/math/Vector4D.hpp b/etk/math/Vector4D.hpp index 3f07d6e..f61c071 100644 --- a/etk/math/Vector4D.hpp +++ b/etk/math/Vector4D.hpp @@ -1,7 +1,7 @@ /** @file * @author Edouard DUPIN * @copyright 2011, Edouard DUPIN, all right reserved - * @license APACHE v2.0 (see license file) + * @license MPL v2.0 (see license file) */ #pragma once diff --git a/etk/os/FSNode.cpp b/etk/os/FSNode.cpp index 4bf7cb3..329a93b 100644 --- a/etk/os/FSNode.cpp +++ b/etk/os/FSNode.cpp @@ -1,7 +1,7 @@ /** @file * @author Edouard DUPIN * @copyright 2011, Edouard DUPIN, all right reserved - * @license APACHE v2.0 (see license file) + * @license MPL v2.0 (see license file) */ diff --git a/etk/os/FSNode.hpp b/etk/os/FSNode.hpp index 3a9fd0b..883541e 100644 --- a/etk/os/FSNode.hpp +++ b/etk/os/FSNode.hpp @@ -1,7 +1,7 @@ /** @file * @author Edouard DUPIN * @copyright 2011, Edouard DUPIN, all right reserved - * @license APACHE v2.0 (see license file) + * @license MPL v2.0 (see license file) */ #include diff --git a/etk/os/FSNodeRight.cpp b/etk/os/FSNodeRight.cpp index cede73b..e305f10 100644 --- a/etk/os/FSNodeRight.cpp +++ b/etk/os/FSNodeRight.cpp @@ -1,7 +1,7 @@ /** @file * @author Edouard DUPIN * @copyright 2011, Edouard DUPIN, all right reserved - * @license APACHE v2.0 (see license file) + * @license MPL v2.0 (see license file) */ diff --git a/etk/os/FSNodeRight.hpp b/etk/os/FSNodeRight.hpp index 77a203d..40105a3 100644 --- a/etk/os/FSNodeRight.hpp +++ b/etk/os/FSNodeRight.hpp @@ -1,7 +1,7 @@ /** @file * @author Edouard DUPIN * @copyright 2011, Edouard DUPIN, all right reserved - * @license APACHE v2.0 (see license file) + * @license MPL v2.0 (see license file) */ #include diff --git a/etk/os/Fifo.hpp b/etk/os/Fifo.hpp index 0df1e54..5acf775 100644 --- a/etk/os/Fifo.hpp +++ b/etk/os/Fifo.hpp @@ -1,7 +1,7 @@ /** @file * @author Edouard DUPIN * @copyright 2011, Edouard DUPIN, all right reserved - * @license APACHE v2.0 (see license file) + * @license MPL v2.0 (see license file) */ #include diff --git a/etk/stdTools.cpp b/etk/stdTools.cpp index 3223cf0..3519698 100644 --- a/etk/stdTools.cpp +++ b/etk/stdTools.cpp @@ -1,7 +1,7 @@ /** @file * @author Edouard DUPIN * @copyright 2011, Edouard DUPIN, all right reserved - * @license APACHE v2.0 (see license file) + * @license MPL v2.0 (see license file) */ #include diff --git a/etk/stdTools.hpp b/etk/stdTools.hpp index 32ea4fc..8b6d86e 100644 --- a/etk/stdTools.hpp +++ b/etk/stdTools.hpp @@ -1,7 +1,7 @@ /** @file * @author Edouard DUPIN * @copyright 2011, Edouard DUPIN, all right reserved - * @license APACHE v2.0 (see license file) + * @license MPL v2.0 (see license file) */ #pragma once diff --git a/etk/tool.cpp b/etk/tool.cpp index c0b6361..a63b918 100644 --- a/etk/tool.cpp +++ b/etk/tool.cpp @@ -1,7 +1,7 @@ /** @file * @author Edouard DUPIN * @copyright 2011, Edouard DUPIN, all right reserved - * @license APACHE v2.0 (see license file) + * @license MPL v2.0 (see license file) */ #include diff --git a/etk/tool.hpp b/etk/tool.hpp index 71982af..3853a9c 100644 --- a/etk/tool.hpp +++ b/etk/tool.hpp @@ -1,7 +1,7 @@ /** @file * @author Edouard DUPIN * @copyright 2011, Edouard DUPIN, all right reserved - * @license APACHE v2.0 (see license file) + * @license MPL v2.0 (see license file) */ #include diff --git a/etk/types.hpp b/etk/types.hpp index e1c931e..c10774f 100644 --- a/etk/types.hpp +++ b/etk/types.hpp @@ -1,7 +1,7 @@ /** @file * @author Edouard DUPIN * @copyright 2011, Edouard DUPIN, all right reserved - * @license APACHE v2.0 (see license file) + * @license MPL v2.0 (see license file) */ #pragma once diff --git a/license.txt b/license.txt deleted file mode 100644 index e9aeef4..0000000 --- a/license.txt +++ /dev/null @@ -1,13 +0,0 @@ -Copyright etk Edouard DUPIN - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. \ No newline at end of file diff --git a/lutin_etk-test.py b/lutin_etk-test.py index e325eec..b83c9db 100644 --- a/lutin_etk-test.py +++ b/lutin_etk-test.py @@ -13,7 +13,7 @@ def get_desc(): return "e-tk test software" def get_licence(): - return "APACHE-2" + return "MPL-2" def get_compagny_type(): return "com" diff --git a/lutin_etk.py b/lutin_etk.py index 0c2ad6c..c9f81dd 100644 --- a/lutin_etk.py +++ b/lutin_etk.py @@ -10,7 +10,7 @@ def get_desc(): return "Ewol tool kit" def get_licence(): - return "APACHE-2" + return "MPL-2" def get_compagny_type(): return "com" diff --git a/test/main.cpp b/test/main.cpp index ccbd2c4..cbf7942 100644 --- a/test/main.cpp +++ b/test/main.cpp @@ -1,7 +1,7 @@ /** @file * @author Edouard DUPIN * @copyright 2011, Edouard DUPIN, all right reserved - * @license APACHE v2.0 (see license file) + * @license MPL v2.0 (see license file) */ #include diff --git a/test/testArchive.hpp b/test/testArchive.hpp index 704e4ac..b5e82d0 100644 --- a/test/testArchive.hpp +++ b/test/testArchive.hpp @@ -3,7 +3,7 @@ * * @copyright 2011, Edouard DUPIN, all right reserved * - * @license APACHE v2.0 (see license file) + * @license MPL v2.0 (see license file) */ #include diff --git a/test/testColor.hpp b/test/testColor.hpp index 5b954fb..5eb2ff0 100644 --- a/test/testColor.hpp +++ b/test/testColor.hpp @@ -3,7 +3,7 @@ * * @copyright 2011, Edouard DUPIN, all right reserved * - * @license APACHE v2.0 (see license file) + * @license MPL v2.0 (see license file) */ #include diff --git a/test/testFSNode.hpp b/test/testFSNode.hpp index 756e5d6..1bd32a4 100644 --- a/test/testFSNode.hpp +++ b/test/testFSNode.hpp @@ -3,7 +3,7 @@ * * @copyright 2011, Edouard DUPIN, all right reserved * - * @license APACHE v2.0 (see license file) + * @license MPL v2.0 (see license file) */ #include diff --git a/test/testHash.hpp b/test/testHash.hpp index f8250ec..9605094 100644 --- a/test/testHash.hpp +++ b/test/testHash.hpp @@ -3,7 +3,7 @@ * * @copyright 2011, Edouard DUPIN, all right reserved * - * @license APACHE v2.0 (see license file) + * @license MPL v2.0 (see license file) */ #include diff --git a/test/testStdShared.hpp b/test/testStdShared.hpp index 5547e87..fbb4598 100644 --- a/test/testStdShared.hpp +++ b/test/testStdShared.hpp @@ -3,7 +3,7 @@ * * @copyright 2011, Edouard DUPIN, all right reserved * - * @license APACHE v2.0 (see license file) + * @license MPL v2.0 (see license file) */ #include