From c464b9b7e71448f94446b64d8b05f84fe8aea016 Mon Sep 17 00:00:00 2001 From: Lassi Marttala Date: Mon, 26 Mar 2012 10:59:42 +0200 Subject: GDLT-38, Change License from LGPL to MPL in information files. --- LGPL.txt | 503 ------------------------------------------------------------ LICENSE.txt | 405 ++++++++++++++++++++++++++++++++++++++++++++---- MPL.txt | 374 ++++++++++++++++++++++++++++++++++++++++++++ README.txt | 2 +- 4 files changed, 751 insertions(+), 533 deletions(-) delete mode 100755 LGPL.txt create mode 100755 MPL.txt diff --git a/LGPL.txt b/LGPL.txt deleted file mode 100755 index 1d00fdb..0000000 --- a/LGPL.txt +++ /dev/null @@ -1,503 +0,0 @@ - GNU LESSER GENERAL PUBLIC LICENSE - Version 2.1, February 1999 - - Copyright (C) 1991, 1999 Free Software Foundation, Inc. - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - -[This is the first released version of the Lesser GPL. It also counts - as the successor of the GNU Library Public License, version 2, hence - the version number 2.1.] - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -Licenses are intended to guarantee your freedom to share and change -free software--to make sure the software is free for all its users. - - This license, the Lesser General Public License, applies to some -specially designated software packages--typically libraries--of the -Free Software Foundation and other authors who decide to use it. You -can use it too, but we suggest you first think carefully about whether -this license or the ordinary General Public License is the better -strategy to use in any particular case, based on the explanations below. - - When we speak of free software, we are referring to freedom of use, -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 this service if you wish); that you receive source code or can get -it if you want it; that you can change the software and use pieces of -it in new free programs; and that you are informed that you can do -these things. - - To protect your rights, we need to make restrictions that forbid -distributors to deny you these rights or to ask you to surrender these -rights. These restrictions translate to certain responsibilities for -you if you distribute copies of the library or if you modify it. - - For example, if you distribute copies of the library, whether gratis -or for a fee, you must give the recipients all the rights that we gave -you. You must make sure that they, too, receive or can get the source -code. If you link other code with the library, you must provide -complete object files to the recipients, so that they can relink them -with the library after making changes to the library and recompiling -it. And you must show them these terms so they know their rights. - - We protect your rights with a two-step method: (1) we copyright the -library, and (2) we offer you this license, which gives you legal -permission to copy, distribute and/or modify the library. - - To protect each distributor, we want to make it very clear that -there is no warranty for the free library. Also, if the library is -modified by someone else and passed on, the recipients should know -that what they have is not the original version, so that the original -author's reputation will not be affected by problems that might be -introduced by others. - - Finally, software patents pose a constant threat to the existence of -any free program. We wish to make sure that a company cannot -effectively restrict the users of a free program by obtaining a -restrictive license from a patent holder. Therefore, we insist that -any patent license obtained for a version of the library must be -consistent with the full freedom of use specified in this license. - - Most GNU software, including some libraries, is covered by the -ordinary GNU General Public License. This license, the GNU Lesser -General Public License, applies to certain designated libraries, and -is quite different from the ordinary General Public License. We use -this license for certain libraries in order to permit linking those -libraries into non-free programs. - - When a program is linked with a library, whether statically or using -a shared library, the combination of the two is legally speaking a -combined work, a derivative of the original library. The ordinary -General Public License therefore permits such linking only if the -entire combination fits its criteria of freedom. The Lesser General -Public License permits more lax criteria for linking other code with -the library. - - We call this license the "Lesser" General Public License because it -does Less to protect the user's freedom than the ordinary General -Public License. It also provides other free software developers Less -of an advantage over competing non-free programs. These disadvantages -are the reason we use the ordinary General Public License for many -libraries. However, the Lesser license provides advantages in certain -special circumstances. - - For example, on rare occasions, there may be a special need to -encourage the widest possible use of a certain library, so that it becomes -a de-facto standard. To achieve this, non-free programs must be -allowed to use the library. A more frequent case is that a free -library does the same job as widely used non-free libraries. In this -case, there is little to gain by limiting the free library to free -software only, so we use the Lesser General Public License. - - In other cases, permission to use a particular library in non-free -programs enables a greater number of people to use a large body of -free software. For example, permission to use the GNU C Library in -non-free programs enables many more people to use the whole GNU -operating system, as well as its variant, the GNU/Linux operating -system. - - Although the Lesser General Public License is Less protective of the -users' freedom, it does ensure that the user of a program that is -linked with the Library has the freedom and the wherewithal to run -that program using a modified version of the Library. - - The precise terms and conditions for copying, distribution and -modification follow. Pay close attention to the difference between a -"work based on the library" and a "work that uses the library". The -former contains code derived from the library, whereas the latter must -be combined with the library in order to run. - - GNU LESSER GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License Agreement applies to any software library or other -program which contains a notice placed by the copyright holder or -other authorized party saying it may be distributed under the terms of -this Lesser General Public License (also called "this License"). -Each licensee is addressed as "you". - - A "library" means a collection of software functions and/or data -prepared so as to be conveniently linked with application programs -(which use some of those functions and data) to form executables. - - The "Library", below, refers to any such software library or work -which has been distributed under these terms. A "work based on the -Library" means either the Library or any derivative work under -copyright law: that is to say, a work containing the Library or a -portion of it, either verbatim or with modifications and/or translated -straightforwardly into another language. (Hereinafter, translation is -included without limitation in the term "modification".) - - "Source code" for a work means the preferred form of the work for -making modifications to it. For a library, complete source code means -all the source code for all modules it contains, plus any associated -interface definition files, plus the scripts used to control compilation -and installation of the library. - - Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running a program using the Library is not restricted, and output from -such a program is covered only if its contents constitute a work based -on the Library (independent of the use of the Library in a tool for -writing it). Whether that is true depends on what the Library does -and what the program that uses the Library does. - - 1. You may copy and distribute verbatim copies of the Library's -complete source code as you receive it, in any medium, provided that -you conspicuously and appropriately publish on each copy an -appropriate copyright notice and disclaimer of warranty; keep intact -all the notices that refer to this License and to the absence of any -warranty; and distribute a copy of this License along with the -Library. - - You may charge a fee for the physical act of transferring a copy, -and you may at your option offer warranty protection in exchange for a -fee. - - 2. You may modify your copy or copies of the Library or any portion -of it, thus forming a work based on the Library, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) The modified work must itself be a software library. - - b) You must cause the files modified to carry prominent notices - stating that you changed the files and the date of any change. - - c) You must cause the whole of the work to be licensed at no - charge to all third parties under the terms of this License. - - d) If a facility in the modified Library refers to a function or a - table of data to be supplied by an application program that uses - the facility, other than as an argument passed when the facility - is invoked, then you must make a good faith effort to ensure that, - in the event an application does not supply such function or - table, the facility still operates, and performs whatever part of - its purpose remains meaningful. - - (For example, a function in a library to compute square roots has - a purpose that is entirely well-defined independent of the - application. Therefore, Subsection 2d requires that any - application-supplied function or table used by this function must - be optional: if the application does not supply it, the square - root function must still compute square roots.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Library, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Library, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote -it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Library. - -In addition, mere aggregation of another work not based on the Library -with the Library (or with a work based on the Library) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may opt to apply the terms of the ordinary GNU General Public -License instead of this License to a given copy of the Library. To do -this, you must alter all the notices that refer to this License, so -that they refer to the ordinary GNU General Public License, version 2, -instead of to this License. (If a newer version than version 2 of the -ordinary GNU General Public License has appeared, then you can specify -that version instead if you wish.) Do not make any other change in -these notices. - - Once this change is made in a given copy, it is irreversible for -that copy, so the ordinary GNU General Public License applies to all -subsequent copies and derivative works made from that copy. - - This option is useful when you wish to copy part of the code of -the Library into a program that is not a library. - - 4. You may copy and distribute the Library (or a portion or -derivative of it, under Section 2) in object code or executable form -under the terms of Sections 1 and 2 above provided that you accompany -it with the complete corresponding machine-readable source code, which -must be distributed under the terms of Sections 1 and 2 above on a -medium customarily used for software interchange. - - If distribution of object code is made by offering access to copy -from a designated place, then offering equivalent access to copy the -source code from the same place satisfies the requirement to -distribute the source code, even though third parties are not -compelled to copy the source along with the object code. - - 5. A program that contains no derivative of any portion of the -Library, but is designed to work with the Library by being compiled or -linked with it, is called a "work that uses the Library". Such a -work, in isolation, is not a derivative work of the Library, and -therefore falls outside the scope of this License. - - However, linking a "work that uses the Library" with the Library -creates an executable that is a derivative of the Library (because it -contains portions of the Library), rather than a "work that uses the -library". The executable is therefore covered by this License. -Section 6 states terms for distribution of such executables. - - When a "work that uses the Library" uses material from a header file -that is part of the Library, the object code for the work may be a -derivative work of the Library even though the source code is not. -Whether this is true is especially significant if the work can be -linked without the Library, or if the work is itself a library. The -threshold for this to be true is not precisely defined by law. - - If such an object file uses only numerical parameters, data -structure layouts and accessors, and small macros and small inline -functions (ten lines or less in length), then the use of the object -file is unrestricted, regardless of whether it is legally a derivative -work. (Executables containing this object code plus portions of the -Library will still fall under Section 6.) - - Otherwise, if the work is a derivative of the Library, you may -distribute the object code for the work under the terms of Section 6. -Any executables containing that work also fall under Section 6, -whether or not they are linked directly with the Library itself. - - 6. As an exception to the Sections above, you may also combine or -link a "work that uses the Library" with the Library to produce a -work containing portions of the Library, and distribute that work -under terms of your choice, provided that the terms permit -modification of the work for the customer's own use and reverse -engineering for debugging such modifications. - - You must give prominent notice with each copy of the work that the -Library is used in it and that the Library and its use are covered by -this License. You must supply a copy of this License. If the work -during execution displays copyright notices, you must include the -copyright notice for the Library among them, as well as a reference -directing the user to the copy of this License. Also, you must do one -of these things: - - a) Accompany the work with the complete corresponding - machine-readable source code for the Library including whatever - changes were used in the work (which must be distributed under - Sections 1 and 2 above); and, if the work is an executable linked - with the Library, with the complete machine-readable "work that - uses the Library", as object code and/or source code, so that the - user can modify the Library and then relink to produce a modified - executable containing the modified Library. (It is understood - that the user who changes the contents of definitions files in the - Library will not necessarily be able to recompile the application - to use the modified definitions.) - - b) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (1) uses at run time a - copy of the library already present on the user's computer system, - rather than copying library functions into the executable, and (2) - will operate properly with a modified version of the library, if - the user installs one, as long as the modified version is - interface-compatible with the version that the work was made with. - - c) Accompany the work with a written offer, valid for at - least three years, to give the same user the materials - specified in Subsection 6a, above, for a charge no more - than the cost of performing this distribution. - - d) If distribution of the work is made by offering access to copy - from a designated place, offer equivalent access to copy the above - specified materials from the same place. - - e) Verify that the user has already received a copy of these - materials or that you have already sent this user a copy. - - For an executable, the required form of the "work that uses the -Library" must include any data and utility programs needed for -reproducing the executable from it. However, as a special exception, -the materials to be distributed need not include anything that is -normally distributed (in either source or binary form) with the major -components (compiler, kernel, and so on) of the operating system on -which the executable runs, unless that component itself accompanies -the executable. - - It may happen that this requirement contradicts the license -restrictions of other proprietary libraries that do not normally -accompany the operating system. Such a contradiction means you cannot -use both them and the Library together in an executable that you -distribute. - - 7. 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 not covered by this License, and distribute such a combined -library, provided that the separate distribution of the work based on -the Library and of the other library facilities is otherwise -permitted, and provided that you do these two things: - - a) Accompany the combined library with a copy of the same work - based on the Library, uncombined with any other library - facilities. This must be distributed under the terms of the - Sections above. - - b) Give prominent notice with the combined library of the fact - that part of it is a work based on the Library, and explaining - where to find the accompanying uncombined form of the same work. - - 8. You may not copy, modify, sublicense, link with, or distribute -the Library except as expressly provided under this License. Any -attempt otherwise to copy, modify, sublicense, link with, or -distribute the Library is void, and will automatically terminate your -rights under this License. However, parties who have received copies, -or rights, from you under this License will not have their licenses -terminated so long as such parties remain in full compliance. - - 9. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Library or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Library (or any work based on the -Library), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Library or works based on it. - - 10. Each time you redistribute the Library (or any work based on the -Library), the recipient automatically receives a license from the -original licensor to copy, distribute, link with or modify the Library -subject to these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties with -this License. - - 11. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -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 -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Library at all. For example, if a patent -license would not permit royalty-free redistribution of the Library by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Library. - -If any portion of this section is held invalid or unenforceable under any -particular circumstance, the balance of the section is intended to apply, -and the section as a whole is intended to apply in other circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 12. If the distribution and/or use of the Library is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Library under this License may add -an explicit geographical distribution limitation excluding those countries, -so that distribution is permitted only in or among countries not thus -excluded. In such case, this License incorporates the limitation as if -written in the body of this License. - - 13. The Free Software Foundation may publish revised and/or new -versions of the 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 -specifies a version number of this License which applies to it and -"any later version", you have the option of following the terms and -conditions either of that version or of any later version published by -the Free Software Foundation. If the Library does not specify a -license version number, you may choose any version ever published by -the Free Software Foundation. - - 14. If you wish to incorporate parts of the Library into other free -programs whose distribution conditions are incompatible with these, -write to the author to ask for permission. For software which is -copyrighted by the Free Software Foundation, write to the Free -Software Foundation; we sometimes make exceptions for this. Our -decision will be guided by the two goals of preserving the free status -of all derivatives of our free software and of promoting the sharing -and reuse of software generally. - - NO WARRANTY - - 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO -WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. -EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR -OTHER PARTIES PROVIDE THE LIBRARY "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 -LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME -THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN -WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY -AND/OR REDISTRIBUTE THE LIBRARY 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 -LIBRARY (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 LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF -SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH -DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Libraries - - If you develop a new library, and you want it to be of the greatest -possible use to the public, we recommend making it free software that -everyone can redistribute and change. You can do so by permitting -redistribution under these terms (or, alternatively, under the terms of the -ordinary General Public License). - - To apply these terms, attach the following notices to the library. It is -safest to attach them to the start of each source file to most effectively -convey 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 library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - -Also add information on how to contact you by electronic and paper mail. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the library, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the - library `Frob' (a library for tweaking knobs) written by James Random Hacker. - - , 1 April 1990 - Ty Coon, President of Vice - -That's all there is to it! - diff --git a/LICENSE.txt b/LICENSE.txt index 765e1fd..11ebdfe 100755 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,33 +1,380 @@ # @licence make begin@ # - # Copyright (C) 2011, BMW AG - Alexander Wenzel - # - # This program is free software; you can redistribute it and/or modify it under the terms of the - # GNU Lesser General Public License, version 2.1, as published by the Free Software Foundation. - # 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 Lesser General - # Public License, version 2.1, for more details. - # - # You should have received a copy of the GNU Lesser General Public License, version 2.1, along - # with this program; if not, see . - # - # Note that the copyright holders assume that the GNU Lesser General Public License, version 2.1, may - # also be applicable to programs even in cases in which the program is not a library in the technical sense. - # - # Linking DLT statically or dynamically with other modules is making a combined work based on DLT. You may - # license such other modules under the GNU Lesser General Public License, version 2.1. If you do not want to - # license your linked modules under the GNU Lesser General Public License, version 2.1, you - # may use the program under the following exception. - # - # As a special exception, the copyright holders of DLT give you permission to combine DLT - # with software programs or libraries that are released under any license unless such a combination is not - # permitted by the license of such a software program or library. You may copy and distribute such a - # system following the terms of the GNU Lesser General Public License, version 2.1, including this - # special exception, for DLT and the licenses of the other code concerned. - # - # Note that people who make modified versions of DLT are not obligated to grant this special exception - # for their modified versions; it is their choice whether to do so. The GNU Lesser General Public License, - # version 2.1, gives permission to release a modified version without this exception; this exception - # also makes it possible to release a modified version which carries forward this exception. + # Copyright (C) 2011-2012, BMW AG - Alexander Wenzel + # + # 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. + # # # @licence end@ diff --git a/MPL.txt b/MPL.txt new file mode 100755 index 0000000..bac71fc --- /dev/null +++ b/MPL.txt @@ -0,0 +1,374 @@ +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. + diff --git a/README.txt b/README.txt index cdfc31a..740c7b9 100644 --- a/README.txt +++ b/README.txt @@ -30,7 +30,7 @@ License ------- Full information on the license for this software is available in the "LICENSE.txt" file. -The full LGPL license is in "LGPL.txt." +The full MPL license is in "MPL.txt." Contact -- cgit v1.2.1 From 71796bdc8b3ff372361b40b44b2de5cbbed9e613 Mon Sep 17 00:00:00 2001 From: Lassi Marttala Date: Mon, 26 Mar 2012 11:06:07 +0200 Subject: GDLT-38, Change license in ReleaseNotes, user shorter form in license.txt --- CMakeLists.txt | 33 +---- LICENSE.txt | 378 +------------------------------------------------------ ReleaseNotes.txt | 2 +- 3 files changed, 12 insertions(+), 401 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a5810d0..03f26e7 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,35 +2,14 @@ # Dlt - Diagnostic Log and Trace # @licence make begin@ # - # Copyright (C) 2011, BMW AG - Alexander Wenzel + # Copyright (C) 2011-2012, BMW AG - Alexander Wenzel # - # This program is free software; you can redistribute it and/or modify it under the terms of the - # GNU Lesser General Public License, version 2.1, as published by the Free Software Foundation. - # 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 Lesser General - # Public License, version 2.1, for more details. + # Contributions are licensed to the GENIVI Alliance under one or more + # Contribution License Agreements. # - # You should have received a copy of the GNU Lesser General Public License, version 2.1, along - # with this program; if not, see . - # - # Note that the copyright holders assume that the GNU Lesser General Public License, version 2.1, may - # also be applicable to programs even in cases in which the program is not a library in the technical sense. - # - # Linking DLT statically or dynamically with other modules is making a combined work based on DLT. You may - # license such other modules under the GNU Lesser General Public License, version 2.1. If you do not want to - # license your linked modules under the GNU Lesser General Public License, version 2.1, you - # may use the program under the following exception. - # - # As a special exception, the copyright holders of DLT give you permission to combine DLT - # with software programs or libraries that are released under any license unless such a combination is not - # permitted by the license of such a software program or library. You may copy and distribute such a - # system following the terms of the GNU Lesser General Public License, version 2.1, including this - # special exception, for DLT and the licenses of the other code concerned. - # - # Note that people who make modified versions of DLT are not obligated to grant this special exception - # for their modified versions; it is their choice whether to do so. The GNU Lesser General Public License, - # version 2.1, gives permission to release a modified version without this exception; this exception - # also makes it possible to release a modified version which carries forward this exception. + # 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/. # # @licence end@ ######## diff --git a/LICENSE.txt b/LICENSE.txt index 11ebdfe..2c9f996 100755 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -2,379 +2,11 @@ # # Copyright (C) 2011-2012, BMW AG - Alexander Wenzel # - # 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. + # Contributions are licensed to the GENIVI Alliance under one or more + # Contribution License Agreements. # + # 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/. # # @licence end@ diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index 25b64fc..8e44b37 100755 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -30,7 +30,7 @@ License ------- Full information on the license for this software is available in the "LICENSE.txt" file. -The full LGPL license is in "LGPL.txt." +The full MPL license is in "MPL.txt." Contact -- cgit v1.2.1 From 5e9d26e9c143245bda4d497bdd1b916df440f5b5 Mon Sep 17 00:00:00 2001 From: Lassi Marttala Date: Mon, 26 Mar 2012 11:12:58 +0200 Subject: GDLT-38, Update licenses in CMakeLists --- CMakeLists.txt | 24 ++++++++++++------------ doc/CMakeLists.txt | 42 ++++++++++-------------------------------- include/CMakeLists.txt | 43 +++++++++++-------------------------------- src/CMakeLists.txt | 43 +++++++++++-------------------------------- systemd/CMakeLists.txt | 43 +++++++++++-------------------------------- testscripts/CMakeLists.txt | 43 +++++++++++-------------------------------- 6 files changed, 66 insertions(+), 172 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 03f26e7..58a4cf4 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,17 +1,17 @@ ####### # Dlt - Diagnostic Log and Trace # @licence make begin@ - # - # Copyright (C) 2011-2012, BMW AG - Alexander Wenzel - # - # Contributions are licensed to the GENIVI Alliance under one or more - # Contribution License Agreements. - # - # 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/. - # - # @licence end@ +# +# Copyright (C) 2011-2012, BMW AG - Alexander Wenzel +# +# Contributions are licensed to the GENIVI Alliance under one or more +# Contribution License Agreements. +# +# 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/. +# +# @licence end@ ######## cmake_minimum_required( VERSION 2.6 ) @@ -61,7 +61,7 @@ option(WITH_DLTTEST "Set to ON to build with modifications to test Uuser-Dae # RPM settings set( GENIVI_RPM_RELEASE "1")#${DLT_REVISION}") -set( LICENSE "LGPL v2.1 with special exception" ) +set( LICENSE "Mozilla Public License Version 2.0s" ) # Build, project and include settings find_package(Threads REQUIRED) diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt index 062fed1..b95fd58 100755 --- a/doc/CMakeLists.txt +++ b/doc/CMakeLists.txt @@ -1,38 +1,16 @@ ####### # Dlt - Diagnostic Log and Trace # @licence make begin@ - # - # Copyright (C) 2011, BMW AG - Alexander Wenzel - # - # This program is free software; you can redistribute it and/or modify it under the terms of the - # GNU Lesser General Public License, version 2.1, as published by the Free Software Foundation. - # 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 Lesser General - # Public License, version 2.1, for more details. - # - # You should have received a copy of the GNU Lesser General Public License, version 2.1, along - # with this program; if not, see . - # - # Note that the copyright holders assume that the GNU Lesser General Public License, version 2.1, may - # also be applicable to programs even in cases in which the program is not a library in the technical sense. - # - # Linking DLT statically or dynamically with other modules is making a combined work based on DLT. You may - # license such other modules under the GNU Lesser General Public License, version 2.1. If you do not want to - # license your linked modules under the GNU Lesser General Public License, version 2.1, you - # may use the program under the following exception. - # - # As a special exception, the copyright holders of DLT give you permission to combine DLT - # with software programs or libraries that are released under any license unless such a combination is not - # permitted by the license of such a software program or library. You may copy and distribute such a - # system following the terms of the GNU Lesser General Public License, version 2.1, including this - # special exception, for DLT and the licenses of the other code concerned. - # - # Note that people who make modified versions of DLT are not obligated to grant this special exception - # for their modified versions; it is their choice whether to do so. The GNU Lesser General Public License, - # version 2.1, gives permission to release a modified version without this exception; this exception - # also makes it possible to release a modified version which carries forward this exception. - # - # @licence end@ +# +# Copyright (C) 2011-2012, BMW AG - Alexander Wenzel +# +# Contributions are licensed to the GENIVI Alliance under one or more +# Contribution License Agreements. +# +# 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/. +# @licence end@ ######## if(WITH_DOC) diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt index 26b97e9..aa7fd66 100755 --- a/include/CMakeLists.txt +++ b/include/CMakeLists.txt @@ -1,38 +1,17 @@ ####### # Dlt - Diagnostic Log and Trace # @licence make begin@ - # - # Copyright (C) 2011, BMW AG - Alexander Wenzel - # - # This program is free software; you can redistribute it and/or modify it under the terms of the - # GNU Lesser General Public License, version 2.1, as published by the Free Software Foundation. - # 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 Lesser General - # Public License, version 2.1, for more details. - # - # You should have received a copy of the GNU Lesser General Public License, version 2.1, along - # with this program; if not, see . - # - # Note that the copyright holders assume that the GNU Lesser General Public License, version 2.1, may - # also be applicable to programs even in cases in which the program is not a library in the technical sense. - # - # Linking DLT statically or dynamically with other modules is making a combined work based on DLT. You may - # license such other modules under the GNU Lesser General Public License, version 2.1. If you do not want to - # license your linked modules under the GNU Lesser General Public License, version 2.1, you - # may use the program under the following exception. - # - # As a special exception, the copyright holders of DLT give you permission to combine DLT - # with software programs or libraries that are released under any license unless such a combination is not - # permitted by the license of such a software program or library. You may copy and distribute such a - # system following the terms of the GNU Lesser General Public License, version 2.1, including this - # special exception, for DLT and the licenses of the other code concerned. - # - # Note that people who make modified versions of DLT are not obligated to grant this special exception - # for their modified versions; it is their choice whether to do so. The GNU Lesser General Public License, - # version 2.1, gives permission to release a modified version without this exception; this exception - # also makes it possible to release a modified version which carries forward this exception. - # - # @licence end@ +# +# Copyright (C) 2011-2012, BMW AG - Alexander Wenzel +# +# Contributions are licensed to the GENIVI Alliance under one or more +# Contribution License Agreements. +# +# 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/. +# +# @licence end@ ######## ADD_SUBDIRECTORY( dlt ) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 1a824ce..8d126f8 100755 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,38 +1,17 @@ ####### # Dlt - Diagnostic Log and Trace # @licence make begin@ - # - # Copyright (C) 2011, BMW AG - Alexander Wenzel - # - # This program is free software; you can redistribute it and/or modify it under the terms of the - # GNU Lesser General Public License, version 2.1, as published by the Free Software Foundation. - # 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 Lesser General - # Public License, version 2.1, for more details. - # - # You should have received a copy of the GNU Lesser General Public License, version 2.1, along - # with this program; if not, see . - # - # Note that the copyright holders assume that the GNU Lesser General Public License, version 2.1, may - # also be applicable to programs even in cases in which the program is not a library in the technical sense. - # - # Linking DLT statically or dynamically with other modules is making a combined work based on DLT. You may - # license such other modules under the GNU Lesser General Public License, version 2.1. If you do not want to - # license your linked modules under the GNU Lesser General Public License, version 2.1, you - # may use the program under the following exception. - # - # As a special exception, the copyright holders of DLT give you permission to combine DLT - # with software programs or libraries that are released under any license unless such a combination is not - # permitted by the license of such a software program or library. You may copy and distribute such a - # system following the terms of the GNU Lesser General Public License, version 2.1, including this - # special exception, for DLT and the licenses of the other code concerned. - # - # Note that people who make modified versions of DLT are not obligated to grant this special exception - # for their modified versions; it is their choice whether to do so. The GNU Lesser General Public License, - # version 2.1, gives permission to release a modified version without this exception; this exception - # also makes it possible to release a modified version which carries forward this exception. - # - # @licence end@ +# +# Copyright (C) 2011-2012, BMW AG - Alexander Wenzel +# +# Contributions are licensed to the GENIVI Alliance under one or more +# Contribution License Agreements. +# +# 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/. +# +# @licence end@ ######## ADD_SUBDIRECTORY( lib ) diff --git a/systemd/CMakeLists.txt b/systemd/CMakeLists.txt index e071d8a..0a2c5e0 100644 --- a/systemd/CMakeLists.txt +++ b/systemd/CMakeLists.txt @@ -1,38 +1,17 @@ ####### # Dlt - Diagnostic Log and Trace # @licence make begin@ - # - # Copyright (C) 2011, BMW AG - Alexander Wenzel - # - # This program is free software; you can redistribute it and/or modify it under the terms of the - # GNU Lesser General Public License, version 2.1, as published by the Free Software Foundation. - # 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 Lesser General - # Public License, version 2.1, for more details. - # - # You should have received a copy of the GNU Lesser General Public License, version 2.1, along - # with this program; if not, see . - # - # Note that the copyright holders assume that the GNU Lesser General Public License, version 2.1, may - # also be applicable to programs even in cases in which the program is not a library in the technical sense. - # - # Linking DLT statically or dynamically with other modules is making a combined work based on DLT. You may - # license such other modules under the GNU Lesser General Public License, version 2.1. If you do not want to - # license your linked modules under the GNU Lesser General Public License, version 2.1, you - # may use the program under the following exception. - # - # As a special exception, the copyright holders of DLT give you permission to combine DLT - # with software programs or libraries that are released under any license unless such a combination is not - # permitted by the license of such a software program or library. You may copy and distribute such a - # system following the terms of the GNU Lesser General Public License, version 2.1, including this - # special exception, for DLT and the licenses of the other code concerned. - # - # Note that people who make modified versions of DLT are not obligated to grant this special exception - # for their modified versions; it is their choice whether to do so. The GNU Lesser General Public License, - # version 2.1, gives permission to release a modified version without this exception; this exception - # also makes it possible to release a modified version which carries forward this exception. - # - # @licence end@ +# +# Copyright (C) 2011-2012, BMW AG - Alexander Wenzel +# +# Contributions are licensed to the GENIVI Alliance under one or more +# Contribution License Agreements. +# +# 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/. +# +# @licence end@ ######## if(WITH_SYSTEMD) diff --git a/testscripts/CMakeLists.txt b/testscripts/CMakeLists.txt index a5ace1f..63d9e81 100755 --- a/testscripts/CMakeLists.txt +++ b/testscripts/CMakeLists.txt @@ -1,38 +1,17 @@ ####### # Dlt - Diagnostic Log and Trace # @licence make begin@ - # - # Copyright (C) 2011, BMW AG - Alexander Wenzel - # - # This program is free software; you can redistribute it and/or modify it under the terms of the - # GNU Lesser General Public License, version 2.1, as published by the Free Software Foundation. - # 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 Lesser General - # Public License, version 2.1, for more details. - # - # You should have received a copy of the GNU Lesser General Public License, version 2.1, along - # with this program; if not, see . - # - # Note that the copyright holders assume that the GNU Lesser General Public License, version 2.1, may - # also be applicable to programs even in cases in which the program is not a library in the technical sense. - # - # Linking DLT statically or dynamically with other modules is making a combined work based on DLT. You may - # license such other modules under the GNU Lesser General Public License, version 2.1. If you do not want to - # license your linked modules under the GNU Lesser General Public License, version 2.1, you - # may use the program under the following exception. - # - # As a special exception, the copyright holders of DLT give you permission to combine DLT - # with software programs or libraries that are released under any license unless such a combination is not - # permitted by the license of such a software program or library. You may copy and distribute such a - # system following the terms of the GNU Lesser General Public License, version 2.1, including this - # special exception, for DLT and the licenses of the other code concerned. - # - # Note that people who make modified versions of DLT are not obligated to grant this special exception - # for their modified versions; it is their choice whether to do so. The GNU Lesser General Public License, - # version 2.1, gives permission to release a modified version without this exception; this exception - # also makes it possible to release a modified version which carries forward this exception. - # - # @licence end@ +# +# Copyright (C) 2011-2012, BMW AG - Alexander Wenzel +# +# Contributions are licensed to the GENIVI Alliance under one or more +# Contribution License Agreements. +# +# 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/. +# +# @licence end@ ######## if(WITH_TESTSCRIPTS) -- cgit v1.2.1 From 51910724642d1f3e852a76ada0a91a6a9d380ce9 Mon Sep 17 00:00:00 2001 From: Lassi Marttala Date: Mon, 26 Mar 2012 11:15:26 +0200 Subject: GDLT-38, Update license in more CMakeLists --- include/dlt/CMakeLists.txt | 43 +++++++++++-------------------------------- src/adaptor/CMakeLists.txt | 43 +++++++++++-------------------------------- src/console/CMakeLists.txt | 43 +++++++++++-------------------------------- src/daemon/CMakeLists.txt | 43 +++++++++++-------------------------------- src/examples/CMakeLists.txt | 43 +++++++++++-------------------------------- src/lib/CMakeLists.txt | 45 ++++++++++++--------------------------------- src/system/CMakeLists.txt | 43 +++++++++++-------------------------------- src/tests/CMakeLists.txt | 43 +++++++++++-------------------------------- 8 files changed, 89 insertions(+), 257 deletions(-) diff --git a/include/dlt/CMakeLists.txt b/include/dlt/CMakeLists.txt index 2e50a8e..50b97d2 100755 --- a/include/dlt/CMakeLists.txt +++ b/include/dlt/CMakeLists.txt @@ -1,38 +1,17 @@ ####### # Dlt - Diagnostic Log and Trace # @licence make begin@ - # - # Copyright (C) 2011, BMW AG - Alexander Wenzel - # - # This program is free software; you can redistribute it and/or modify it under the terms of the - # GNU Lesser General Public License, version 2.1, as published by the Free Software Foundation. - # 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 Lesser General - # Public License, version 2.1, for more details. - # - # You should have received a copy of the GNU Lesser General Public License, version 2.1, along - # with this program; if not, see . - # - # Note that the copyright holders assume that the GNU Lesser General Public License, version 2.1, may - # also be applicable to programs even in cases in which the program is not a library in the technical sense. - # - # Linking DLT statically or dynamically with other modules is making a combined work based on DLT. You may - # license such other modules under the GNU Lesser General Public License, version 2.1. If you do not want to - # license your linked modules under the GNU Lesser General Public License, version 2.1, you - # may use the program under the following exception. - # - # As a special exception, the copyright holders of DLT give you permission to combine DLT - # with software programs or libraries that are released under any license unless such a combination is not - # permitted by the license of such a software program or library. You may copy and distribute such a - # system following the terms of the GNU Lesser General Public License, version 2.1, including this - # special exception, for DLT and the licenses of the other code concerned. - # - # Note that people who make modified versions of DLT are not obligated to grant this special exception - # for their modified versions; it is their choice whether to do so. The GNU Lesser General Public License, - # version 2.1, gives permission to release a modified version without this exception; this exception - # also makes it possible to release a modified version which carries forward this exception. - # - # @licence end@ +# +# Copyright (C) 2011-2012, BMW AG - Alexander Wenzel +# +# Contributions are licensed to the GENIVI Alliance under one or more +# Contribution License Agreements. +# +# 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/. +# +# @licence end@ ######## install(FILES dlt.h dlt_user.h dlt_user_macros.h dlt_client.h dlt_protocol.h dlt_common.h dlt_types.h dlt_version.h dlt_shm.h dlt_offline_trace.h dlt_filetransfer.h diff --git a/src/adaptor/CMakeLists.txt b/src/adaptor/CMakeLists.txt index 8a04377..8289cd5 100755 --- a/src/adaptor/CMakeLists.txt +++ b/src/adaptor/CMakeLists.txt @@ -1,38 +1,17 @@ ####### # Dlt - Diagnostic Log and Trace # @licence make begin@ - # - # Copyright (C) 2011, BMW AG - Alexander Wenzel - # - # This program is free software; you can redistribute it and/or modify it under the terms of the - # GNU Lesser General Public License, version 2.1, as published by the Free Software Foundation. - # 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 Lesser General - # Public License, version 2.1, for more details. - # - # You should have received a copy of the GNU Lesser General Public License, version 2.1, along - # with this program; if not, see . - # - # Note that the copyright holders assume that the GNU Lesser General Public License, version 2.1, may - # also be applicable to programs even in cases in which the program is not a library in the technical sense. - # - # Linking DLT statically or dynamically with other modules is making a combined work based on DLT. You may - # license such other modules under the GNU Lesser General Public License, version 2.1. If you do not want to - # license your linked modules under the GNU Lesser General Public License, version 2.1, you - # may use the program under the following exception. - # - # As a special exception, the copyright holders of DLT give you permission to combine DLT - # with software programs or libraries that are released under any license unless such a combination is not - # permitted by the license of such a software program or library. You may copy and distribute such a - # system following the terms of the GNU Lesser General Public License, version 2.1, including this - # special exception, for DLT and the licenses of the other code concerned. - # - # Note that people who make modified versions of DLT are not obligated to grant this special exception - # for their modified versions; it is their choice whether to do so. The GNU Lesser General Public License, - # version 2.1, gives permission to release a modified version without this exception; this exception - # also makes it possible to release a modified version which carries forward this exception. - # - # @licence end@ +# +# Copyright (C) 2011-2012, BMW AG - Alexander Wenzel +# +# Contributions are licensed to the GENIVI Alliance under one or more +# Contribution License Agreements. +# +# 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/. +# +# @licence end@ ######## set(dlt_adaptor_stdin_SRCS dlt-adaptor-stdin) diff --git a/src/console/CMakeLists.txt b/src/console/CMakeLists.txt index 6cc03ac..416bf10 100755 --- a/src/console/CMakeLists.txt +++ b/src/console/CMakeLists.txt @@ -1,38 +1,17 @@ ####### # Dlt - Diagnostic Log and Trace # @licence make begin@ - # - # Copyright (C) 2011, BMW AG - Alexander Wenzel - # - # This program is free software; you can redistribute it and/or modify it under the terms of the - # GNU Lesser General Public License, version 2.1, as published by the Free Software Foundation. - # 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 Lesser General - # Public License, version 2.1, for more details. - # - # You should have received a copy of the GNU Lesser General Public License, version 2.1, along - # with this program; if not, see . - # - # Note that the copyright holders assume that the GNU Lesser General Public License, version 2.1, may - # also be applicable to programs even in cases in which the program is not a library in the technical sense. - # - # Linking DLT statically or dynamically with other modules is making a combined work based on DLT. You may - # license such other modules under the GNU Lesser General Public License, version 2.1. If you do not want to - # license your linked modules under the GNU Lesser General Public License, version 2.1, you - # may use the program under the following exception. - # - # As a special exception, the copyright holders of DLT give you permission to combine DLT - # with software programs or libraries that are released under any license unless such a combination is not - # permitted by the license of such a software program or library. You may copy and distribute such a - # system following the terms of the GNU Lesser General Public License, version 2.1, including this - # special exception, for DLT and the licenses of the other code concerned. - # - # Note that people who make modified versions of DLT are not obligated to grant this special exception - # for their modified versions; it is their choice whether to do so. The GNU Lesser General Public License, - # version 2.1, gives permission to release a modified version without this exception; this exception - # also makes it possible to release a modified version which carries forward this exception. - # - # @licence end@ +# +# Copyright (C) 2011-2012, BMW AG - Alexander Wenzel +# +# Contributions are licensed to the GENIVI Alliance under one or more +# Contribution License Agreements. +# +# 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/. +# +# @licence end@ ######## set(dlt_convert_SRCS dlt-convert) diff --git a/src/daemon/CMakeLists.txt b/src/daemon/CMakeLists.txt index 5ae1a14..ce66c7b 100755 --- a/src/daemon/CMakeLists.txt +++ b/src/daemon/CMakeLists.txt @@ -1,38 +1,17 @@ ####### # Dlt - Diagnostic Log and Trace # @licence make begin@ - # - # Copyright (C) 2011, BMW AG - Alexander Wenzel - # - # This program is free software; you can redistribute it and/or modify it under the terms of the - # GNU Lesser General Public License, version 2.1, as published by the Free Software Foundation. - # 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 Lesser General - # Public License, version 2.1, for more details. - # - # You should have received a copy of the GNU Lesser General Public License, version 2.1, along - # with this program; if not, see . - # - # Note that the copyright holders assume that the GNU Lesser General Public License, version 2.1, may - # also be applicable to programs even in cases in which the program is not a library in the technical sense. - # - # Linking DLT statically or dynamically with other modules is making a combined work based on DLT. You may - # license such other modules under the GNU Lesser General Public License, version 2.1. If you do not want to - # license your linked modules under the GNU Lesser General Public License, version 2.1, you - # may use the program under the following exception. - # - # As a special exception, the copyright holders of DLT give you permission to combine DLT - # with software programs or libraries that are released under any license unless such a combination is not - # permitted by the license of such a software program or library. You may copy and distribute such a - # system following the terms of the GNU Lesser General Public License, version 2.1, including this - # special exception, for DLT and the licenses of the other code concerned. - # - # Note that people who make modified versions of DLT are not obligated to grant this special exception - # for their modified versions; it is their choice whether to do so. The GNU Lesser General Public License, - # version 2.1, gives permission to release a modified version without this exception; this exception - # also makes it possible to release a modified version which carries forward this exception. - # - # @licence end@ +# +# Copyright (C) 2011-2012, BMW AG - Alexander Wenzel +# +# Contributions are licensed to the GENIVI Alliance under one or more +# Contribution License Agreements. +# +# 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/. +# +# @licence end@ ######## set(dlt_daemon_SRCS dlt-daemon dlt_daemon_common ${CMAKE_SOURCE_DIR}/src/shared/dlt_user_shared.c ${CMAKE_SOURCE_DIR}/src/shared/dlt_common.c ${CMAKE_SOURCE_DIR}/src/shared/dlt_shm.c ${CMAKE_SOURCE_DIR}/src/shared/dlt_offline_trace.c) diff --git a/src/examples/CMakeLists.txt b/src/examples/CMakeLists.txt index be538db..fb02fb6 100755 --- a/src/examples/CMakeLists.txt +++ b/src/examples/CMakeLists.txt @@ -1,38 +1,17 @@ ####### # Dlt - Diagnostic Log and Trace # @licence make begin@ - # - # Copyright (C) 2011, BMW AG - Alexander Wenzel - # - # This program is free software; you can redistribute it and/or modify it under the terms of the - # GNU Lesser General Public License, version 2.1, as published by the Free Software Foundation. - # 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 Lesser General - # Public License, version 2.1, for more details. - # - # You should have received a copy of the GNU Lesser General Public License, version 2.1, along - # with this program; if not, see . - # - # Note that the copyright holders assume that the GNU Lesser General Public License, version 2.1, may - # also be applicable to programs even in cases in which the program is not a library in the technical sense. - # - # Linking DLT statically or dynamically with other modules is making a combined work based on DLT. You may - # license such other modules under the GNU Lesser General Public License, version 2.1. If you do not want to - # license your linked modules under the GNU Lesser General Public License, version 2.1, you - # may use the program under the following exception. - # - # As a special exception, the copyright holders of DLT give you permission to combine DLT - # with software programs or libraries that are released under any license unless such a combination is not - # permitted by the license of such a software program or library. You may copy and distribute such a - # system following the terms of the GNU Lesser General Public License, version 2.1, including this - # special exception, for DLT and the licenses of the other code concerned. - # - # Note that people who make modified versions of DLT are not obligated to grant this special exception - # for their modified versions; it is their choice whether to do so. The GNU Lesser General Public License, - # version 2.1, gives permission to release a modified version without this exception; this exception - # also makes it possible to release a modified version which carries forward this exception. - # - # @licence end@ +# +# Copyright (C) 2011-2012, BMW AG - Alexander Wenzel +# +# Contributions are licensed to the GENIVI Alliance under one or more +# Contribution License Agreements. +# +# 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/. +# +# @licence end@ ######## set(dlt_example_user_SRCS dlt-example-user) diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt index db87b65..2133279 100755 --- a/src/lib/CMakeLists.txt +++ b/src/lib/CMakeLists.txt @@ -1,39 +1,18 @@ ####### # Dlt - Diagnostic Log and Trace # @licence make begin@ - # - # Copyright (C) 2011, BMW AG - Alexander Wenzel - # - # This program is free software; you can redistribute it and/or modify it under the terms of the - # GNU Lesser General Public License, version 2.1, as published by the Free Software Foundation. - # 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 Lesser General - # Public License, version 2.1, for more details. - # - # You should have received a copy of the GNU Lesser General Public License, version 2.1, along - # with this program; if not, see . - # - # Note that the copyright holders assume that the GNU Lesser General Public License, version 2.1, may - # also be applicable to programs even in cases in which the program is not a library in the technical sense. - # - # Linking DLT statically or dynamically with other modules is making a combined work based on DLT. You may - # license such other modules under the GNU Lesser General Public License, version 2.1. If you do not want to - # license your linked modules under the GNU Lesser General Public License, version 2.1, you - # may use the program under the following exception. - # - # As a special exception, the copyright holders of DLT give you permission to combine DLT - # with software programs or libraries that are released under any license unless such a combination is not - # permitted by the license of such a software program or library. You may copy and distribute such a - # system following the terms of the GNU Lesser General Public License, version 2.1, including this - # special exception, for DLT and the licenses of the other code concerned. - # - # Note that people who make modified versions of DLT are not obligated to grant this special exception - # for their modified versions; it is their choice whether to do so. The GNU Lesser General Public License, - # version 2.1, gives permission to release a modified version without this exception; this exception - # also makes it possible to release a modified version which carries forward this exception. - # - # @licence end@ -######## +# +# Copyright (C) 2011-2012, BMW AG - Alexander Wenzel +# +# Contributions are licensed to the GENIVI Alliance under one or more +# Contribution License Agreements. +# +# 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/. +# +# @licence end@ +########q set(dlt_LIB_SRCS dlt_user dlt_client dlt_filetransfer ${CMAKE_SOURCE_DIR}/src/shared/dlt_common.c ${CMAKE_SOURCE_DIR}/src/shared/dlt_user_shared.c ${CMAKE_SOURCE_DIR}/src/shared/dlt_shm.c) diff --git a/src/system/CMakeLists.txt b/src/system/CMakeLists.txt index 5524316..2964e29 100755 --- a/src/system/CMakeLists.txt +++ b/src/system/CMakeLists.txt @@ -1,38 +1,17 @@ ####### # Dlt - Diagnostic Log and Trace # @licence make begin@ - # - # Copyright (C) 2011, BMW AG - Alexander Wenzel - # - # This program is free software; you can redistribute it and/or modify it under the terms of the - # GNU Lesser General Public License, version 2.1, as published by the Free Software Foundation. - # 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 Lesser General - # Public License, version 2.1, for more details. - # - # You should have received a copy of the GNU Lesser General Public License, version 2.1, along - # with this program; if not, see . - # - # Note that the copyright holders assume that the GNU Lesser General Public License, version 2.1, may - # also be applicable to programs even in cases in which the program is not a library in the technical sense. - # - # Linking DLT statically or dynamically with other modules is making a combined work based on DLT. You may - # license such other modules under the GNU Lesser General Public License, version 2.1. If you do not want to - # license your linked modules under the GNU Lesser General Public License, version 2.1, you - # may use the program under the following exception. - # - # As a special exception, the copyright holders of DLT give you permission to combine DLT - # with software programs or libraries that are released under any license unless such a combination is not - # permitted by the license of such a software program or library. You may copy and distribute such a - # system following the terms of the GNU Lesser General Public License, version 2.1, including this - # special exception, for DLT and the licenses of the other code concerned. - # - # Note that people who make modified versions of DLT are not obligated to grant this special exception - # for their modified versions; it is their choice whether to do so. The GNU Lesser General Public License, - # version 2.1, gives permission to release a modified version without this exception; this exception - # also makes it possible to release a modified version which carries forward this exception. - # - # @licence end@ +# +# Copyright (C) 2011-2012, BMW AG - Alexander Wenzel +# +# Contributions are licensed to the GENIVI Alliance under one or more +# Contribution License Agreements. +# +# 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/. +# +# @licence end@ ######## set(dlt_system_SRCS dlt-system dlt-system-log) diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt index 4e21b32..9ad5180 100755 --- a/src/tests/CMakeLists.txt +++ b/src/tests/CMakeLists.txt @@ -1,38 +1,17 @@ ####### # Dlt - Diagnostic Log and Trace # @licence make begin@ - # - # Copyright (C) 2011, BMW AG - Alexander Wenzel - # - # This program is free software; you can redistribute it and/or modify it under the terms of the - # GNU Lesser General Public License, version 2.1, as published by the Free Software Foundation. - # 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 Lesser General - # Public License, version 2.1, for more details. - # - # You should have received a copy of the GNU Lesser General Public License, version 2.1, along - # with this program; if not, see . - # - # Note that the copyright holders assume that the GNU Lesser General Public License, version 2.1, may - # also be applicable to programs even in cases in which the program is not a library in the technical sense. - # - # Linking DLT statically or dynamically with other modules is making a combined work based on DLT. You may - # license such other modules under the GNU Lesser General Public License, version 2.1. If you do not want to - # license your linked modules under the GNU Lesser General Public License, version 2.1, you - # may use the program under the following exception. - # - # As a special exception, the copyright holders of DLT give you permission to combine DLT - # with software programs or libraries that are released under any license unless such a combination is not - # permitted by the license of such a software program or library. You may copy and distribute such a - # system following the terms of the GNU Lesser General Public License, version 2.1, including this - # special exception, for DLT and the licenses of the other code concerned. - # - # Note that people who make modified versions of DLT are not obligated to grant this special exception - # for their modified versions; it is their choice whether to do so. The GNU Lesser General Public License, - # version 2.1, gives permission to release a modified version without this exception; this exception - # also makes it possible to release a modified version which carries forward this exception. - # - # @licence end@ +# +# Copyright (C) 2011-2012, BMW AG - Alexander Wenzel +# +# Contributions are licensed to the GENIVI Alliance under one or more +# Contribution License Agreements. +# +# 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/. +# +# @licence end@ ######## set(dlt_test_multi_process_SRCS dlt-test-multi-process) -- cgit v1.2.1 From 3802aa9eb4cdcea90ce14a10752dd96f4ada799b Mon Sep 17 00:00:00 2001 From: Lassi Marttala Date: Mon, 26 Mar 2012 11:19:42 +0200 Subject: GDLT-38, Update licenses in include --- include/dlt/dlt.h | 54 +++++++++++++++-------------------------- include/dlt/dlt_client.h | 53 +++++++++++++++------------------------- include/dlt/dlt_common.h | 48 ++++++++++++------------------------ include/dlt/dlt_offline_trace.h | 51 ++++++++++++++------------------------ include/dlt/dlt_protocol.h | 53 +++++++++++++++------------------------- include/dlt/dlt_shm.h | 51 ++++++++++++++------------------------ include/dlt/dlt_types.h | 53 +++++++++++++++------------------------- include/dlt/dlt_user.h | 47 ++++++++++++----------------------- include/dlt/dlt_user_macros.h | 47 ++++++++++++----------------------- 9 files changed, 160 insertions(+), 297 deletions(-) diff --git a/include/dlt/dlt.h b/include/dlt/dlt.h index 696fc46..b7e2ed2 100755 --- a/include/dlt/dlt.h +++ b/include/dlt/dlt.h @@ -1,41 +1,25 @@ -/* - * Dlt- Diagnostic Log and Trace console apps - * @licence app begin@ - * - * Copyright (C) 2011, BMW AG - Alexander Wenzel - * - * This program is free software; you can redistribute it and/or modify it under the terms of the - * GNU Lesser General Public License, version 2.1, as published by the Free Software Foundation. - * 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 Lesser General - * Public License, version 2.1, for more details. - * - * You should have received a copy of the GNU Lesser General Public License, version 2.1, along - * with this program; if not, see . - * - * Note that the copyright holders assume that the GNU Lesser General Public License, version 2.1, may - * also be applicable to programs even in cases in which the program is not a library in the technical sense. - * - * Linking DLT statically or dynamically with other modules is making a combined work based on DLT. You may - * license such other modules under the GNU Lesser General Public License, version 2.1. If you do not want to - * license your linked modules under the GNU Lesser General Public License, version 2.1, you - * may use the program under the following exception. - * - * As a special exception, the copyright holders of DLT give you permission to combine DLT - * with software programs or libraries that are released under any license unless such a combination is not - * permitted by the license of such a software program or library. You may copy and distribute such a - * system following the terms of the GNU Lesser General Public License, version 2.1, including this - * special exception, for DLT and the licenses of the other code concerned. - * - * Note that people who make modified versions of DLT are not obligated to grant this special exception - * for their modified versions; it is their choice whether to do so. The GNU Lesser General Public License, - * version 2.1, gives permission to release a modified version without this exception; this exception - * also makes it possible to release a modified version which carries forward this exception. - * +/** + * @licence app begin@ + * Copyright (C) 2012 BMW AG + * + * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps. + * + * Contributions are licensed to the GENIVI Alliance under one or more + * Contribution License Agreements. + * + * \copyright + * 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/. + * + * + * \author Alexander Wenzel BMW 2011-2012 + * + * \file + * For further information see http://www.genivi.org/. * @licence end@ */ - /******************************************************************************* ** ** ** SRC-MODULE: dlt.h ** diff --git a/include/dlt/dlt_client.h b/include/dlt/dlt_client.h index e589469..eda1906 100755 --- a/include/dlt/dlt_client.h +++ b/include/dlt/dlt_client.h @@ -1,37 +1,22 @@ -/* - * Dlt- Diagnostic Log and Trace client library - * @licence app begin@ - * - * Copyright (C) 2011, BMW AG - Alexander Wenzel - * - * This program is free software; you can redistribute it and/or modify it under the terms of the - * GNU Lesser General Public License, version 2.1, as published by the Free Software Foundation. - * 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 Lesser General - * Public License, version 2.1, for more details. - * - * You should have received a copy of the GNU Lesser General Public License, version 2.1, along - * with this program; if not, see . - * - * Note that the copyright holders assume that the GNU Lesser General Public License, version 2.1, may - * also be applicable to programs even in cases in which the program is not a library in the technical sense. - * - * Linking DLT statically or dynamically with other modules is making a combined work based on DLT. You may - * license such other modules under the GNU Lesser General Public License, version 2.1. If you do not want to - * license your linked modules under the GNU Lesser General Public License, version 2.1, you - * may use the program under the following exception. - * - * As a special exception, the copyright holders of DLT give you permission to combine DLT - * with software programs or libraries that are released under any license unless such a combination is not - * permitted by the license of such a software program or library. You may copy and distribute such a - * system following the terms of the GNU Lesser General Public License, version 2.1, including this - * special exception, for DLT and the licenses of the other code concerned. - * - * Note that people who make modified versions of DLT are not obligated to grant this special exception - * for their modified versions; it is their choice whether to do so. The GNU Lesser General Public License, - * version 2.1, gives permission to release a modified version without this exception; this exception - * also makes it possible to release a modified version which carries forward this exception. - * +/** + * @licence app begin@ + * Copyright (C) 2012 BMW AG + * + * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps. + * + * Contributions are licensed to the GENIVI Alliance under one or more + * Contribution License Agreements. + * + * \copyright + * 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/. + * + * + * \author Alexander Wenzel BMW 2011-2012 + * + * \file + * For further information see http://www.genivi.org/. * @licence end@ */ diff --git a/include/dlt/dlt_common.h b/include/dlt/dlt_common.h index 41a9820..44d34bc 100755 --- a/include/dlt/dlt_common.h +++ b/include/dlt/dlt_common.h @@ -1,41 +1,25 @@ -/* - * Dlt- Diagnostic Log and Trace +/** * @licence app begin@ + * Copyright (C) 2012 BMW AG + * + * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps. + * + * Contributions are licensed to the GENIVI Alliance under one or more + * Contribution License Agreements. * - * Copyright (C) 2011, BMW AG - Alexander Wenzel - * - * This program is free software; you can redistribute it and/or modify it under the terms of the - * GNU Lesser General Public License, version 2.1, as published by the Free Software Foundation. - * 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 Lesser General - * Public License, version 2.1, for more details. - * - * You should have received a copy of the GNU Lesser General Public License, version 2.1, along - * with this program; if not, see . - * - * Note that the copyright holders assume that the GNU Lesser General Public License, version 2.1, may - * also be applicable to programs even in cases in which the program is not a library in the technical sense. - * - * Linking DLT statically or dynamically with other modules is making a combined work based on DLT. You may - * license such other modules under the GNU Lesser General Public License, version 2.1. If you do not want to - * license your linked modules under the GNU Lesser General Public License, version 2.1, you - * may use the program under the following exception. - * - * As a special exception, the copyright holders of DLT give you permission to combine DLT - * with software programs or libraries that are released under any license unless such a combination is not - * permitted by the license of such a software program or library. You may copy and distribute such a - * system following the terms of the GNU Lesser General Public License, version 2.1, including this - * special exception, for DLT and the licenses of the other code concerned. - * - * Note that people who make modified versions of DLT are not obligated to grant this special exception - * for their modified versions; it is their choice whether to do so. The GNU Lesser General Public License, - * version 2.1, gives permission to release a modified version without this exception; this exception - * also makes it possible to release a modified version which carries forward this exception. + * \copyright + * 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/. * + * + * \author Alexander Wenzel BMW 2011-2012 + * + * \file + * For further information see http://www.genivi.org/. * @licence end@ */ - /******************************************************************************* ** ** ** SRC-MODULE: dlt_common.h ** diff --git a/include/dlt/dlt_offline_trace.h b/include/dlt/dlt_offline_trace.h index 04c4f1a..dd5bea6 100644 --- a/include/dlt/dlt_offline_trace.h +++ b/include/dlt/dlt_offline_trace.h @@ -1,39 +1,24 @@ -/* -* Dlt- Diagnostic Log and Trace user library -* @licence app begin@ +/** + * @licence app begin@ + * Copyright (C) 2012 BMW AG + * + * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps. + * + * Contributions are licensed to the GENIVI Alliance under one or more + * Contribution License Agreements. * - * Copyright (C) 2011, BMW AG - Alexander Wenzel - * - * This program is free software; you can redistribute it and/or modify it under the terms of the - * GNU Lesser General Public License, version 2.1, as published by the Free Software Foundation. - * 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 Lesser General - * Public License, version 2.1, for more details. - * - * You should have received a copy of the GNU Lesser General Public License, version 2.1, along - * with this program; if not, see . - * - * Note that the copyright holders assume that the GNU Lesser General Public License, version 2.1, may - * also be applicable to programs even in cases in which the program is not a library in the technical sense. - * - * Linking DLT statically or dynamically with other modules is making a combined work based on DLT. You may - * license such other modules under the GNU Lesser General Public License, version 2.1. If you do not want to - * license your linked modules under the GNU Lesser General Public License, version 2.1, you - * may use the program under the following exception. - * - * As a special exception, the copyright holders of DLT give you permission to combine DLT - * with software programs or libraries that are released under any license unless such a combination is not - * permitted by the license of such a software program or library. You may copy and distribute such a - * system following the terms of the GNU Lesser General Public License, version 2.1, including this - * special exception, for DLT and the licenses of the other code concerned. - * - * Note that people who make modified versions of DLT are not obligated to grant this special exception - * for their modified versions; it is their choice whether to do so. The GNU Lesser General Public License, - * version 2.1, gives permission to release a modified version without this exception; this exception - * also makes it possible to release a modified version which carries forward this exception. + * \copyright + * 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/. * + * + * \author Alexander Wenzel BMW 2011-2012 + * + * \file + * For further information see http://www.genivi.org/. * @licence end@ -*/ + */ /******************************************************************************* diff --git a/include/dlt/dlt_protocol.h b/include/dlt/dlt_protocol.h index 88f7d89..4b42b4a 100755 --- a/include/dlt/dlt_protocol.h +++ b/include/dlt/dlt_protocol.h @@ -1,37 +1,22 @@ -/* - * Dlt- Diagnostic Log and Trace protocol defines - * @licence app begin@ - * - * Copyright (C) 2011, BMW AG - Alexander Wenzel - * - * This program is free software; you can redistribute it and/or modify it under the terms of the - * GNU Lesser General Public License, version 2.1, as published by the Free Software Foundation. - * 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 Lesser General - * Public License, version 2.1, for more details. - * - * You should have received a copy of the GNU Lesser General Public License, version 2.1, along - * with this program; if not, see . - * - * Note that the copyright holders assume that the GNU Lesser General Public License, version 2.1, may - * also be applicable to programs even in cases in which the program is not a library in the technical sense. - * - * Linking DLT statically or dynamically with other modules is making a combined work based on DLT. You may - * license such other modules under the GNU Lesser General Public License, version 2.1. If you do not want to - * license your linked modules under the GNU Lesser General Public License, version 2.1, you - * may use the program under the following exception. - * - * As a special exception, the copyright holders of DLT give you permission to combine DLT - * with software programs or libraries that are released under any license unless such a combination is not - * permitted by the license of such a software program or library. You may copy and distribute such a - * system following the terms of the GNU Lesser General Public License, version 2.1, including this - * special exception, for DLT and the licenses of the other code concerned. - * - * Note that people who make modified versions of DLT are not obligated to grant this special exception - * for their modified versions; it is their choice whether to do so. The GNU Lesser General Public License, - * version 2.1, gives permission to release a modified version without this exception; this exception - * also makes it possible to release a modified version which carries forward this exception. - * +/** + * @licence app begin@ + * Copyright (C) 2012 BMW AG + * + * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps. + * + * Contributions are licensed to the GENIVI Alliance under one or more + * Contribution License Agreements. + * + * \copyright + * 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/. + * + * + * \author Alexander Wenzel BMW 2011-2012 + * + * \file + * For further information see http://www.genivi.org/. * @licence end@ */ diff --git a/include/dlt/dlt_shm.h b/include/dlt/dlt_shm.h index f0f488b..f1531d4 100644 --- a/include/dlt/dlt_shm.h +++ b/include/dlt/dlt_shm.h @@ -1,39 +1,24 @@ -/* -* Dlt- Diagnostic Log and Trace user library -* @licence app begin@ +/** + * @licence app begin@ + * Copyright (C) 2012 BMW AG + * + * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps. + * + * Contributions are licensed to the GENIVI Alliance under one or more + * Contribution License Agreements. * - * Copyright (C) 2011, BMW AG - Alexander Wenzel - * - * This program is free software; you can redistribute it and/or modify it under the terms of the - * GNU Lesser General Public License, version 2.1, as published by the Free Software Foundation. - * 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 Lesser General - * Public License, version 2.1, for more details. - * - * You should have received a copy of the GNU Lesser General Public License, version 2.1, along - * with this program; if not, see . - * - * Note that the copyright holders assume that the GNU Lesser General Public License, version 2.1, may - * also be applicable to programs even in cases in which the program is not a library in the technical sense. - * - * Linking DLT statically or dynamically with other modules is making a combined work based on DLT. You may - * license such other modules under the GNU Lesser General Public License, version 2.1. If you do not want to - * license your linked modules under the GNU Lesser General Public License, version 2.1, you - * may use the program under the following exception. - * - * As a special exception, the copyright holders of DLT give you permission to combine DLT - * with software programs or libraries that are released under any license unless such a combination is not - * permitted by the license of such a software program or library. You may copy and distribute such a - * system following the terms of the GNU Lesser General Public License, version 2.1, including this - * special exception, for DLT and the licenses of the other code concerned. - * - * Note that people who make modified versions of DLT are not obligated to grant this special exception - * for their modified versions; it is their choice whether to do so. The GNU Lesser General Public License, - * version 2.1, gives permission to release a modified version without this exception; this exception - * also makes it possible to release a modified version which carries forward this exception. + * \copyright + * 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/. * + * + * \author Alexander Wenzel BMW 2011-2012 + * + * \file + * For further information see http://www.genivi.org/. * @licence end@ -*/ + */ /******************************************************************************* diff --git a/include/dlt/dlt_types.h b/include/dlt/dlt_types.h index e1372ef..9685eae 100755 --- a/include/dlt/dlt_types.h +++ b/include/dlt/dlt_types.h @@ -1,37 +1,22 @@ -/* - * Dlt- Diagnostic Log and Trace - * @licence app begin@ - * - * Copyright (C) 2011, BMW AG - Alexander Wenzel - * - * This program is free software; you can redistribute it and/or modify it under the terms of the - * GNU Lesser General Public License, version 2.1, as published by the Free Software Foundation. - * 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 Lesser General - * Public License, version 2.1, for more details. - * - * You should have received a copy of the GNU Lesser General Public License, version 2.1, along - * with this program; if not, see . - * - * Note that the copyright holders assume that the GNU Lesser General Public License, version 2.1, may - * also be applicable to programs even in cases in which the program is not a library in the technical sense. - * - * Linking DLT statically or dynamically with other modules is making a combined work based on DLT. You may - * license such other modules under the GNU Lesser General Public License, version 2.1. If you do not want to - * license your linked modules under the GNU Lesser General Public License, version 2.1, you - * may use the program under the following exception. - * - * As a special exception, the copyright holders of DLT give you permission to combine DLT - * with software programs or libraries that are released under any license unless such a combination is not - * permitted by the license of such a software program or library. You may copy and distribute such a - * system following the terms of the GNU Lesser General Public License, version 2.1, including this - * special exception, for DLT and the licenses of the other code concerned. - * - * Note that people who make modified versions of DLT are not obligated to grant this special exception - * for their modified versions; it is their choice whether to do so. The GNU Lesser General Public License, - * version 2.1, gives permission to release a modified version without this exception; this exception - * also makes it possible to release a modified version which carries forward this exception. - * +/** + * @licence app begin@ + * Copyright (C) 2012 BMW AG + * + * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps. + * + * Contributions are licensed to the GENIVI Alliance under one or more + * Contribution License Agreements. + * + * \copyright + * 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/. + * + * + * \author Alexander Wenzel BMW 2011-2012 + * + * \file + * For further information see http://www.genivi.org/. * @licence end@ */ diff --git a/include/dlt/dlt_user.h b/include/dlt/dlt_user.h index b6f2e39..c079dd4 100755 --- a/include/dlt/dlt_user.h +++ b/include/dlt/dlt_user.h @@ -1,37 +1,22 @@ -/* - * Dlt- Diagnostic Log and Trace console apps +/** * @licence app begin@ + * Copyright (C) 2012 BMW AG + * + * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps. + * + * Contributions are licensed to the GENIVI Alliance under one or more + * Contribution License Agreements. + * + * \copyright + * 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/. + * * - * Copyright (C) 2011, BMW AG - Alexander Wenzel - * - * This program is free software; you can redistribute it and/or modify it under the terms of the - * GNU Lesser General Public License, version 2.1, as published by the Free Software Foundation. - * 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 Lesser General - * Public License, version 2.1, for more details. - * - * You should have received a copy of the GNU Lesser General Public License, version 2.1, along - * with this program; if not, see . - * - * Note that the copyright holders assume that the GNU Lesser General Public License, version 2.1, may - * also be applicable to programs even in cases in which the program is not a library in the technical sense. - * - * Linking DLT statically or dynamically with other modules is making a combined work based on DLT. You may - * license such other modules under the GNU Lesser General Public License, version 2.1. If you do not want to - * license your linked modules under the GNU Lesser General Public License, version 2.1, you - * may use the program under the following exception. - * - * As a special exception, the copyright holders of DLT give you permission to combine DLT - * with software programs or libraries that are released under any license unless such a combination is not - * permitted by the license of such a software program or library. You may copy and distribute such a - * system following the terms of the GNU Lesser General Public License, version 2.1, including this - * special exception, for DLT and the licenses of the other code concerned. - * - * Note that people who make modified versions of DLT are not obligated to grant this special exception - * for their modified versions; it is their choice whether to do so. The GNU Lesser General Public License, - * version 2.1, gives permission to release a modified version without this exception; this exception - * also makes it possible to release a modified version which carries forward this exception. + * \author Alexander Wenzel BMW 2011-2012 * + * \file + * For further information see http://www.genivi.org/. * @licence end@ */ diff --git a/include/dlt/dlt_user_macros.h b/include/dlt/dlt_user_macros.h index 1916e9c..e6420ec 100755 --- a/include/dlt/dlt_user_macros.h +++ b/include/dlt/dlt_user_macros.h @@ -1,37 +1,22 @@ -/* - * Dlt- Diagnostic Log and Trace console apps +/** * @licence app begin@ + * Copyright (C) 2012 BMW AG + * + * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps. + * + * Contributions are licensed to the GENIVI Alliance under one or more + * Contribution License Agreements. + * + * \copyright + * 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/. + * * - * Copyright (C) 2011, BMW AG - Alexander Wenzel - * - * This program is free software; you can redistribute it and/or modify it under the terms of the - * GNU Lesser General Public License, version 2.1, as published by the Free Software Foundation. - * 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 Lesser General - * Public License, version 2.1, for more details. - * - * You should have received a copy of the GNU Lesser General Public License, version 2.1, along - * with this program; if not, see . - * - * Note that the copyright holders assume that the GNU Lesser General Public License, version 2.1, may - * also be applicable to programs even in cases in which the program is not a library in the technical sense. - * - * Linking DLT statically or dynamically with other modules is making a combined work based on DLT. You may - * license such other modules under the GNU Lesser General Public License, version 2.1. If you do not want to - * license your linked modules under the GNU Lesser General Public License, version 2.1, you - * may use the program under the following exception. - * - * As a special exception, the copyright holders of DLT give you permission to combine DLT - * with software programs or libraries that are released under any license unless such a combination is not - * permitted by the license of such a software program or library. You may copy and distribute such a - * system following the terms of the GNU Lesser General Public License, version 2.1, including this - * special exception, for DLT and the licenses of the other code concerned. - * - * Note that people who make modified versions of DLT are not obligated to grant this special exception - * for their modified versions; it is their choice whether to do so. The GNU Lesser General Public License, - * version 2.1, gives permission to release a modified version without this exception; this exception - * also makes it possible to release a modified version which carries forward this exception. + * \author Alexander Wenzel BMW 2011-2012 * + * \file + * For further information see http://www.genivi.org/. * @licence end@ */ -- cgit v1.2.1 From a14c8dd5c5949fca38bf9e269259798809f8b4dd Mon Sep 17 00:00:00 2001 From: Lassi Marttala Date: Mon, 26 Mar 2012 11:25:36 +0200 Subject: GDLT-38, Update license in internal headers. --- src/daemon/dlt-daemon.h | 53 ++++++++++++++----------------------- src/daemon/dlt-daemon_cfg.h | 53 ++++++++++++++----------------------- src/daemon/dlt_daemon_common.h | 53 ++++++++++++++----------------------- src/daemon/dlt_daemon_common_cfg.h | 54 ++++++++++++++------------------------ src/lib/dlt_client_cfg.h | 53 ++++++++++++++----------------------- src/lib/dlt_user_cfg.h | 53 ++++++++++++++----------------------- src/shared/dlt_common_cfg.h | 53 ++++++++++++++----------------------- src/shared/dlt_user_shared.h | 54 ++++++++++++++------------------------ src/shared/dlt_user_shared_cfg.h | 54 ++++++++++++++------------------------ src/system/dlt-system-log.h | 48 ++++++++++++--------------------- src/system/dlt-system.h | 48 ++++++++++++--------------------- src/system/dlt-system_cfg.h | 48 ++++++++++++--------------------- src/tests/dlt-test-multi-process.h | 40 +++++++++------------------- 13 files changed, 238 insertions(+), 426 deletions(-) diff --git a/src/daemon/dlt-daemon.h b/src/daemon/dlt-daemon.h index 16d7d61..602d007 100755 --- a/src/daemon/dlt-daemon.h +++ b/src/daemon/dlt-daemon.h @@ -1,37 +1,22 @@ -/* - * Dlt- Diagnostic Log and Trace daemon - * @licence app begin@ - * - * Copyright (C) 2011, BMW AG - Alexander Wenzel - * - * This program is free software; you can redistribute it and/or modify it under the terms of the - * GNU Lesser General Public License, version 2.1, as published by the Free Software Foundation. - * 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 Lesser General - * Public License, version 2.1, for more details. - * - * You should have received a copy of the GNU Lesser General Public License, version 2.1, along - * with this program; if not, see . - * - * Note that the copyright holders assume that the GNU Lesser General Public License, version 2.1, may - * also be applicable to programs even in cases in which the program is not a library in the technical sense. - * - * Linking DLT statically or dynamically with other modules is making a combined work based on DLT. You may - * license such other modules under the GNU Lesser General Public License, version 2.1. If you do not want to - * license your linked modules under the GNU Lesser General Public License, version 2.1, you - * may use the program under the following exception. - * - * As a special exception, the copyright holders of DLT give you permission to combine DLT - * with software programs or libraries that are released under any license unless such a combination is not - * permitted by the license of such a software program or library. You may copy and distribute such a - * system following the terms of the GNU Lesser General Public License, version 2.1, including this - * special exception, for DLT and the licenses of the other code concerned. - * - * Note that people who make modified versions of DLT are not obligated to grant this special exception - * for their modified versions; it is their choice whether to do so. The GNU Lesser General Public License, - * version 2.1, gives permission to release a modified version without this exception; this exception - * also makes it possible to release a modified version which carries forward this exception. - * +/** + * @licence app begin@ + * Copyright (C) 2012 BMW AG + * + * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps. + * + * Contributions are licensed to the GENIVI Alliance under one or more + * Contribution License Agreements. + * + * \copyright + * 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/. + * + * + * \author Alexander Wenzel BMW 2011-2012 + * + * \file + * For further information see http://www.genivi.org/. * @licence end@ */ diff --git a/src/daemon/dlt-daemon_cfg.h b/src/daemon/dlt-daemon_cfg.h index c69c1a1..b958fe3 100755 --- a/src/daemon/dlt-daemon_cfg.h +++ b/src/daemon/dlt-daemon_cfg.h @@ -1,37 +1,22 @@ -/* - * Dlt- Diagnostic Log and Trace daemon - * @licence app begin@ - * - * Copyright (C) 2011, BMW AG - Alexander Wenzel - * - * This program is free software; you can redistribute it and/or modify it under the terms of the - * GNU Lesser General Public License, version 2.1, as published by the Free Software Foundation. - * 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 Lesser General - * Public License, version 2.1, for more details. - * - * You should have received a copy of the GNU Lesser General Public License, version 2.1, along - * with this program; if not, see . - * - * Note that the copyright holders assume that the GNU Lesser General Public License, version 2.1, may - * also be applicable to programs even in cases in which the program is not a library in the technical sense. - * - * Linking DLT statically or dynamically with other modules is making a combined work based on DLT. You may - * license such other modules under the GNU Lesser General Public License, version 2.1. If you do not want to - * license your linked modules under the GNU Lesser General Public License, version 2.1, you - * may use the program under the following exception. - * - * As a special exception, the copyright holders of DLT give you permission to combine DLT - * with software programs or libraries that are released under any license unless such a combination is not - * permitted by the license of such a software program or library. You may copy and distribute such a - * system following the terms of the GNU Lesser General Public License, version 2.1, including this - * special exception, for DLT and the licenses of the other code concerned. - * - * Note that people who make modified versions of DLT are not obligated to grant this special exception - * for their modified versions; it is their choice whether to do so. The GNU Lesser General Public License, - * version 2.1, gives permission to release a modified version without this exception; this exception - * also makes it possible to release a modified version which carries forward this exception. - * +/** + * @licence app begin@ + * Copyright (C) 2012 BMW AG + * + * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps. + * + * Contributions are licensed to the GENIVI Alliance under one or more + * Contribution License Agreements. + * + * \copyright + * 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/. + * + * + * \author Alexander Wenzel BMW 2011-2012 + * + * \file + * For further information see http://www.genivi.org/. * @licence end@ */ diff --git a/src/daemon/dlt_daemon_common.h b/src/daemon/dlt_daemon_common.h index 1870295..3dcd596 100755 --- a/src/daemon/dlt_daemon_common.h +++ b/src/daemon/dlt_daemon_common.h @@ -1,37 +1,22 @@ -/* - * Dlt- Diagnostic Log and Trace daemon - * @licence app begin@ - * - * Copyright (C) 2011, BMW AG - Alexander Wenzel - * - * This program is free software; you can redistribute it and/or modify it under the terms of the - * GNU Lesser General Public License, version 2.1, as published by the Free Software Foundation. - * 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 Lesser General - * Public License, version 2.1, for more details. - * - * You should have received a copy of the GNU Lesser General Public License, version 2.1, along - * with this program; if not, see . - * - * Note that the copyright holders assume that the GNU Lesser General Public License, version 2.1, may - * also be applicable to programs even in cases in which the program is not a library in the technical sense. - * - * Linking DLT statically or dynamically with other modules is making a combined work based on DLT. You may - * license such other modules under the GNU Lesser General Public License, version 2.1. If you do not want to - * license your linked modules under the GNU Lesser General Public License, version 2.1, you - * may use the program under the following exception. - * - * As a special exception, the copyright holders of DLT give you permission to combine DLT - * with software programs or libraries that are released under any license unless such a combination is not - * permitted by the license of such a software program or library. You may copy and distribute such a - * system following the terms of the GNU Lesser General Public License, version 2.1, including this - * special exception, for DLT and the licenses of the other code concerned. - * - * Note that people who make modified versions of DLT are not obligated to grant this special exception - * for their modified versions; it is their choice whether to do so. The GNU Lesser General Public License, - * version 2.1, gives permission to release a modified version without this exception; this exception - * also makes it possible to release a modified version which carries forward this exception. - * +/** + * @licence app begin@ + * Copyright (C) 2012 BMW AG + * + * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps. + * + * Contributions are licensed to the GENIVI Alliance under one or more + * Contribution License Agreements. + * + * \copyright + * 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/. + * + * + * \author Alexander Wenzel BMW 2011-2012 + * + * \file + * For further information see http://www.genivi.org/. * @licence end@ */ diff --git a/src/daemon/dlt_daemon_common_cfg.h b/src/daemon/dlt_daemon_common_cfg.h index 9248bfb..8cc7dc6 100755 --- a/src/daemon/dlt_daemon_common_cfg.h +++ b/src/daemon/dlt_daemon_common_cfg.h @@ -1,41 +1,27 @@ -/* - * Dlt- Diagnostic Log and Trace daemon - * @licence app begin@ - * - * Copyright (C) 2011, BMW AG - Alexander Wenzel - * - * This program is free software; you can redistribute it and/or modify it under the terms of the - * GNU Lesser General Public License, version 2.1, as published by the Free Software Foundation. - * 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 Lesser General - * Public License, version 2.1, for more details. - * - * You should have received a copy of the GNU Lesser General Public License, version 2.1, along - * with this program; if not, see . - * - * Note that the copyright holders assume that the GNU Lesser General Public License, version 2.1, may - * also be applicable to programs even in cases in which the program is not a library in the technical sense. - * - * Linking DLT statically or dynamically with other modules is making a combined work based on DLT. You may - * license such other modules under the GNU Lesser General Public License, version 2.1. If you do not want to - * license your linked modules under the GNU Lesser General Public License, version 2.1, you - * may use the program under the following exception. - * - * As a special exception, the copyright holders of DLT give you permission to combine DLT - * with software programs or libraries that are released under any license unless such a combination is not - * permitted by the license of such a software program or library. You may copy and distribute such a - * system following the terms of the GNU Lesser General Public License, version 2.1, including this - * special exception, for DLT and the licenses of the other code concerned. - * - * Note that people who make modified versions of DLT are not obligated to grant this special exception - * for their modified versions; it is their choice whether to do so. The GNU Lesser General Public License, - * version 2.1, gives permission to release a modified version without this exception; this exception - * also makes it possible to release a modified version which carries forward this exception. - * +/** + * @licence app begin@ + * Copyright (C) 2012 BMW AG + * + * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps. + * + * Contributions are licensed to the GENIVI Alliance under one or more + * Contribution License Agreements. + * + * \copyright + * 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/. + * + * + * \author Alexander Wenzel BMW 2011-2012 + * + * \file + * For further information see http://www.genivi.org/. * @licence end@ */ + /******************************************************************************* ** ** ** SRC-MODULE: dlt_daemon_common_cfg.h ** diff --git a/src/lib/dlt_client_cfg.h b/src/lib/dlt_client_cfg.h index 52182b3..f4c14e3 100755 --- a/src/lib/dlt_client_cfg.h +++ b/src/lib/dlt_client_cfg.h @@ -1,37 +1,22 @@ -/* - * Dlt- Diagnostic Log and Trace daemon - * @licence app begin@ - * - * Copyright (C) 2011, BMW AG - Alexander Wenzel - * - * This program is free software; you can redistribute it and/or modify it under the terms of the - * GNU Lesser General Public License, version 2.1, as published by the Free Software Foundation. - * 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 Lesser General - * Public License, version 2.1, for more details. - * - * You should have received a copy of the GNU Lesser General Public License, version 2.1, along - * with this program; if not, see . - * - * Note that the copyright holders assume that the GNU Lesser General Public License, version 2.1, may - * also be applicable to programs even in cases in which the program is not a library in the technical sense. - * - * Linking DLT statically or dynamically with other modules is making a combined work based on DLT. You may - * license such other modules under the GNU Lesser General Public License, version 2.1. If you do not want to - * license your linked modules under the GNU Lesser General Public License, version 2.1, you - * may use the program under the following exception. - * - * As a special exception, the copyright holders of DLT give you permission to combine DLT - * with software programs or libraries that are released under any license unless such a combination is not - * permitted by the license of such a software program or library. You may copy and distribute such a - * system following the terms of the GNU Lesser General Public License, version 2.1, including this - * special exception, for DLT and the licenses of the other code concerned. - * - * Note that people who make modified versions of DLT are not obligated to grant this special exception - * for their modified versions; it is their choice whether to do so. The GNU Lesser General Public License, - * version 2.1, gives permission to release a modified version without this exception; this exception - * also makes it possible to release a modified version which carries forward this exception. - * +/** + * @licence app begin@ + * Copyright (C) 2012 BMW AG + * + * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps. + * + * Contributions are licensed to the GENIVI Alliance under one or more + * Contribution License Agreements. + * + * \copyright + * 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/. + * + * + * \author Alexander Wenzel BMW 2011-2012 + * + * \file + * For further information see http://www.genivi.org/. * @licence end@ */ diff --git a/src/lib/dlt_user_cfg.h b/src/lib/dlt_user_cfg.h index 46e8c52..f3b3f34 100755 --- a/src/lib/dlt_user_cfg.h +++ b/src/lib/dlt_user_cfg.h @@ -1,37 +1,22 @@ -/* - * Dlt- Diagnostic Log and Trace daemon - * @licence app begin@ - * - * Copyright (C) 2011, BMW AG - Alexander Wenzel - * - * This program is free software; you can redistribute it and/or modify it under the terms of the - * GNU Lesser General Public License, version 2.1, as published by the Free Software Foundation. - * 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 Lesser General - * Public License, version 2.1, for more details. - * - * You should have received a copy of the GNU Lesser General Public License, version 2.1, along - * with this program; if not, see . - * - * Note that the copyright holders assume that the GNU Lesser General Public License, version 2.1, may - * also be applicable to programs even in cases in which the program is not a library in the technical sense. - * - * Linking DLT statically or dynamically with other modules is making a combined work based on DLT. You may - * license such other modules under the GNU Lesser General Public License, version 2.1. If you do not want to - * license your linked modules under the GNU Lesser General Public License, version 2.1, you - * may use the program under the following exception. - * - * As a special exception, the copyright holders of DLT give you permission to combine DLT - * with software programs or libraries that are released under any license unless such a combination is not - * permitted by the license of such a software program or library. You may copy and distribute such a - * system following the terms of the GNU Lesser General Public License, version 2.1, including this - * special exception, for DLT and the licenses of the other code concerned. - * - * Note that people who make modified versions of DLT are not obligated to grant this special exception - * for their modified versions; it is their choice whether to do so. The GNU Lesser General Public License, - * version 2.1, gives permission to release a modified version without this exception; this exception - * also makes it possible to release a modified version which carries forward this exception. - * +/** + * @licence app begin@ + * Copyright (C) 2012 BMW AG + * + * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps. + * + * Contributions are licensed to the GENIVI Alliance under one or more + * Contribution License Agreements. + * + * \copyright + * 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/. + * + * + * \author Alexander Wenzel BMW 2011-2012 + * + * \file + * For further information see http://www.genivi.org/. * @licence end@ */ diff --git a/src/shared/dlt_common_cfg.h b/src/shared/dlt_common_cfg.h index fd9da26..c08c39c 100755 --- a/src/shared/dlt_common_cfg.h +++ b/src/shared/dlt_common_cfg.h @@ -1,37 +1,22 @@ -/* - * Dlt- Diagnostic Log and Trace daemon - * @licence app begin@ - * - * Copyright (C) 2011, BMW AG - Alexander Wenzel - * - * This program is free software; you can redistribute it and/or modify it under the terms of the - * GNU Lesser General Public License, version 2.1, as published by the Free Software Foundation. - * 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 Lesser General - * Public License, version 2.1, for more details. - * - * You should have received a copy of the GNU Lesser General Public License, version 2.1, along - * with this program; if not, see . - * - * Note that the copyright holders assume that the GNU Lesser General Public License, version 2.1, may - * also be applicable to programs even in cases in which the program is not a library in the technical sense. - * - * Linking DLT statically or dynamically with other modules is making a combined work based on DLT. You may - * license such other modules under the GNU Lesser General Public License, version 2.1. If you do not want to - * license your linked modules under the GNU Lesser General Public License, version 2.1, you - * may use the program under the following exception. - * - * As a special exception, the copyright holders of DLT give you permission to combine DLT - * with software programs or libraries that are released under any license unless such a combination is not - * permitted by the license of such a software program or library. You may copy and distribute such a - * system following the terms of the GNU Lesser General Public License, version 2.1, including this - * special exception, for DLT and the licenses of the other code concerned. - * - * Note that people who make modified versions of DLT are not obligated to grant this special exception - * for their modified versions; it is their choice whether to do so. The GNU Lesser General Public License, - * version 2.1, gives permission to release a modified version without this exception; this exception - * also makes it possible to release a modified version which carries forward this exception. - * +/** + * @licence app begin@ + * Copyright (C) 2012 BMW AG + * + * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps. + * + * Contributions are licensed to the GENIVI Alliance under one or more + * Contribution License Agreements. + * + * \copyright + * 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/. + * + * + * \author Alexander Wenzel BMW 2011-2012 + * + * \file + * For further information see http://www.genivi.org/. * @licence end@ */ diff --git a/src/shared/dlt_user_shared.h b/src/shared/dlt_user_shared.h index 0fd6367..9ffcce8 100755 --- a/src/shared/dlt_user_shared.h +++ b/src/shared/dlt_user_shared.h @@ -1,41 +1,27 @@ -/* - * Dlt- Diagnostic Log and Trace daemon - * @licence app begin@ - * - * Copyright (C) 2011, BMW AG - Alexander Wenzel - * - * This program is free software; you can redistribute it and/or modify it under the terms of the - * GNU Lesser General Public License, version 2.1, as published by the Free Software Foundation. - * 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 Lesser General - * Public License, version 2.1, for more details. - * - * You should have received a copy of the GNU Lesser General Public License, version 2.1, along - * with this program; if not, see . - * - * Note that the copyright holders assume that the GNU Lesser General Public License, version 2.1, may - * also be applicable to programs even in cases in which the program is not a library in the technical sense. - * - * Linking DLT statically or dynamically with other modules is making a combined work based on DLT. You may - * license such other modules under the GNU Lesser General Public License, version 2.1. If you do not want to - * license your linked modules under the GNU Lesser General Public License, version 2.1, you - * may use the program under the following exception. - * - * As a special exception, the copyright holders of DLT give you permission to combine DLT - * with software programs or libraries that are released under any license unless such a combination is not - * permitted by the license of such a software program or library. You may copy and distribute such a - * system following the terms of the GNU Lesser General Public License, version 2.1, including this - * special exception, for DLT and the licenses of the other code concerned. - * - * Note that people who make modified versions of DLT are not obligated to grant this special exception - * for their modified versions; it is their choice whether to do so. The GNU Lesser General Public License, - * version 2.1, gives permission to release a modified version without this exception; this exception - * also makes it possible to release a modified version which carries forward this exception. - * +/** + * @licence app begin@ + * Copyright (C) 2012 BMW AG + * + * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps. + * + * Contributions are licensed to the GENIVI Alliance under one or more + * Contribution License Agreements. + * + * \copyright + * 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/. + * + * + * \author Alexander Wenzel BMW 2011-2012 + * + * \file + * For further information see http://www.genivi.org/. * @licence end@ */ + /******************************************************************************* ** ** ** SRC-MODULE: dlt_user_shared.h ** diff --git a/src/shared/dlt_user_shared_cfg.h b/src/shared/dlt_user_shared_cfg.h index b784566..2357467 100755 --- a/src/shared/dlt_user_shared_cfg.h +++ b/src/shared/dlt_user_shared_cfg.h @@ -1,41 +1,27 @@ -/* - * Dlt- Diagnostic Log and Trace daemon - * @licence app begin@ - * - * Copyright (C) 2011, BMW AG - Alexander Wenzel - * - * This program is free software; you can redistribute it and/or modify it under the terms of the - * GNU Lesser General Public License, version 2.1, as published by the Free Software Foundation. - * 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 Lesser General - * Public License, version 2.1, for more details. - * - * You should have received a copy of the GNU Lesser General Public License, version 2.1, along - * with this program; if not, see . - * - * Note that the copyright holders assume that the GNU Lesser General Public License, version 2.1, may - * also be applicable to programs even in cases in which the program is not a library in the technical sense. - * - * Linking DLT statically or dynamically with other modules is making a combined work based on DLT. You may - * license such other modules under the GNU Lesser General Public License, version 2.1. If you do not want to - * license your linked modules under the GNU Lesser General Public License, version 2.1, you - * may use the program under the following exception. - * - * As a special exception, the copyright holders of DLT give you permission to combine DLT - * with software programs or libraries that are released under any license unless such a combination is not - * permitted by the license of such a software program or library. You may copy and distribute such a - * system following the terms of the GNU Lesser General Public License, version 2.1, including this - * special exception, for DLT and the licenses of the other code concerned. - * - * Note that people who make modified versions of DLT are not obligated to grant this special exception - * for their modified versions; it is their choice whether to do so. The GNU Lesser General Public License, - * version 2.1, gives permission to release a modified version without this exception; this exception - * also makes it possible to release a modified version which carries forward this exception. - * +/** + * @licence app begin@ + * Copyright (C) 2012 BMW AG + * + * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps. + * + * Contributions are licensed to the GENIVI Alliance under one or more + * Contribution License Agreements. + * + * \copyright + * 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/. + * + * + * \author Alexander Wenzel BMW 2011-2012 + * + * \file + * For further information see http://www.genivi.org/. * @licence end@ */ + /******************************************************************************* ** ** ** SRC-MODULE: dlt_user_shared_cfg.h ** diff --git a/src/system/dlt-system-log.h b/src/system/dlt-system-log.h index e0ba49d..55ac808 100644 --- a/src/system/dlt-system-log.h +++ b/src/system/dlt-system-log.h @@ -1,40 +1,26 @@ -/* - * Dlt system manager to Dlt +/** * @licence app begin@ + * Copyright (C) 2012 BMW AG * - * Copyright (C) 2011, BMW AG - Alexander Wenzel - * - * This program is free software; you can redistribute it and/or modify it under the terms of the - * GNU Lesser General Public License, version 2.1, as published by the Free Software Foundation. - * 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 Lesser General - * Public License, version 2.1, for more details. - * - * You should have received a copy of the GNU Lesser General Public License, version 2.1, along - * with this program; if not, see . - * - * Note that the copyright holders assume that the GNU Lesser General Public License, version 2.1, may - * also be applicable to programs even in cases in which the program is not a library in the technical sense. - * - * Linking DLT statically or dynamically with other modules is making a combined work based on DLT. You may - * license such other modules under the GNU Lesser General Public License, version 2.1. If you do not want to - * license your linked modules under the GNU Lesser General Public License, version 2.1, you - * may use the program under the following exception. - * - * As a special exception, the copyright holders of DLT give you permission to combine DLT - * with software programs or libraries that are released under any license unless such a combination is not - * permitted by the license of such a software program or library. You may copy and distribute such a - * system following the terms of the GNU Lesser General Public License, version 2.1, including this - * special exception, for DLT and the licenses of the other code concerned. - * - * Note that people who make modified versions of DLT are not obligated to grant this special exception - * for their modified versions; it is their choice whether to do so. The GNU Lesser General Public License, - * version 2.1, gives permission to release a modified version without this exception; this exception - * also makes it possible to release a modified version which carries forward this exception. + * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps. * + * Contributions are licensed to the GENIVI Alliance under one or more + * Contribution License Agreements. + * + * \copyright + * 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/. + * + * + * \author Alexander Wenzel BMW 2011-2012 + * + * \file + * For further information see http://www.genivi.org/. * @licence end@ */ + /******************************************************************************* ** ** ** SRC-MODULE: dlt-system-log.h ** diff --git a/src/system/dlt-system.h b/src/system/dlt-system.h index 210de3c..55e15cc 100644 --- a/src/system/dlt-system.h +++ b/src/system/dlt-system.h @@ -1,40 +1,26 @@ -/* - * Dlt system manager to Dlt +/** * @licence app begin@ + * Copyright (C) 2012 BMW AG * - * Copyright (C) 2011, BMW AG - Alexander Wenzel - * - * This program is free software; you can redistribute it and/or modify it under the terms of the - * GNU Lesser General Public License, version 2.1, as published by the Free Software Foundation. - * 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 Lesser General - * Public License, version 2.1, for more details. - * - * You should have received a copy of the GNU Lesser General Public License, version 2.1, along - * with this program; if not, see . - * - * Note that the copyright holders assume that the GNU Lesser General Public License, version 2.1, may - * also be applicable to programs even in cases in which the program is not a library in the technical sense. - * - * Linking DLT statically or dynamically with other modules is making a combined work based on DLT. You may - * license such other modules under the GNU Lesser General Public License, version 2.1. If you do not want to - * license your linked modules under the GNU Lesser General Public License, version 2.1, you - * may use the program under the following exception. - * - * As a special exception, the copyright holders of DLT give you permission to combine DLT - * with software programs or libraries that are released under any license unless such a combination is not - * permitted by the license of such a software program or library. You may copy and distribute such a - * system following the terms of the GNU Lesser General Public License, version 2.1, including this - * special exception, for DLT and the licenses of the other code concerned. - * - * Note that people who make modified versions of DLT are not obligated to grant this special exception - * for their modified versions; it is their choice whether to do so. The GNU Lesser General Public License, - * version 2.1, gives permission to release a modified version without this exception; this exception - * also makes it possible to release a modified version which carries forward this exception. + * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps. * + * Contributions are licensed to the GENIVI Alliance under one or more + * Contribution License Agreements. + * + * \copyright + * 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/. + * + * + * \author Alexander Wenzel BMW 2011-2012 + * + * \file + * For further information see http://www.genivi.org/. * @licence end@ */ + /******************************************************************************* ** ** ** SRC-MODULE: dlt-system.h ** diff --git a/src/system/dlt-system_cfg.h b/src/system/dlt-system_cfg.h index 82260a3..fce27e6 100644 --- a/src/system/dlt-system_cfg.h +++ b/src/system/dlt-system_cfg.h @@ -1,40 +1,26 @@ -/* - * Dlt system manager to Dlt +/** * @licence app begin@ + * Copyright (C) 2012 BMW AG * - * Copyright (C) 2011, BMW AG - Alexander Wenzel - * - * This program is free software; you can redistribute it and/or modify it under the terms of the - * GNU Lesser General Public License, version 2.1, as published by the Free Software Foundation. - * 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 Lesser General - * Public License, version 2.1, for more details. - * - * You should have received a copy of the GNU Lesser General Public License, version 2.1, along - * with this program; if not, see . - * - * Note that the copyright holders assume that the GNU Lesser General Public License, version 2.1, may - * also be applicable to programs even in cases in which the program is not a library in the technical sense. - * - * Linking DLT statically or dynamically with other modules is making a combined work based on DLT. You may - * license such other modules under the GNU Lesser General Public License, version 2.1. If you do not want to - * license your linked modules under the GNU Lesser General Public License, version 2.1, you - * may use the program under the following exception. - * - * As a special exception, the copyright holders of DLT give you permission to combine DLT - * with software programs or libraries that are released under any license unless such a combination is not - * permitted by the license of such a software program or library. You may copy and distribute such a - * system following the terms of the GNU Lesser General Public License, version 2.1, including this - * special exception, for DLT and the licenses of the other code concerned. - * - * Note that people who make modified versions of DLT are not obligated to grant this special exception - * for their modified versions; it is their choice whether to do so. The GNU Lesser General Public License, - * version 2.1, gives permission to release a modified version without this exception; this exception - * also makes it possible to release a modified version which carries forward this exception. + * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps. * + * Contributions are licensed to the GENIVI Alliance under one or more + * Contribution License Agreements. + * + * \copyright + * 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/. + * + * + * \author Alexander Wenzel BMW 2011-2012 + * + * \file + * For further information see http://www.genivi.org/. * @licence end@ */ + /******************************************************************************* ** ** ** SRC-MODULE: dlt-system_cfg.h ** diff --git a/src/tests/dlt-test-multi-process.h b/src/tests/dlt-test-multi-process.h index 304b6fb..92a8a5a 100644 --- a/src/tests/dlt-test-multi-process.h +++ b/src/tests/dlt-test-multi-process.h @@ -1,40 +1,26 @@ -/* - * DLT multi process tester +/** * @licence app begin@ + * Copyright (C) 2012 BMW AG * - * Copyright (C) 2011, BMW AG - Lassi Marttala + * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps. * - * This program is free software; you can redistribute it and/or modify it under the terms of the - * GNU Lesser General Public License, version 2.1, as published by the Free Software Foundation. - * 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 Lesser General - * Public License, version 2.1, for more details. + * Contributions are licensed to the GENIVI Alliance under one or more + * Contribution License Agreements. * - * You should have received a copy of the GNU Lesser General Public License, version 2.1, along - * with this program; if not, see . + * \copyright + * 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/. * - * Note that the copyright holders assume that the GNU Lesser General Public License, version 2.1, may - * also be applicable to programs even in cases in which the program is not a library in the technical sense. * - * Linking DLT statically or dynamically with other modules is making a combined work based on DLT. You may - * license such other modules under the GNU Lesser General Public License, version 2.1. If you do not want to - * license your linked modules under the GNU Lesser General Public License, version 2.1, you - * may use the program under the following exception. - * - * As a special exception, the copyright holders of DLT give you permission to combine DLT - * with software programs or libraries that are released under any license unless such a combination is not - * permitted by the license of such a software program or library. You may copy and distribute such a - * system following the terms of the GNU Lesser General Public License, version 2.1, including this - * special exception, for DLT and the licenses of the other code concerned. - * - * Note that people who make modified versions of DLT are not obligated to grant this special exception - * for their modified versions; it is their choice whether to do so. The GNU Lesser General Public License, - * version 2.1, gives permission to release a modified version without this exception; this exception - * also makes it possible to release a modified version which carries forward this exception. + * \author Lassi Marttala BMW 2011-2012 * + * \file + * For further information see http://www.genivi.org/. * @licence end@ */ + #ifndef DLT_TEST_MULTI_PROCESS_H_ #define DLT_TEST_MULTI_PROCESS_H_ -- cgit v1.2.1 From ea10cd0161638a5dd7a1ed82321e1ef5a4798c04 Mon Sep 17 00:00:00 2001 From: Lassi Marttala Date: Mon, 26 Mar 2012 11:30:58 +0200 Subject: GDLT-38, Update licenses to all the sources. --- src/adaptor/dlt-adaptor-stdin.c | 47 ++++++++++----------------- src/adaptor/dlt-adaptor-udp.c | 47 ++++++++++----------------- src/console/dlt-convert.c | 47 ++++++++++----------------- src/console/dlt-receive.c | 47 ++++++++++----------------- src/daemon/dlt-daemon.c | 48 ++++++++++------------------ src/daemon/dlt_daemon_common.c | 47 ++++++++++----------------- src/examples/dlt-example-filetransfer.c | 47 ++++++++++----------------- src/examples/dlt-example-user-func.c | 48 ++++++++++------------------ src/examples/dlt-example-user.c | 47 ++++++++++----------------- src/lib/dlt_client.c | 47 ++++++++++----------------- src/lib/dlt_filetransfer.c | 47 ++++++++++----------------- src/lib/dlt_user.c | 51 +++++++++++------------------ src/shared/dlt_common.c | 47 ++++++++++----------------- src/shared/dlt_offline_trace.c | 51 +++++++++++------------------ src/shared/dlt_shm.c | 51 +++++++++++------------------ src/shared/dlt_user_shared.c | 47 ++++++++++----------------- src/system/dlt-system-log.c | 47 ++++++++++----------------- src/system/dlt-system.c | 47 ++++++++++----------------- src/tests/dlt-test-client.c | 47 ++++++++++----------------- src/tests/dlt-test-filetransfer.c | 47 ++++++++++----------------- src/tests/dlt-test-multi-process-client.c | 39 +++++++---------------- src/tests/dlt-test-multi-process.c | 39 +++++++---------------- src/tests/dlt-test-stress-client.c | 48 ++++++++++------------------ src/tests/dlt-test-stress-user.c | 47 ++++++++++----------------- src/tests/dlt-test-stress.c | 47 ++++++++++----------------- src/tests/dlt-test-user.c | 53 +++++++++++-------------------- 26 files changed, 417 insertions(+), 810 deletions(-) diff --git a/src/adaptor/dlt-adaptor-stdin.c b/src/adaptor/dlt-adaptor-stdin.c index c0d7c0f..7646bc9 100755 --- a/src/adaptor/dlt-adaptor-stdin.c +++ b/src/adaptor/dlt-adaptor-stdin.c @@ -1,37 +1,22 @@ -/* - * Dlt Adaptor for forwarding Standard In messages to Dlt +/** * @licence app begin@ + * Copyright (C) 2012 BMW AG + * + * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps. + * + * Contributions are licensed to the GENIVI Alliance under one or more + * Contribution License Agreements. + * + * \copyright + * 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/. + * * - * Copyright (C) 2011, BMW AG - Alexander Wenzel - * - * This program is free software; you can redistribute it and/or modify it under the terms of the - * GNU Lesser General Public License, version 2.1, as published by the Free Software Foundation. - * 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 Lesser General - * Public License, version 2.1, for more details. - * - * You should have received a copy of the GNU Lesser General Public License, version 2.1, along - * with this program; if not, see . - * - * Note that the copyright holders assume that the GNU Lesser General Public License, version 2.1, may - * also be applicable to programs even in cases in which the program is not a library in the technical sense. - * - * Linking DLT statically or dynamically with other modules is making a combined work based on DLT. You may - * license such other modules under the GNU Lesser General Public License, version 2.1. If you do not want to - * license your linked modules under the GNU Lesser General Public License, version 2.1, you - * may use the program under the following exception. - * - * As a special exception, the copyright holders of DLT give you permission to combine DLT - * with software programs or libraries that are released under any license unless such a combination is not - * permitted by the license of such a software program or library. You may copy and distribute such a - * system following the terms of the GNU Lesser General Public License, version 2.1, including this - * special exception, for DLT and the licenses of the other code concerned. - * - * Note that people who make modified versions of DLT are not obligated to grant this special exception - * for their modified versions; it is their choice whether to do so. The GNU Lesser General Public License, - * version 2.1, gives permission to release a modified version without this exception; this exception - * also makes it possible to release a modified version which carries forward this exception. + * \author Alexander Wenzel BMW 2011-2012 * + * \file + * For further information see http://www.genivi.org/. * @licence end@ */ diff --git a/src/adaptor/dlt-adaptor-udp.c b/src/adaptor/dlt-adaptor-udp.c index a86a157..f2f17fd 100755 --- a/src/adaptor/dlt-adaptor-udp.c +++ b/src/adaptor/dlt-adaptor-udp.c @@ -1,37 +1,22 @@ -/* - * Dlt Adaptor for forwarding Syslog messages to Dlt +/** * @licence app begin@ + * Copyright (C) 2012 BMW AG + * + * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps. + * + * Contributions are licensed to the GENIVI Alliance under one or more + * Contribution License Agreements. + * + * \copyright + * 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/. + * * - * Copyright (C) 2011, BMW AG - Alexander Wenzel - * - * This program is free software; you can redistribute it and/or modify it under the terms of the - * GNU Lesser General Public License, version 2.1, as published by the Free Software Foundation. - * 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 Lesser General - * Public License, version 2.1, for more details. - * - * You should have received a copy of the GNU Lesser General Public License, version 2.1, along - * with this program; if not, see . - * - * Note that the copyright holders assume that the GNU Lesser General Public License, version 2.1, may - * also be applicable to programs even in cases in which the program is not a library in the technical sense. - * - * Linking DLT statically or dynamically with other modules is making a combined work based on DLT. You may - * license such other modules under the GNU Lesser General Public License, version 2.1. If you do not want to - * license your linked modules under the GNU Lesser General Public License, version 2.1, you - * may use the program under the following exception. - * - * As a special exception, the copyright holders of DLT give you permission to combine DLT - * with software programs or libraries that are released under any license unless such a combination is not - * permitted by the license of such a software program or library. You may copy and distribute such a - * system following the terms of the GNU Lesser General Public License, version 2.1, including this - * special exception, for DLT and the licenses of the other code concerned. - * - * Note that people who make modified versions of DLT are not obligated to grant this special exception - * for their modified versions; it is their choice whether to do so. The GNU Lesser General Public License, - * version 2.1, gives permission to release a modified version without this exception; this exception - * also makes it possible to release a modified version which carries forward this exception. + * \author Alexander Wenzel BMW 2011-2012 * + * \file + * For further information see http://www.genivi.org/. * @licence end@ */ diff --git a/src/console/dlt-convert.c b/src/console/dlt-convert.c index e86912a..0f97096 100755 --- a/src/console/dlt-convert.c +++ b/src/console/dlt-convert.c @@ -1,37 +1,22 @@ -/* - * Dlt Client console utilities - Diagnostic Log and Trace +/** * @licence app begin@ + * Copyright (C) 2012 BMW AG + * + * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps. + * + * Contributions are licensed to the GENIVI Alliance under one or more + * Contribution License Agreements. + * + * \copyright + * 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/. + * * - * Copyright (C) 2011, BMW AG - Alexander Wenzel - * - * This program is free software; you can redistribute it and/or modify it under the terms of the - * GNU Lesser General Public License, version 2.1, as published by the Free Software Foundation. - * 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 Lesser General - * Public License, version 2.1, for more details. - * - * You should have received a copy of the GNU Lesser General Public License, version 2.1, along - * with this program; if not, see . - * - * Note that the copyright holders assume that the GNU Lesser General Public License, version 2.1, may - * also be applicable to programs even in cases in which the program is not a library in the technical sense. - * - * Linking DLT statically or dynamically with other modules is making a combined work based on DLT. You may - * license such other modules under the GNU Lesser General Public License, version 2.1. If you do not want to - * license your linked modules under the GNU Lesser General Public License, version 2.1, you - * may use the program under the following exception. - * - * As a special exception, the copyright holders of DLT give you permission to combine DLT - * with software programs or libraries that are released under any license unless such a combination is not - * permitted by the license of such a software program or library. You may copy and distribute such a - * system following the terms of the GNU Lesser General Public License, version 2.1, including this - * special exception, for DLT and the licenses of the other code concerned. - * - * Note that people who make modified versions of DLT are not obligated to grant this special exception - * for their modified versions; it is their choice whether to do so. The GNU Lesser General Public License, - * version 2.1, gives permission to release a modified version without this exception; this exception - * also makes it possible to release a modified version which carries forward this exception. + * \author Alexander Wenzel BMW 2011-2012 * + * \file + * For further information see http://www.genivi.org/. * @licence end@ */ diff --git a/src/console/dlt-receive.c b/src/console/dlt-receive.c index e078d7d..d35131c 100755 --- a/src/console/dlt-receive.c +++ b/src/console/dlt-receive.c @@ -1,37 +1,22 @@ -/* - * Dlt Client console utilities - Diagnostic Log and Trace +/** * @licence app begin@ + * Copyright (C) 2012 BMW AG + * + * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps. + * + * Contributions are licensed to the GENIVI Alliance under one or more + * Contribution License Agreements. + * + * \copyright + * 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/. + * * - * Copyright (C) 2011, BMW AG - Alexander Wenzel - * - * This program is free software; you can redistribute it and/or modify it under the terms of the - * GNU Lesser General Public License, version 2.1, as published by the Free Software Foundation. - * 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 Lesser General - * Public License, version 2.1, for more details. - * - * You should have received a copy of the GNU Lesser General Public License, version 2.1, along - * with this program; if not, see . - * - * Note that the copyright holders assume that the GNU Lesser General Public License, version 2.1, may - * also be applicable to programs even in cases in which the program is not a library in the technical sense. - * - * Linking DLT statically or dynamically with other modules is making a combined work based on DLT. You may - * license such other modules under the GNU Lesser General Public License, version 2.1. If you do not want to - * license your linked modules under the GNU Lesser General Public License, version 2.1, you - * may use the program under the following exception. - * - * As a special exception, the copyright holders of DLT give you permission to combine DLT - * with software programs or libraries that are released under any license unless such a combination is not - * permitted by the license of such a software program or library. You may copy and distribute such a - * system following the terms of the GNU Lesser General Public License, version 2.1, including this - * special exception, for DLT and the licenses of the other code concerned. - * - * Note that people who make modified versions of DLT are not obligated to grant this special exception - * for their modified versions; it is their choice whether to do so. The GNU Lesser General Public License, - * version 2.1, gives permission to release a modified version without this exception; this exception - * also makes it possible to release a modified version which carries forward this exception. + * \author Alexander Wenzel BMW 2011-2012 * + * \file + * For further information see http://www.genivi.org/. * @licence end@ */ diff --git a/src/daemon/dlt-daemon.c b/src/daemon/dlt-daemon.c index c691162..99468ac 100755 --- a/src/daemon/dlt-daemon.c +++ b/src/daemon/dlt-daemon.c @@ -1,41 +1,25 @@ -/* - * Dlt Daemon - Diagnostic Log and Trace +/** * @licence app begin@ + * Copyright (C) 2012 BMW AG + * + * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps. + * + * Contributions are licensed to the GENIVI Alliance under one or more + * Contribution License Agreements. * - * Copyright (C) 2011, BMW AG - Alexander Wenzel - * - * This program is free software; you can redistribute it and/or modify it under the terms of the - * GNU Lesser General Public License, version 2.1, as published by the Free Software Foundation. - * 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 Lesser General - * Public License, version 2.1, for more details. - * - * You should have received a copy of the GNU Lesser General Public License, version 2.1, along - * with this program; if not, see . - * - * Note that the copyright holders assume that the GNU Lesser General Public License, version 2.1, may - * also be applicable to programs even in cases in which the program is not a library in the technical sense. - * - * Linking DLT statically or dynamically with other modules is making a combined work based on DLT. You may - * license such other modules under the GNU Lesser General Public License, version 2.1. If you do not want to - * license your linked modules under the GNU Lesser General Public License, version 2.1, you - * may use the program under the following exception. - * - * As a special exception, the copyright holders of DLT give you permission to combine DLT - * with software programs or libraries that are released under any license unless such a combination is not - * permitted by the license of such a software program or library. You may copy and distribute such a - * system following the terms of the GNU Lesser General Public License, version 2.1, including this - * special exception, for DLT and the licenses of the other code concerned. - * - * Note that people who make modified versions of DLT are not obligated to grant this special exception - * for their modified versions; it is their choice whether to do so. The GNU Lesser General Public License, - * version 2.1, gives permission to release a modified version without this exception; this exception - * also makes it possible to release a modified version which carries forward this exception. + * \copyright + * 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/. * + * + * \author Alexander Wenzel BMW 2011-2012 + * + * \file + * For further information see http://www.genivi.org/. * @licence end@ */ - /******************************************************************************* ** ** ** SRC-MODULE: dlt-daemon.c ** diff --git a/src/daemon/dlt_daemon_common.c b/src/daemon/dlt_daemon_common.c index 1c6b192..e1e7828 100755 --- a/src/daemon/dlt_daemon_common.c +++ b/src/daemon/dlt_daemon_common.c @@ -1,37 +1,22 @@ -/* - * Dlt Daemon - Diagnostic Log and Trace +/** * @licence app begin@ + * Copyright (C) 2012 BMW AG + * + * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps. + * + * Contributions are licensed to the GENIVI Alliance under one or more + * Contribution License Agreements. + * + * \copyright + * 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/. + * * - * Copyright (C) 2011, BMW AG - Alexander Wenzel - * - * This program is free software; you can redistribute it and/or modify it under the terms of the - * GNU Lesser General Public License, version 2.1, as published by the Free Software Foundation. - * 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 Lesser General - * Public License, version 2.1, for more details. - * - * You should have received a copy of the GNU Lesser General Public License, version 2.1, along - * with this program; if not, see . - * - * Note that the copyright holders assume that the GNU Lesser General Public License, version 2.1, may - * also be applicable to programs even in cases in which the program is not a library in the technical sense. - * - * Linking DLT statically or dynamically with other modules is making a combined work based on DLT. You may - * license such other modules under the GNU Lesser General Public License, version 2.1. If you do not want to - * license your linked modules under the GNU Lesser General Public License, version 2.1, you - * may use the program under the following exception. - * - * As a special exception, the copyright holders of DLT give you permission to combine DLT - * with software programs or libraries that are released under any license unless such a combination is not - * permitted by the license of such a software program or library. You may copy and distribute such a - * system following the terms of the GNU Lesser General Public License, version 2.1, including this - * special exception, for DLT and the licenses of the other code concerned. - * - * Note that people who make modified versions of DLT are not obligated to grant this special exception - * for their modified versions; it is their choice whether to do so. The GNU Lesser General Public License, - * version 2.1, gives permission to release a modified version without this exception; this exception - * also makes it possible to release a modified version which carries forward this exception. + * \author Alexander Wenzel BMW 2011-2012 * + * \file + * For further information see http://www.genivi.org/. * @licence end@ */ diff --git a/src/examples/dlt-example-filetransfer.c b/src/examples/dlt-example-filetransfer.c index 1843f4c..91201e7 100644 --- a/src/examples/dlt-example-filetransfer.c +++ b/src/examples/dlt-example-filetransfer.c @@ -1,37 +1,22 @@ -/* - * Dlt Test Client - Diagnostic Log and Trace +/** * @licence app begin@ + * Copyright (C) 2012 BMW AG + * + * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps. + * + * Contributions are licensed to the GENIVI Alliance under one or more + * Contribution License Agreements. + * + * \copyright + * 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/. + * * - * Copyright (C) 2011, BMW AG - Alexander Wenzel - * - * This program is free software; you can redistribute it and/or modify it under the terms of the - * GNU Lesser General Public License, version 2.1, as published by the Free Software Foundation. - * 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 Lesser General - * Public License, version 2.1, for more details. - * - * You should have received a copy of the GNU Lesser General Public License, version 2.1, along - * with this program; if not, see . - * - * Note that the copyright holders assume that the GNU Lesser General Public License, version 2.1, may - * also be applicable to programs even in cases in which the program is not a library in the technical sense. - * - * Linking DLT statically or dynamically with other modules is making a combined work based on DLT. You may - * license such other modules under the GNU Lesser General Public License, version 2.1. If you do not want to - * license your linked modules under the GNU Lesser General Public License, version 2.1, you - * may use the program under the following exception. - * - * As a special exception, the copyright holders of DLT give you permission to combine DLT - * with software programs or libraries that are released under any license unless such a combination is not - * permitted by the license of such a software program or library. You may copy and distribute such a - * system following the terms of the GNU Lesser General Public License, version 2.1, including this - * special exception, for DLT and the licenses of the other code concerned. - * - * Note that people who make modified versions of DLT are not obligated to grant this special exception - * for their modified versions; it is their choice whether to do so. The GNU Lesser General Public License, - * version 2.1, gives permission to release a modified version without this exception; this exception - * also makes it possible to release a modified version which carries forward this exception. + * \author Alexander Wenzel BMW 2011-2012 * + * \file + * For further information see http://www.genivi.org/. * @licence end@ */ diff --git a/src/examples/dlt-example-user-func.c b/src/examples/dlt-example-user-func.c index 2180a6b..5e50a3a 100755 --- a/src/examples/dlt-example-user-func.c +++ b/src/examples/dlt-example-user-func.c @@ -1,41 +1,25 @@ -/* - * Dlt Client console utilities - Diagnostic Log and Trace +/** * @licence app begin@ + * Copyright (C) 2012 BMW AG + * + * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps. + * + * Contributions are licensed to the GENIVI Alliance under one or more + * Contribution License Agreements. * - * Copyright (C) 2011, BMW AG - Alexander Wenzel - * - * This program is free software; you can redistribute it and/or modify it under the terms of the - * GNU Lesser General Public License, version 2.1, as published by the Free Software Foundation. - * 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 Lesser General - * Public License, version 2.1, for more details. - * - * You should have received a copy of the GNU Lesser General Public License, version 2.1, along - * with this program; if not, see . - * - * Note that the copyright holders assume that the GNU Lesser General Public License, version 2.1, may - * also be applicable to programs even in cases in which the program is not a library in the technical sense. - * - * Linking DLT statically or dynamically with other modules is making a combined work based on DLT. You may - * license such other modules under the GNU Lesser General Public License, version 2.1. If you do not want to - * license your linked modules under the GNU Lesser General Public License, version 2.1, you - * may use the program under the following exception. - * - * As a special exception, the copyright holders of DLT give you permission to combine DLT - * with software programs or libraries that are released under any license unless such a combination is not - * permitted by the license of such a software program or library. You may copy and distribute such a - * system following the terms of the GNU Lesser General Public License, version 2.1, including this - * special exception, for DLT and the licenses of the other code concerned. - * - * Note that people who make modified versions of DLT are not obligated to grant this special exception - * for their modified versions; it is their choice whether to do so. The GNU Lesser General Public License, - * version 2.1, gives permission to release a modified version without this exception; this exception - * also makes it possible to release a modified version which carries forward this exception. + * \copyright + * 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/. * + * + * \author Alexander Wenzel BMW 2011-2012 + * + * \file + * For further information see http://www.genivi.org/. * @licence end@ */ - /******************************************************************************* ** ** ** SRC-MODULE: dlt-example-user-func.cpp ** diff --git a/src/examples/dlt-example-user.c b/src/examples/dlt-example-user.c index a1a4b1e..f97c0f4 100755 --- a/src/examples/dlt-example-user.c +++ b/src/examples/dlt-example-user.c @@ -1,37 +1,22 @@ -/* - * Dlt Client console utilities - Diagnostic Log and Trace +/** * @licence app begin@ + * Copyright (C) 2012 BMW AG + * + * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps. + * + * Contributions are licensed to the GENIVI Alliance under one or more + * Contribution License Agreements. + * + * \copyright + * 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/. + * * - * Copyright (C) 2011, BMW AG - Alexander Wenzel - * - * This program is free software; you can redistribute it and/or modify it under the terms of the - * GNU Lesser General Public License, version 2.1, as published by the Free Software Foundation. - * 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 Lesser General - * Public License, version 2.1, for more details. - * - * You should have received a copy of the GNU Lesser General Public License, version 2.1, along - * with this program; if not, see . - * - * Note that the copyright holders assume that the GNU Lesser General Public License, version 2.1, may - * also be applicable to programs even in cases in which the program is not a library in the technical sense. - * - * Linking DLT statically or dynamically with other modules is making a combined work based on DLT. You may - * license such other modules under the GNU Lesser General Public License, version 2.1. If you do not want to - * license your linked modules under the GNU Lesser General Public License, version 2.1, you - * may use the program under the following exception. - * - * As a special exception, the copyright holders of DLT give you permission to combine DLT - * with software programs or libraries that are released under any license unless such a combination is not - * permitted by the license of such a software program or library. You may copy and distribute such a - * system following the terms of the GNU Lesser General Public License, version 2.1, including this - * special exception, for DLT and the licenses of the other code concerned. - * - * Note that people who make modified versions of DLT are not obligated to grant this special exception - * for their modified versions; it is their choice whether to do so. The GNU Lesser General Public License, - * version 2.1, gives permission to release a modified version without this exception; this exception - * also makes it possible to release a modified version which carries forward this exception. + * \author Alexander Wenzel BMW 2011-2012 * + * \file + * For further information see http://www.genivi.org/. * @licence end@ */ diff --git a/src/lib/dlt_client.c b/src/lib/dlt_client.c index 87aa273..4c78da1 100755 --- a/src/lib/dlt_client.c +++ b/src/lib/dlt_client.c @@ -1,37 +1,22 @@ -/* - * Dlt- Diagnostic Log and Trace client library +/** * @licence app begin@ + * Copyright (C) 2012 BMW AG + * + * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps. + * + * Contributions are licensed to the GENIVI Alliance under one or more + * Contribution License Agreements. + * + * \copyright + * 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/. + * * - * Copyright (C) 2011, BMW AG - Alexander Wenzel - * - * This program is free software; you can redistribute it and/or modify it under the terms of the - * GNU Lesser General Public License, version 2.1, as published by the Free Software Foundation. - * 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 Lesser General - * Public License, version 2.1, for more details. - * - * You should have received a copy of the GNU Lesser General Public License, version 2.1, along - * with this program; if not, see . - * - * Note that the copyright holders assume that the GNU Lesser General Public License, version 2.1, may - * also be applicable to programs even in cases in which the program is not a library in the technical sense. - * - * Linking DLT statically or dynamically with other modules is making a combined work based on DLT. You may - * license such other modules under the GNU Lesser General Public License, version 2.1. If you do not want to - * license your linked modules under the GNU Lesser General Public License, version 2.1, you - * may use the program under the following exception. - * - * As a special exception, the copyright holders of DLT give you permission to combine DLT - * with software programs or libraries that are released under any license unless such a combination is not - * permitted by the license of such a software program or library. You may copy and distribute such a - * system following the terms of the GNU Lesser General Public License, version 2.1, including this - * special exception, for DLT and the licenses of the other code concerned. - * - * Note that people who make modified versions of DLT are not obligated to grant this special exception - * for their modified versions; it is their choice whether to do so. The GNU Lesser General Public License, - * version 2.1, gives permission to release a modified version without this exception; this exception - * also makes it possible to release a modified version which carries forward this exception. + * \author Alexander Wenzel BMW 2011-2012 * + * \file + * For further information see http://www.genivi.org/. * @licence end@ */ diff --git a/src/lib/dlt_filetransfer.c b/src/lib/dlt_filetransfer.c index d1c4d8b..129c0a2 100644 --- a/src/lib/dlt_filetransfer.c +++ b/src/lib/dlt_filetransfer.c @@ -1,37 +1,22 @@ -/* - * Dlt Test Client - Diagnostic Log and Trace +/** * @licence app begin@ + * Copyright (C) 2012 BMW AG + * + * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps. + * + * Contributions are licensed to the GENIVI Alliance under one or more + * Contribution License Agreements. + * + * \copyright + * 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/. + * * - * Copyright (C) 2011, BMW AG - Alexander Wenzel - * - * This program is free software; you can redistribute it and/or modify it under the terms of the - * GNU Lesser General Public License, version 2.1, as published by the Free Software Foundation. - * 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 Lesser General - * Public License, version 2.1, for more details. - * - * You should have received a copy of the GNU Lesser General Public License, version 2.1, along - * with this program; if not, see . - * - * Note that the copyright holders assume that the GNU Lesser General Public License, version 2.1, may - * also be applicable to programs even in cases in which the program is not a library in the technical sense. - * - * Linking DLT statically or dynamically with other modules is making a combined work based on DLT. You may - * license such other modules under the GNU Lesser General Public License, version 2.1. If you do not want to - * license your linked modules under the GNU Lesser General Public License, version 2.1, you - * may use the program under the following exception. - * - * As a special exception, the copyright holders of DLT give you permission to combine DLT - * with software programs or libraries that are released under any license unless such a combination is not - * permitted by the license of such a software program or library. You may copy and distribute such a - * system following the terms of the GNU Lesser General Public License, version 2.1, including this - * special exception, for DLT and the licenses of the other code concerned. - * - * Note that people who make modified versions of DLT are not obligated to grant this special exception - * for their modified versions; it is their choice whether to do so. The GNU Lesser General Public License, - * version 2.1, gives permission to release a modified version without this exception; this exception - * also makes it possible to release a modified version which carries forward this exception. + * \author Alexander Wenzel BMW 2011-2012 * + * \file + * For further information see http://www.genivi.org/. * @licence end@ */ diff --git a/src/lib/dlt_user.c b/src/lib/dlt_user.c index 62e6fa5..33bab2c 100755 --- a/src/lib/dlt_user.c +++ b/src/lib/dlt_user.c @@ -1,39 +1,24 @@ -/* -* Dlt- Diagnostic Log and Trace user library -* @licence app begin@ +/** + * @licence app begin@ + * Copyright (C) 2012 BMW AG + * + * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps. + * + * Contributions are licensed to the GENIVI Alliance under one or more + * Contribution License Agreements. * - * Copyright (C) 2011, BMW AG - Alexander Wenzel - * - * This program is free software; you can redistribute it and/or modify it under the terms of the - * GNU Lesser General Public License, version 2.1, as published by the Free Software Foundation. - * 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 Lesser General - * Public License, version 2.1, for more details. - * - * You should have received a copy of the GNU Lesser General Public License, version 2.1, along - * with this program; if not, see . - * - * Note that the copyright holders assume that the GNU Lesser General Public License, version 2.1, may - * also be applicable to programs even in cases in which the program is not a library in the technical sense. - * - * Linking DLT statically or dynamically with other modules is making a combined work based on DLT. You may - * license such other modules under the GNU Lesser General Public License, version 2.1. If you do not want to - * license your linked modules under the GNU Lesser General Public License, version 2.1, you - * may use the program under the following exception. - * - * As a special exception, the copyright holders of DLT give you permission to combine DLT - * with software programs or libraries that are released under any license unless such a combination is not - * permitted by the license of such a software program or library. You may copy and distribute such a - * system following the terms of the GNU Lesser General Public License, version 2.1, including this - * special exception, for DLT and the licenses of the other code concerned. - * - * Note that people who make modified versions of DLT are not obligated to grant this special exception - * for their modified versions; it is their choice whether to do so. The GNU Lesser General Public License, - * version 2.1, gives permission to release a modified version without this exception; this exception - * also makes it possible to release a modified version which carries forward this exception. + * \copyright + * 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/. * + * + * \author Alexander Wenzel BMW 2011-2012 + * + * \file + * For further information see http://www.genivi.org/. * @licence end@ -*/ + */ /******************************************************************************* diff --git a/src/shared/dlt_common.c b/src/shared/dlt_common.c index 2f517bc..ae465a1 100755 --- a/src/shared/dlt_common.c +++ b/src/shared/dlt_common.c @@ -1,37 +1,22 @@ -/* - * Dlt- Diagnostic Log and Trace console apps +/** * @licence app begin@ + * Copyright (C) 2012 BMW AG + * + * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps. + * + * Contributions are licensed to the GENIVI Alliance under one or more + * Contribution License Agreements. + * + * \copyright + * 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/. + * * - * Copyright (C) 2011, BMW AG - Alexander Wenzel - * - * This program is free software; you can redistribute it and/or modify it under the terms of the - * GNU Lesser General Public License, version 2.1, as published by the Free Software Foundation. - * 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 Lesser General - * Public License, version 2.1, for more details. - * - * You should have received a copy of the GNU Lesser General Public License, version 2.1, along - * with this program; if not, see . - * - * Note that the copyright holders assume that the GNU Lesser General Public License, version 2.1, may - * also be applicable to programs even in cases in which the program is not a library in the technical sense. - * - * Linking DLT statically or dynamically with other modules is making a combined work based on DLT. You may - * license such other modules under the GNU Lesser General Public License, version 2.1. If you do not want to - * license your linked modules under the GNU Lesser General Public License, version 2.1, you - * may use the program under the following exception. - * - * As a special exception, the copyright holders of DLT give you permission to combine DLT - * with software programs or libraries that are released under any license unless such a combination is not - * permitted by the license of such a software program or library. You may copy and distribute such a - * system following the terms of the GNU Lesser General Public License, version 2.1, including this - * special exception, for DLT and the licenses of the other code concerned. - * - * Note that people who make modified versions of DLT are not obligated to grant this special exception - * for their modified versions; it is their choice whether to do so. The GNU Lesser General Public License, - * version 2.1, gives permission to release a modified version without this exception; this exception - * also makes it possible to release a modified version which carries forward this exception. + * \author Alexander Wenzel BMW 2011-2012 * + * \file + * For further information see http://www.genivi.org/. * @licence end@ */ diff --git a/src/shared/dlt_offline_trace.c b/src/shared/dlt_offline_trace.c index 5d4c76a..be60a61 100644 --- a/src/shared/dlt_offline_trace.c +++ b/src/shared/dlt_offline_trace.c @@ -1,39 +1,24 @@ -/* -* Dlt- Diagnostic Log and Trace user library -* @licence app begin@ +/** + * @licence app begin@ + * Copyright (C) 2012 BMW AG * - * Copyright (C) 2011, BMW AG - Alexander Wenzel - * - * This program is free software; you can redistribute it and/or modify it under the terms of the - * GNU Lesser General Public License, version 2.1, as published by the Free Software Foundation. - * 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 Lesser General - * Public License, version 2.1, for more details. - * - * You should have received a copy of the GNU Lesser General Public License, version 2.1, along - * with this program; if not, see . - * - * Note that the copyright holders assume that the GNU Lesser General Public License, version 2.1, may - * also be applicable to programs even in cases in which the program is not a library in the technical sense. - * - * Linking DLT statically or dynamically with other modules is making a combined work based on DLT. You may - * license such other modules under the GNU Lesser General Public License, version 2.1. If you do not want to - * license your linked modules under the GNU Lesser General Public License, version 2.1, you - * may use the program under the following exception. - * - * As a special exception, the copyright holders of DLT give you permission to combine DLT - * with software programs or libraries that are released under any license unless such a combination is not - * permitted by the license of such a software program or library. You may copy and distribute such a - * system following the terms of the GNU Lesser General Public License, version 2.1, including this - * special exception, for DLT and the licenses of the other code concerned. - * - * Note that people who make modified versions of DLT are not obligated to grant this special exception - * for their modified versions; it is their choice whether to do so. The GNU Lesser General Public License, - * version 2.1, gives permission to release a modified version without this exception; this exception - * also makes it possible to release a modified version which carries forward this exception. + * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps. * + * Contributions are licensed to the GENIVI Alliance under one or more + * Contribution License Agreements. + * + * \copyright + * 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/. + * + * + * \author Alexander Wenzel BMW 2011-2012 + * + * \file + * For further information see http://www.genivi.org/. * @licence end@ -*/ + */ /******************************************************************************* diff --git a/src/shared/dlt_shm.c b/src/shared/dlt_shm.c index c22dd13..0502fb2 100644 --- a/src/shared/dlt_shm.c +++ b/src/shared/dlt_shm.c @@ -1,39 +1,24 @@ -/* -* Dlt- Diagnostic Log and Trace user library -* @licence app begin@ +/** + * @licence app begin@ + * Copyright (C) 2012 BMW AG * - * Copyright (C) 2011, BMW AG - Alexander Wenzel - * - * This program is free software; you can redistribute it and/or modify it under the terms of the - * GNU Lesser General Public License, version 2.1, as published by the Free Software Foundation. - * 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 Lesser General - * Public License, version 2.1, for more details. - * - * You should have received a copy of the GNU Lesser General Public License, version 2.1, along - * with this program; if not, see . - * - * Note that the copyright holders assume that the GNU Lesser General Public License, version 2.1, may - * also be applicable to programs even in cases in which the program is not a library in the technical sense. - * - * Linking DLT statically or dynamically with other modules is making a combined work based on DLT. You may - * license such other modules under the GNU Lesser General Public License, version 2.1. If you do not want to - * license your linked modules under the GNU Lesser General Public License, version 2.1, you - * may use the program under the following exception. - * - * As a special exception, the copyright holders of DLT give you permission to combine DLT - * with software programs or libraries that are released under any license unless such a combination is not - * permitted by the license of such a software program or library. You may copy and distribute such a - * system following the terms of the GNU Lesser General Public License, version 2.1, including this - * special exception, for DLT and the licenses of the other code concerned. - * - * Note that people who make modified versions of DLT are not obligated to grant this special exception - * for their modified versions; it is their choice whether to do so. The GNU Lesser General Public License, - * version 2.1, gives permission to release a modified version without this exception; this exception - * also makes it possible to release a modified version which carries forward this exception. + * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps. * + * Contributions are licensed to the GENIVI Alliance under one or more + * Contribution License Agreements. + * + * \copyright + * 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/. + * + * + * \author Alexander Wenzel BMW 2011-2012 + * + * \file + * For further information see http://www.genivi.org/. * @licence end@ -*/ + */ /******************************************************************************* diff --git a/src/shared/dlt_user_shared.c b/src/shared/dlt_user_shared.c index e743dfc..fbbaec3 100755 --- a/src/shared/dlt_user_shared.c +++ b/src/shared/dlt_user_shared.c @@ -1,37 +1,22 @@ -/* - * Dlt- Diagnostic Log and Trace user library +/** * @licence app begin@ + * Copyright (C) 2012 BMW AG + * + * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps. + * + * Contributions are licensed to the GENIVI Alliance under one or more + * Contribution License Agreements. + * + * \copyright + * 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/. + * * - * Copyright (C) 2011, BMW AG - Alexander Wenzel - * - * This program is free software; you can redistribute it and/or modify it under the terms of the - * GNU Lesser General Public License, version 2.1, as published by the Free Software Foundation. - * 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 Lesser General - * Public License, version 2.1, for more details. - * - * You should have received a copy of the GNU Lesser General Public License, version 2.1, along - * with this program; if not, see . - * - * Note that the copyright holders assume that the GNU Lesser General Public License, version 2.1, may - * also be applicable to programs even in cases in which the program is not a library in the technical sense. - * - * Linking DLT statically or dynamically with other modules is making a combined work based on DLT. You may - * license such other modules under the GNU Lesser General Public License, version 2.1. If you do not want to - * license your linked modules under the GNU Lesser General Public License, version 2.1, you - * may use the program under the following exception. - * - * As a special exception, the copyright holders of DLT give you permission to combine DLT - * with software programs or libraries that are released under any license unless such a combination is not - * permitted by the license of such a software program or library. You may copy and distribute such a - * system following the terms of the GNU Lesser General Public License, version 2.1, including this - * special exception, for DLT and the licenses of the other code concerned. - * - * Note that people who make modified versions of DLT are not obligated to grant this special exception - * for their modified versions; it is their choice whether to do so. The GNU Lesser General Public License, - * version 2.1, gives permission to release a modified version without this exception; this exception - * also makes it possible to release a modified version which carries forward this exception. + * \author Alexander Wenzel BMW 2011-2012 * + * \file + * For further information see http://www.genivi.org/. * @licence end@ */ diff --git a/src/system/dlt-system-log.c b/src/system/dlt-system-log.c index c71f930..104a96e 100644 --- a/src/system/dlt-system-log.c +++ b/src/system/dlt-system-log.c @@ -1,37 +1,22 @@ -/* - * Dlt system manager to Dlt +/** * @licence app begin@ + * Copyright (C) 2012 BMW AG * - * Copyright (C) 2011, BMW AG - Alexander Wenzel - * - * This program is free software; you can redistribute it and/or modify it under the terms of the - * GNU Lesser General Public License, version 2.1, as published by the Free Software Foundation. - * 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 Lesser General - * Public License, version 2.1, for more details. - * - * You should have received a copy of the GNU Lesser General Public License, version 2.1, along - * with this program; if not, see . - * - * Note that the copyright holders assume that the GNU Lesser General Public License, version 2.1, may - * also be applicable to programs even in cases in which the program is not a library in the technical sense. - * - * Linking DLT statically or dynamically with other modules is making a combined work based on DLT. You may - * license such other modules under the GNU Lesser General Public License, version 2.1. If you do not want to - * license your linked modules under the GNU Lesser General Public License, version 2.1, you - * may use the program under the following exception. - * - * As a special exception, the copyright holders of DLT give you permission to combine DLT - * with software programs or libraries that are released under any license unless such a combination is not - * permitted by the license of such a software program or library. You may copy and distribute such a - * system following the terms of the GNU Lesser General Public License, version 2.1, including this - * special exception, for DLT and the licenses of the other code concerned. - * - * Note that people who make modified versions of DLT are not obligated to grant this special exception - * for their modified versions; it is their choice whether to do so. The GNU Lesser General Public License, - * version 2.1, gives permission to release a modified version without this exception; this exception - * also makes it possible to release a modified version which carries forward this exception. + * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps. * + * Contributions are licensed to the GENIVI Alliance under one or more + * Contribution License Agreements. + * + * \copyright + * 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/. + * + * + * \author Alexander Wenzel BMW 2011-2012 + * + * \file + * For further information see http://www.genivi.org/. * @licence end@ */ diff --git a/src/system/dlt-system.c b/src/system/dlt-system.c index 55d053c..fe9c86c 100755 --- a/src/system/dlt-system.c +++ b/src/system/dlt-system.c @@ -1,37 +1,22 @@ -/* - * Dlt system manager to Dlt +/** * @licence app begin@ + * Copyright (C) 2012 BMW AG * - * Copyright (C) 2011, BMW AG - Alexander Wenzel - * - * This program is free software; you can redistribute it and/or modify it under the terms of the - * GNU Lesser General Public License, version 2.1, as published by the Free Software Foundation. - * 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 Lesser General - * Public License, version 2.1, for more details. - * - * You should have received a copy of the GNU Lesser General Public License, version 2.1, along - * with this program; if not, see . - * - * Note that the copyright holders assume that the GNU Lesser General Public License, version 2.1, may - * also be applicable to programs even in cases in which the program is not a library in the technical sense. - * - * Linking DLT statically or dynamically with other modules is making a combined work based on DLT. You may - * license such other modules under the GNU Lesser General Public License, version 2.1. If you do not want to - * license your linked modules under the GNU Lesser General Public License, version 2.1, you - * may use the program under the following exception. - * - * As a special exception, the copyright holders of DLT give you permission to combine DLT - * with software programs or libraries that are released under any license unless such a combination is not - * permitted by the license of such a software program or library. You may copy and distribute such a - * system following the terms of the GNU Lesser General Public License, version 2.1, including this - * special exception, for DLT and the licenses of the other code concerned. - * - * Note that people who make modified versions of DLT are not obligated to grant this special exception - * for their modified versions; it is their choice whether to do so. The GNU Lesser General Public License, - * version 2.1, gives permission to release a modified version without this exception; this exception - * also makes it possible to release a modified version which carries forward this exception. + * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps. * + * Contributions are licensed to the GENIVI Alliance under one or more + * Contribution License Agreements. + * + * \copyright + * 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/. + * + * + * \author Alexander Wenzel BMW 2011-2012 + * + * \file + * For further information see http://www.genivi.org/. * @licence end@ */ diff --git a/src/tests/dlt-test-client.c b/src/tests/dlt-test-client.c index cb4a372..ed212fe 100755 --- a/src/tests/dlt-test-client.c +++ b/src/tests/dlt-test-client.c @@ -1,37 +1,22 @@ -/* - * Dlt Test Client - Diagnostic Log and Trace +/** * @licence app begin@ + * Copyright (C) 2012 BMW AG + * + * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps. + * + * Contributions are licensed to the GENIVI Alliance under one or more + * Contribution License Agreements. + * + * \copyright + * 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/. + * * - * Copyright (C) 2011, BMW AG - Alexander Wenzel - * - * This program is free software; you can redistribute it and/or modify it under the terms of the - * GNU Lesser General Public License, version 2.1, as published by the Free Software Foundation. - * 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 Lesser General - * Public License, version 2.1, for more details. - * - * You should have received a copy of the GNU Lesser General Public License, version 2.1, along - * with this program; if not, see . - * - * Note that the copyright holders assume that the GNU Lesser General Public License, version 2.1, may - * also be applicable to programs even in cases in which the program is not a library in the technical sense. - * - * Linking DLT statically or dynamically with other modules is making a combined work based on DLT. You may - * license such other modules under the GNU Lesser General Public License, version 2.1. If you do not want to - * license your linked modules under the GNU Lesser General Public License, version 2.1, you - * may use the program under the following exception. - * - * As a special exception, the copyright holders of DLT give you permission to combine DLT - * with software programs or libraries that are released under any license unless such a combination is not - * permitted by the license of such a software program or library. You may copy and distribute such a - * system following the terms of the GNU Lesser General Public License, version 2.1, including this - * special exception, for DLT and the licenses of the other code concerned. - * - * Note that people who make modified versions of DLT are not obligated to grant this special exception - * for their modified versions; it is their choice whether to do so. The GNU Lesser General Public License, - * version 2.1, gives permission to release a modified version without this exception; this exception - * also makes it possible to release a modified version which carries forward this exception. + * \author Alexander Wenzel BMW 2011-2012 * + * \file + * For further information see http://www.genivi.org/. * @licence end@ */ diff --git a/src/tests/dlt-test-filetransfer.c b/src/tests/dlt-test-filetransfer.c index 15d1376..0813190 100644 --- a/src/tests/dlt-test-filetransfer.c +++ b/src/tests/dlt-test-filetransfer.c @@ -1,37 +1,22 @@ -/* - * Dlt Test Client - Diagnostic Log and Trace +/** * @licence app begin@ + * Copyright (C) 2012 BMW AG * - * Copyright (C) 2011, BMW AG - Alexander Wenzel - * - * This program is free software; you can redistribute it and/or modify it under the terms of the - * GNU Lesser General Public License, version 2.1, as published by the Free Software Foundation. - * 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 Lesser General - * Public License, version 2.1, for more details. - * - * You should have received a copy of the GNU Lesser General Public License, version 2.1, along - * with this program; if not, see . - * - * Note that the copyright holders assume that the GNU Lesser General Public License, version 2.1, may - * also be applicable to programs even in cases in which the program is not a library in the technical sense. - * - * Linking DLT statically or dynamically with other modules is making a combined work based on DLT. You may - * license such other modules under the GNU Lesser General Public License, version 2.1. If you do not want to - * license your linked modules under the GNU Lesser General Public License, version 2.1, you - * may use the program under the following exception. - * - * As a special exception, the copyright holders of DLT give you permission to combine DLT - * with software programs or libraries that are released under any license unless such a combination is not - * permitted by the license of such a software program or library. You may copy and distribute such a - * system following the terms of the GNU Lesser General Public License, version 2.1, including this - * special exception, for DLT and the licenses of the other code concerned. - * - * Note that people who make modified versions of DLT are not obligated to grant this special exception - * for their modified versions; it is their choice whether to do so. The GNU Lesser General Public License, - * version 2.1, gives permission to release a modified version without this exception; this exception - * also makes it possible to release a modified version which carries forward this exception. + * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps. * + * Contributions are licensed to the GENIVI Alliance under one or more + * Contribution License Agreements. + * + * \copyright + * 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/. + * + * + * \author Alexander Wenzel BMW 2011-2012 + * + * \file + * For further information see http://www.genivi.org/. * @licence end@ */ diff --git a/src/tests/dlt-test-multi-process-client.c b/src/tests/dlt-test-multi-process-client.c index 6246a8b..7dc36a9 100644 --- a/src/tests/dlt-test-multi-process-client.c +++ b/src/tests/dlt-test-multi-process-client.c @@ -1,37 +1,22 @@ -/* - * DLT multi process tester +/** * @licence app begin@ + * Copyright (C) 2012 BMW AG * - * Copyright (C) 2011, BMW AG - Lassi Marttala - * - * This program is free software; you can redistribute it and/or modify it under the terms of the - * GNU Lesser General Public License, version 2.1, as published by the Free Software Foundation. - * 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 Lesser General - * Public License, version 2.1, for more details. - * - * You should have received a copy of the GNU Lesser General Public License, version 2.1, along - * with this program; if not, see . + * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps. * - * Note that the copyright holders assume that the GNU Lesser General Public License, version 2.1, may - * also be applicable to programs even in cases in which the program is not a library in the technical sense. + * Contributions are licensed to the GENIVI Alliance under one or more + * Contribution License Agreements. * - * Linking DLT statically or dynamically with other modules is making a combined work based on DLT. You may - * license such other modules under the GNU Lesser General Public License, version 2.1. If you do not want to - * license your linked modules under the GNU Lesser General Public License, version 2.1, you - * may use the program under the following exception. + * \copyright + * 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/. * - * As a special exception, the copyright holders of DLT give you permission to combine DLT - * with software programs or libraries that are released under any license unless such a combination is not - * permitted by the license of such a software program or library. You may copy and distribute such a - * system following the terms of the GNU Lesser General Public License, version 2.1, including this - * special exception, for DLT and the licenses of the other code concerned. * - * Note that people who make modified versions of DLT are not obligated to grant this special exception - * for their modified versions; it is their choice whether to do so. The GNU Lesser General Public License, - * version 2.1, gives permission to release a modified version without this exception; this exception - * also makes it possible to release a modified version which carries forward this exception. + * \author Lassi Marttala BMW 2011-2012 * + * \file + * For further information see http://www.genivi.org/. * @licence end@ */ diff --git a/src/tests/dlt-test-multi-process.c b/src/tests/dlt-test-multi-process.c index 705a6fe..9dbd507 100755 --- a/src/tests/dlt-test-multi-process.c +++ b/src/tests/dlt-test-multi-process.c @@ -1,37 +1,22 @@ -/* - * DLT multi process tester +/** * @licence app begin@ + * Copyright (C) 2012 BMW AG * - * Copyright (C) 2011, BMW AG - Lassi Marttala Lassi Marttala - * - * This program is free software; you can redistribute it and/or modify it under the terms of the - * GNU Lesser General Public License, version 2.1, as published by the Free Software Foundation. - * 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 Lesser General - * Public License, version 2.1, for more details. - * - * You should have received a copy of the GNU Lesser General Public License, version 2.1, along - * with this program; if not, see . + * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps. * - * Note that the copyright holders assume that the GNU Lesser General Public License, version 2.1, may - * also be applicable to programs even in cases in which the program is not a library in the technical sense. + * Contributions are licensed to the GENIVI Alliance under one or more + * Contribution License Agreements. * - * Linking DLT statically or dynamically with other modules is making a combined work based on DLT. You may - * license such other modules under the GNU Lesser General Public License, version 2.1. If you do not want to - * license your linked modules under the GNU Lesser General Public License, version 2.1, you - * may use the program under the following exception. + * \copyright + * 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/. * - * As a special exception, the copyright holders of DLT give you permission to combine DLT - * with software programs or libraries that are released under any license unless such a combination is not - * permitted by the license of such a software program or library. You may copy and distribute such a - * system following the terms of the GNU Lesser General Public License, version 2.1, including this - * special exception, for DLT and the licenses of the other code concerned. * - * Note that people who make modified versions of DLT are not obligated to grant this special exception - * for their modified versions; it is their choice whether to do so. The GNU Lesser General Public License, - * version 2.1, gives permission to release a modified version without this exception; this exception - * also makes it possible to release a modified version which carries forward this exception. + * \author Lassi Marttala BMW 2011-2012 * + * \file + * For further information see http://www.genivi.org/. * @licence end@ */ diff --git a/src/tests/dlt-test-stress-client.c b/src/tests/dlt-test-stress-client.c index 46c7af3..bc628c9 100644 --- a/src/tests/dlt-test-stress-client.c +++ b/src/tests/dlt-test-stress-client.c @@ -1,41 +1,25 @@ -/* - * Dlt Test Stress Client - Diagnostic Log and Trace +/** * @licence app begin@ + * Copyright (C) 2012 BMW AG + * + * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps. + * + * Contributions are licensed to the GENIVI Alliance under one or more + * Contribution License Agreements. * - * Copyright (C) 2011, BMW AG - Alexander Wenzel - * - * This program is free software; you can redistribute it and/or modify it under the terms of the - * GNU Lesser General Public License, version 2.1, as published by the Free Software Foundation. - * 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 Lesser General - * Public License, version 2.1, for more details. - * - * You should have received a copy of the GNU Lesser General Public License, version 2.1, along - * with this program; if not, see . - * - * Note that the copyright holders assume that the GNU Lesser General Public License, version 2.1, may - * also be applicable to programs even in cases in which the program is not a library in the technical sense. - * - * Linking DLT statically or dynamically with other modules is making a combined work based on DLT. You may - * license such other modules under the GNU Lesser General Public License, version 2.1. If you do not want to - * license your linked modules under the GNU Lesser General Public License, version 2.1, you - * may use the program under the following exception. - * - * As a special exception, the copyright holders of DLT give you permission to combine DLT - * with software programs or libraries that are released under any license unless such a combination is not - * permitted by the license of such a software program or library. You may copy and distribute such a - * system following the terms of the GNU Lesser General Public License, version 2.1, including this - * special exception, for DLT and the licenses of the other code concerned. - * - * Note that people who make modified versions of DLT are not obligated to grant this special exception - * for their modified versions; it is their choice whether to do so. The GNU Lesser General Public License, - * version 2.1, gives permission to release a modified version without this exception; this exception - * also makes it possible to release a modified version which carries forward this exception. + * \copyright + * 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/. * + * + * \author Alexander Wenzel BMW 2011-2012 + * + * \file + * For further information see http://www.genivi.org/. * @licence end@ */ - /******************************************************************************* ** ** ** SRC-MODULE: dlt-test-stress-client.c ** diff --git a/src/tests/dlt-test-stress-user.c b/src/tests/dlt-test-stress-user.c index f28fbb4..e8827ca 100644 --- a/src/tests/dlt-test-stress-user.c +++ b/src/tests/dlt-test-stress-user.c @@ -1,37 +1,22 @@ -/* - * Dlt Test Stress user - Diagnostic Log and Trace +/** * @licence app begin@ + * Copyright (C) 2012 BMW AG + * + * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps. + * + * Contributions are licensed to the GENIVI Alliance under one or more + * Contribution License Agreements. + * + * \copyright + * 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/. + * * - * Copyright (C) 2011, BMW AG - Alexander Wenzel - * - * This program is free software; you can redistribute it and/or modify it under the terms of the - * GNU Lesser General Public License, version 2.1, as published by the Free Software Foundation. - * 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 Lesser General - * Public License, version 2.1, for more details. - * - * You should have received a copy of the GNU Lesser General Public License, version 2.1, along - * with this program; if not, see . - * - * Note that the copyright holders assume that the GNU Lesser General Public License, version 2.1, may - * also be applicable to programs even in cases in which the program is not a library in the technical sense. - * - * Linking DLT statically or dynamically with other modules is making a combined work based on DLT. You may - * license such other modules under the GNU Lesser General Public License, version 2.1. If you do not want to - * license your linked modules under the GNU Lesser General Public License, version 2.1, you - * may use the program under the following exception. - * - * As a special exception, the copyright holders of DLT give you permission to combine DLT - * with software programs or libraries that are released under any license unless such a combination is not - * permitted by the license of such a software program or library. You may copy and distribute such a - * system following the terms of the GNU Lesser General Public License, version 2.1, including this - * special exception, for DLT and the licenses of the other code concerned. - * - * Note that people who make modified versions of DLT are not obligated to grant this special exception - * for their modified versions; it is their choice whether to do so. The GNU Lesser General Public License, - * version 2.1, gives permission to release a modified version without this exception; this exception - * also makes it possible to release a modified version which carries forward this exception. + * \author Alexander Wenzel BMW 2011-2012 * + * \file + * For further information see http://www.genivi.org/. * @licence end@ */ diff --git a/src/tests/dlt-test-stress.c b/src/tests/dlt-test-stress.c index a405096..6e8baf1 100755 --- a/src/tests/dlt-test-stress.c +++ b/src/tests/dlt-test-stress.c @@ -1,37 +1,22 @@ -/* - * Dlt Client test utilities - Diagnostic Log and Trace +/** * @licence app begin@ + * Copyright (C) 2012 BMW AG + * + * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps. + * + * Contributions are licensed to the GENIVI Alliance under one or more + * Contribution License Agreements. + * + * \copyright + * 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/. + * * - * Copyright (C) 2011, BMW AG - Alexander Wenzel - * - * This program is free software; you can redistribute it and/or modify it under the terms of the - * GNU Lesser General Public License, version 2.1, as published by the Free Software Foundation. - * 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 Lesser General - * Public License, version 2.1, for more details. - * - * You should have received a copy of the GNU Lesser General Public License, version 2.1, along - * with this program; if not, see . - * - * Note that the copyright holders assume that the GNU Lesser General Public License, version 2.1, may - * also be applicable to programs even in cases in which the program is not a library in the technical sense. - * - * Linking DLT statically or dynamically with other modules is making a combined work based on DLT. You may - * license such other modules under the GNU Lesser General Public License, version 2.1. If you do not want to - * license your linked modules under the GNU Lesser General Public License, version 2.1, you - * may use the program under the following exception. - * - * As a special exception, the copyright holders of DLT give you permission to combine DLT - * with software programs or libraries that are released under any license unless such a combination is not - * permitted by the license of such a software program or library. You may copy and distribute such a - * system following the terms of the GNU Lesser General Public License, version 2.1, including this - * special exception, for DLT and the licenses of the other code concerned. - * - * Note that people who make modified versions of DLT are not obligated to grant this special exception - * for their modified versions; it is their choice whether to do so. The GNU Lesser General Public License, - * version 2.1, gives permission to release a modified version without this exception; this exception - * also makes it possible to release a modified version which carries forward this exception. + * \author Alexander Wenzel BMW 2011-2012 * + * \file + * For further information see http://www.genivi.org/. * @licence end@ */ diff --git a/src/tests/dlt-test-user.c b/src/tests/dlt-test-user.c index fb00ef4..96e3491 100755 --- a/src/tests/dlt-test-user.c +++ b/src/tests/dlt-test-user.c @@ -1,37 +1,22 @@ -/* - * Dlt Test user - Diagnostic Log and Trace - * @licence app begin@ - * - * Copyright (C) 2011, BMW AG - Alexander Wenzel - * - * This program is free software; you can redistribute it and/or modify it under the terms of the - * GNU Lesser General Public License, version 2.1, as published by the Free Software Foundation. - * 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 Lesser General - * Public License, version 2.1, for more details. - * - * You should have received a copy of the GNU Lesser General Public License, version 2.1, along - * with this program; if not, see . - * - * Note that the copyright holders assume that the GNU Lesser General Public License, version 2.1, may - * also be applicable to programs even in cases in which the program is not a library in the technical sense. - * - * Linking DLT statically or dynamically with other modules is making a combined work based on DLT. You may - * license such other modules under the GNU Lesser General Public License, version 2.1. If you do not want to - * license your linked modules under the GNU Lesser General Public License, version 2.1, you - * may use the program under the following exception. - * - * As a special exception, the copyright holders of DLT give you permission to combine DLT - * with software programs or libraries that are released under any license unless such a combination is not - * permitted by the license of such a software program or library. You may copy and distribute such a - * system following the terms of the GNU Lesser General Public License, version 2.1, including this - * special exception, for DLT and the licenses of the other code concerned. - * - * Note that people who make modified versions of DLT are not obligated to grant this special exception - * for their modified versions; it is their choice whether to do so. The GNU Lesser General Public License, - * version 2.1, gives permission to release a modified version without this exception; this exception - * also makes it possible to release a modified version which carries forward this exception. - * +/** + * @licence app begin@ + * Copyright (C) 2012 BMW AG + * + * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps. + * + * Contributions are licensed to the GENIVI Alliance under one or more + * Contribution License Agreements. + * + * \copyright + * 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/. + * + * + * \author Alexander Wenzel BMW 2011-2012 + * + * \file + * For further information see http://www.genivi.org/. * @licence end@ */ -- cgit v1.2.1 From d43dfd4285c2764744ceda1c94eab664f910ac06 Mon Sep 17 00:00:00 2001 From: Lassi Marttala Date: Mon, 26 Mar 2012 11:36:30 +0200 Subject: GDLT-38, Added license to dlt_filetransfer, which had no license notification --- include/dlt/dlt_filetransfer.h | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/include/dlt/dlt_filetransfer.h b/include/dlt/dlt_filetransfer.h index e17f79f..8c55268 100644 --- a/include/dlt/dlt_filetransfer.h +++ b/include/dlt/dlt_filetransfer.h @@ -1,3 +1,22 @@ +/** + * @licence app begin@ + * Copyright (C) 2012 BMW AG + * + * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps. + * + * Contributions are licensed to the GENIVI Alliance under one or more + * Contribution License Agreements. + * + * \copyright + * 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/. + * + * \file + * For further information see http://www.genivi.org/. + * @licence end@ + */ + #include /* Needed for LONG_MAX */ #include /* Needed for struct stat st*/ #include "dlt.h" /* Needed for DLT Logs */ -- cgit v1.2.1 From aca8a90599949c458df5cdfca0d74280bb7e818d Mon Sep 17 00:00:00 2001 From: Lassi Marttala Date: Mon, 26 Mar 2012 11:50:02 +0200 Subject: GDLT-38, Update fields in licenses. --- include/dlt/dlt.h | 2 +- include/dlt/dlt_client.h | 2 +- include/dlt/dlt_common.h | 2 +- include/dlt/dlt_filetransfer.h | 2 +- include/dlt/dlt_offline_trace.h | 2 +- include/dlt/dlt_protocol.h | 2 +- include/dlt/dlt_shm.h | 2 +- include/dlt/dlt_types.h | 2 +- include/dlt/dlt_user.h | 2 +- include/dlt/dlt_user_macros.h | 2 +- src/adaptor/dlt-adaptor-stdin.c | 2 +- src/adaptor/dlt-adaptor-udp.c | 2 +- src/console/dlt-convert.c | 2 +- src/console/dlt-receive.c | 2 +- src/daemon/dlt-daemon.c | 2 +- src/daemon/dlt-daemon.h | 2 +- src/daemon/dlt-daemon_cfg.h | 2 +- src/daemon/dlt_daemon_common.c | 2 +- src/daemon/dlt_daemon_common.h | 2 +- src/daemon/dlt_daemon_common_cfg.h | 2 +- src/examples/dlt-example-filetransfer.c | 2 +- src/examples/dlt-example-user-func.c | 2 +- src/examples/dlt-example-user.c | 2 +- src/lib/dlt_client.c | 2 +- src/lib/dlt_client_cfg.h | 2 +- src/lib/dlt_filetransfer.c | 2 +- src/lib/dlt_user.c | 2 +- src/lib/dlt_user_cfg.h | 2 +- src/shared/dlt_common.c | 2 +- src/shared/dlt_common_cfg.h | 2 +- src/shared/dlt_offline_trace.c | 2 +- src/shared/dlt_shm.c | 2 +- src/shared/dlt_user_shared.c | 2 +- src/shared/dlt_user_shared.h | 2 +- src/shared/dlt_user_shared_cfg.h | 2 +- src/system/dlt-system-log.c | 2 +- src/system/dlt-system-log.h | 2 +- src/system/dlt-system.c | 2 +- src/system/dlt-system.h | 2 +- src/system/dlt-system_cfg.h | 2 +- src/tests/dlt-test-client.c | 2 +- src/tests/dlt-test-filetransfer.c | 2 +- src/tests/dlt-test-multi-process-client.c | 2 +- src/tests/dlt-test-multi-process.c | 2 +- src/tests/dlt-test-multi-process.h | 2 +- src/tests/dlt-test-stress-client.c | 2 +- src/tests/dlt-test-stress-user.c | 2 +- src/tests/dlt-test-stress.c | 2 +- src/tests/dlt-test-user.c | 2 +- 49 files changed, 49 insertions(+), 49 deletions(-) diff --git a/include/dlt/dlt.h b/include/dlt/dlt.h index b7e2ed2..7437258 100755 --- a/include/dlt/dlt.h +++ b/include/dlt/dlt.h @@ -15,7 +15,7 @@ * * \author Alexander Wenzel BMW 2011-2012 * - * \file + * \file dlt.h * For further information see http://www.genivi.org/. * @licence end@ */ diff --git a/include/dlt/dlt_client.h b/include/dlt/dlt_client.h index eda1906..c3dbc43 100755 --- a/include/dlt/dlt_client.h +++ b/include/dlt/dlt_client.h @@ -15,7 +15,7 @@ * * \author Alexander Wenzel BMW 2011-2012 * - * \file + * \file dlt_client.h * For further information see http://www.genivi.org/. * @licence end@ */ diff --git a/include/dlt/dlt_common.h b/include/dlt/dlt_common.h index 44d34bc..c3acf49 100755 --- a/include/dlt/dlt_common.h +++ b/include/dlt/dlt_common.h @@ -15,7 +15,7 @@ * * \author Alexander Wenzel BMW 2011-2012 * - * \file + * \file dlt_common.h * For further information see http://www.genivi.org/. * @licence end@ */ diff --git a/include/dlt/dlt_filetransfer.h b/include/dlt/dlt_filetransfer.h index 8c55268..077e3f0 100644 --- a/include/dlt/dlt_filetransfer.h +++ b/include/dlt/dlt_filetransfer.h @@ -12,7 +12,7 @@ * 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/. * - * \file + * \file dlt_filetransfer.h * For further information see http://www.genivi.org/. * @licence end@ */ diff --git a/include/dlt/dlt_offline_trace.h b/include/dlt/dlt_offline_trace.h index dd5bea6..49471e4 100644 --- a/include/dlt/dlt_offline_trace.h +++ b/include/dlt/dlt_offline_trace.h @@ -15,7 +15,7 @@ * * \author Alexander Wenzel BMW 2011-2012 * - * \file + * \file dlt_offline_trace.h * For further information see http://www.genivi.org/. * @licence end@ */ diff --git a/include/dlt/dlt_protocol.h b/include/dlt/dlt_protocol.h index 4b42b4a..eeece40 100755 --- a/include/dlt/dlt_protocol.h +++ b/include/dlt/dlt_protocol.h @@ -15,7 +15,7 @@ * * \author Alexander Wenzel BMW 2011-2012 * - * \file + * \file dlt_protocal.h * For further information see http://www.genivi.org/. * @licence end@ */ diff --git a/include/dlt/dlt_shm.h b/include/dlt/dlt_shm.h index f1531d4..1ae53a2 100644 --- a/include/dlt/dlt_shm.h +++ b/include/dlt/dlt_shm.h @@ -15,7 +15,7 @@ * * \author Alexander Wenzel BMW 2011-2012 * - * \file + * \file dlt_shm.h * For further information see http://www.genivi.org/. * @licence end@ */ diff --git a/include/dlt/dlt_types.h b/include/dlt/dlt_types.h index 9685eae..9b18969 100755 --- a/include/dlt/dlt_types.h +++ b/include/dlt/dlt_types.h @@ -15,7 +15,7 @@ * * \author Alexander Wenzel BMW 2011-2012 * - * \file + * \file dlt_types.h * For further information see http://www.genivi.org/. * @licence end@ */ diff --git a/include/dlt/dlt_user.h b/include/dlt/dlt_user.h index c079dd4..250d6d2 100755 --- a/include/dlt/dlt_user.h +++ b/include/dlt/dlt_user.h @@ -15,7 +15,7 @@ * * \author Alexander Wenzel BMW 2011-2012 * - * \file + * \file dlt_user.h * For further information see http://www.genivi.org/. * @licence end@ */ diff --git a/include/dlt/dlt_user_macros.h b/include/dlt/dlt_user_macros.h index e6420ec..9fd1f80 100755 --- a/include/dlt/dlt_user_macros.h +++ b/include/dlt/dlt_user_macros.h @@ -15,7 +15,7 @@ * * \author Alexander Wenzel BMW 2011-2012 * - * \file + * \file dlt_user_macros.h * For further information see http://www.genivi.org/. * @licence end@ */ diff --git a/src/adaptor/dlt-adaptor-stdin.c b/src/adaptor/dlt-adaptor-stdin.c index 7646bc9..ea9b122 100755 --- a/src/adaptor/dlt-adaptor-stdin.c +++ b/src/adaptor/dlt-adaptor-stdin.c @@ -15,7 +15,7 @@ * * \author Alexander Wenzel BMW 2011-2012 * - * \file + * \file dlt-adaptor-stdin.c * For further information see http://www.genivi.org/. * @licence end@ */ diff --git a/src/adaptor/dlt-adaptor-udp.c b/src/adaptor/dlt-adaptor-udp.c index f2f17fd..2f81794 100755 --- a/src/adaptor/dlt-adaptor-udp.c +++ b/src/adaptor/dlt-adaptor-udp.c @@ -15,7 +15,7 @@ * * \author Alexander Wenzel BMW 2011-2012 * - * \file + * \file dlt-adaptor-udp.c * For further information see http://www.genivi.org/. * @licence end@ */ diff --git a/src/console/dlt-convert.c b/src/console/dlt-convert.c index 0f97096..678aadf 100755 --- a/src/console/dlt-convert.c +++ b/src/console/dlt-convert.c @@ -15,7 +15,7 @@ * * \author Alexander Wenzel BMW 2011-2012 * - * \file + * \file dlt-convert.c * For further information see http://www.genivi.org/. * @licence end@ */ diff --git a/src/console/dlt-receive.c b/src/console/dlt-receive.c index d35131c..5a697e0 100755 --- a/src/console/dlt-receive.c +++ b/src/console/dlt-receive.c @@ -15,7 +15,7 @@ * * \author Alexander Wenzel BMW 2011-2012 * - * \file + * \file dlt-receive.c * For further information see http://www.genivi.org/. * @licence end@ */ diff --git a/src/daemon/dlt-daemon.c b/src/daemon/dlt-daemon.c index 99468ac..84abc30 100755 --- a/src/daemon/dlt-daemon.c +++ b/src/daemon/dlt-daemon.c @@ -15,7 +15,7 @@ * * \author Alexander Wenzel BMW 2011-2012 * - * \file + * \file dlt-daemon.c * For further information see http://www.genivi.org/. * @licence end@ */ diff --git a/src/daemon/dlt-daemon.h b/src/daemon/dlt-daemon.h index 602d007..e35c849 100755 --- a/src/daemon/dlt-daemon.h +++ b/src/daemon/dlt-daemon.h @@ -15,7 +15,7 @@ * * \author Alexander Wenzel BMW 2011-2012 * - * \file + * \file dlt-daemon.h * For further information see http://www.genivi.org/. * @licence end@ */ diff --git a/src/daemon/dlt-daemon_cfg.h b/src/daemon/dlt-daemon_cfg.h index b958fe3..a46cdef 100755 --- a/src/daemon/dlt-daemon_cfg.h +++ b/src/daemon/dlt-daemon_cfg.h @@ -15,7 +15,7 @@ * * \author Alexander Wenzel BMW 2011-2012 * - * \file + * \file dlt-daemon_cfg.h * For further information see http://www.genivi.org/. * @licence end@ */ diff --git a/src/daemon/dlt_daemon_common.c b/src/daemon/dlt_daemon_common.c index e1e7828..5838c76 100755 --- a/src/daemon/dlt_daemon_common.c +++ b/src/daemon/dlt_daemon_common.c @@ -15,7 +15,7 @@ * * \author Alexander Wenzel BMW 2011-2012 * - * \file + * \file dlt_daemon_common.c * For further information see http://www.genivi.org/. * @licence end@ */ diff --git a/src/daemon/dlt_daemon_common.h b/src/daemon/dlt_daemon_common.h index 3dcd596..a9aaa4c 100755 --- a/src/daemon/dlt_daemon_common.h +++ b/src/daemon/dlt_daemon_common.h @@ -15,7 +15,7 @@ * * \author Alexander Wenzel BMW 2011-2012 * - * \file + * \file dlt_daemon_common.h * For further information see http://www.genivi.org/. * @licence end@ */ diff --git a/src/daemon/dlt_daemon_common_cfg.h b/src/daemon/dlt_daemon_common_cfg.h index 8cc7dc6..808c68b 100755 --- a/src/daemon/dlt_daemon_common_cfg.h +++ b/src/daemon/dlt_daemon_common_cfg.h @@ -15,7 +15,7 @@ * * \author Alexander Wenzel BMW 2011-2012 * - * \file + * \file dlt_daemon_common_cfg.h * For further information see http://www.genivi.org/. * @licence end@ */ diff --git a/src/examples/dlt-example-filetransfer.c b/src/examples/dlt-example-filetransfer.c index 91201e7..6c18b21 100644 --- a/src/examples/dlt-example-filetransfer.c +++ b/src/examples/dlt-example-filetransfer.c @@ -15,7 +15,7 @@ * * \author Alexander Wenzel BMW 2011-2012 * - * \file + * \file dlt-example-filetransfer.c * For further information see http://www.genivi.org/. * @licence end@ */ diff --git a/src/examples/dlt-example-user-func.c b/src/examples/dlt-example-user-func.c index 5e50a3a..9bc15f4 100755 --- a/src/examples/dlt-example-user-func.c +++ b/src/examples/dlt-example-user-func.c @@ -15,7 +15,7 @@ * * \author Alexander Wenzel BMW 2011-2012 * - * \file + * \file dlt-example-user-func.c * For further information see http://www.genivi.org/. * @licence end@ */ diff --git a/src/examples/dlt-example-user.c b/src/examples/dlt-example-user.c index f97c0f4..4b55624 100755 --- a/src/examples/dlt-example-user.c +++ b/src/examples/dlt-example-user.c @@ -15,7 +15,7 @@ * * \author Alexander Wenzel BMW 2011-2012 * - * \file + * \file dlt-example-user.c * For further information see http://www.genivi.org/. * @licence end@ */ diff --git a/src/lib/dlt_client.c b/src/lib/dlt_client.c index 4c78da1..acc72f4 100755 --- a/src/lib/dlt_client.c +++ b/src/lib/dlt_client.c @@ -15,7 +15,7 @@ * * \author Alexander Wenzel BMW 2011-2012 * - * \file + * \file dlt_client.c * For further information see http://www.genivi.org/. * @licence end@ */ diff --git a/src/lib/dlt_client_cfg.h b/src/lib/dlt_client_cfg.h index f4c14e3..d011606 100755 --- a/src/lib/dlt_client_cfg.h +++ b/src/lib/dlt_client_cfg.h @@ -15,7 +15,7 @@ * * \author Alexander Wenzel BMW 2011-2012 * - * \file + * \file dlt_client_cfg.h * For further information see http://www.genivi.org/. * @licence end@ */ diff --git a/src/lib/dlt_filetransfer.c b/src/lib/dlt_filetransfer.c index 129c0a2..dbfaa82 100644 --- a/src/lib/dlt_filetransfer.c +++ b/src/lib/dlt_filetransfer.c @@ -15,7 +15,7 @@ * * \author Alexander Wenzel BMW 2011-2012 * - * \file + * \file dlt_filetransfer.c * For further information see http://www.genivi.org/. * @licence end@ */ diff --git a/src/lib/dlt_user.c b/src/lib/dlt_user.c index 33bab2c..e91e294 100755 --- a/src/lib/dlt_user.c +++ b/src/lib/dlt_user.c @@ -15,7 +15,7 @@ * * \author Alexander Wenzel BMW 2011-2012 * - * \file + * \file dlt_user.c * For further information see http://www.genivi.org/. * @licence end@ */ diff --git a/src/lib/dlt_user_cfg.h b/src/lib/dlt_user_cfg.h index f3b3f34..297b904 100755 --- a/src/lib/dlt_user_cfg.h +++ b/src/lib/dlt_user_cfg.h @@ -15,7 +15,7 @@ * * \author Alexander Wenzel BMW 2011-2012 * - * \file + * \file dlt_user_cfg.h * For further information see http://www.genivi.org/. * @licence end@ */ diff --git a/src/shared/dlt_common.c b/src/shared/dlt_common.c index ae465a1..457cb75 100755 --- a/src/shared/dlt_common.c +++ b/src/shared/dlt_common.c @@ -15,7 +15,7 @@ * * \author Alexander Wenzel BMW 2011-2012 * - * \file + * \file dlt_common.c * For further information see http://www.genivi.org/. * @licence end@ */ diff --git a/src/shared/dlt_common_cfg.h b/src/shared/dlt_common_cfg.h index c08c39c..81cb2c4 100755 --- a/src/shared/dlt_common_cfg.h +++ b/src/shared/dlt_common_cfg.h @@ -15,7 +15,7 @@ * * \author Alexander Wenzel BMW 2011-2012 * - * \file + * \file dlt_common_cfg.h * For further information see http://www.genivi.org/. * @licence end@ */ diff --git a/src/shared/dlt_offline_trace.c b/src/shared/dlt_offline_trace.c index be60a61..228bdfb 100644 --- a/src/shared/dlt_offline_trace.c +++ b/src/shared/dlt_offline_trace.c @@ -15,7 +15,7 @@ * * \author Alexander Wenzel BMW 2011-2012 * - * \file + * \file dlt_offline_trace.c * For further information see http://www.genivi.org/. * @licence end@ */ diff --git a/src/shared/dlt_shm.c b/src/shared/dlt_shm.c index 0502fb2..891a573 100644 --- a/src/shared/dlt_shm.c +++ b/src/shared/dlt_shm.c @@ -15,7 +15,7 @@ * * \author Alexander Wenzel BMW 2011-2012 * - * \file + * \file dlt_shm.c * For further information see http://www.genivi.org/. * @licence end@ */ diff --git a/src/shared/dlt_user_shared.c b/src/shared/dlt_user_shared.c index fbbaec3..7271c2c 100755 --- a/src/shared/dlt_user_shared.c +++ b/src/shared/dlt_user_shared.c @@ -15,7 +15,7 @@ * * \author Alexander Wenzel BMW 2011-2012 * - * \file + * \file dlt_user_shared.c * For further information see http://www.genivi.org/. * @licence end@ */ diff --git a/src/shared/dlt_user_shared.h b/src/shared/dlt_user_shared.h index 9ffcce8..ec891c3 100755 --- a/src/shared/dlt_user_shared.h +++ b/src/shared/dlt_user_shared.h @@ -15,7 +15,7 @@ * * \author Alexander Wenzel BMW 2011-2012 * - * \file + * \file dlt_user_shared.h * For further information see http://www.genivi.org/. * @licence end@ */ diff --git a/src/shared/dlt_user_shared_cfg.h b/src/shared/dlt_user_shared_cfg.h index 2357467..23ef43e 100755 --- a/src/shared/dlt_user_shared_cfg.h +++ b/src/shared/dlt_user_shared_cfg.h @@ -15,7 +15,7 @@ * * \author Alexander Wenzel BMW 2011-2012 * - * \file + * \file dlt_user_shared_cfg.h * For further information see http://www.genivi.org/. * @licence end@ */ diff --git a/src/system/dlt-system-log.c b/src/system/dlt-system-log.c index 104a96e..8ec47d9 100644 --- a/src/system/dlt-system-log.c +++ b/src/system/dlt-system-log.c @@ -15,7 +15,7 @@ * * \author Alexander Wenzel BMW 2011-2012 * - * \file + * \file dlt-system-log.c * For further information see http://www.genivi.org/. * @licence end@ */ diff --git a/src/system/dlt-system-log.h b/src/system/dlt-system-log.h index 55ac808..ad439ef 100644 --- a/src/system/dlt-system-log.h +++ b/src/system/dlt-system-log.h @@ -15,7 +15,7 @@ * * \author Alexander Wenzel BMW 2011-2012 * - * \file + * \file dlt-system-log.h * For further information see http://www.genivi.org/. * @licence end@ */ diff --git a/src/system/dlt-system.c b/src/system/dlt-system.c index fe9c86c..0200310 100755 --- a/src/system/dlt-system.c +++ b/src/system/dlt-system.c @@ -15,7 +15,7 @@ * * \author Alexander Wenzel BMW 2011-2012 * - * \file + * \file dlt-system.c * For further information see http://www.genivi.org/. * @licence end@ */ diff --git a/src/system/dlt-system.h b/src/system/dlt-system.h index 55e15cc..91a2fb3 100644 --- a/src/system/dlt-system.h +++ b/src/system/dlt-system.h @@ -15,7 +15,7 @@ * * \author Alexander Wenzel BMW 2011-2012 * - * \file + * \file dlt-system.h * For further information see http://www.genivi.org/. * @licence end@ */ diff --git a/src/system/dlt-system_cfg.h b/src/system/dlt-system_cfg.h index fce27e6..deb845f 100644 --- a/src/system/dlt-system_cfg.h +++ b/src/system/dlt-system_cfg.h @@ -15,7 +15,7 @@ * * \author Alexander Wenzel BMW 2011-2012 * - * \file + * \file dlt-system_cfg.h * For further information see http://www.genivi.org/. * @licence end@ */ diff --git a/src/tests/dlt-test-client.c b/src/tests/dlt-test-client.c index ed212fe..d25d90e 100755 --- a/src/tests/dlt-test-client.c +++ b/src/tests/dlt-test-client.c @@ -15,7 +15,7 @@ * * \author Alexander Wenzel BMW 2011-2012 * - * \file + * \file dlt-test-client.c * For further information see http://www.genivi.org/. * @licence end@ */ diff --git a/src/tests/dlt-test-filetransfer.c b/src/tests/dlt-test-filetransfer.c index 0813190..45575bb 100644 --- a/src/tests/dlt-test-filetransfer.c +++ b/src/tests/dlt-test-filetransfer.c @@ -15,7 +15,7 @@ * * \author Alexander Wenzel BMW 2011-2012 * - * \file + * \file dlt-test-filetransfer.c * For further information see http://www.genivi.org/. * @licence end@ */ diff --git a/src/tests/dlt-test-multi-process-client.c b/src/tests/dlt-test-multi-process-client.c index 7dc36a9..6aaabd8 100644 --- a/src/tests/dlt-test-multi-process-client.c +++ b/src/tests/dlt-test-multi-process-client.c @@ -15,7 +15,7 @@ * * \author Lassi Marttala BMW 2011-2012 * - * \file + * \file dlt-test-multi-process-client.c * For further information see http://www.genivi.org/. * @licence end@ */ diff --git a/src/tests/dlt-test-multi-process.c b/src/tests/dlt-test-multi-process.c index 9dbd507..7ecea87 100755 --- a/src/tests/dlt-test-multi-process.c +++ b/src/tests/dlt-test-multi-process.c @@ -15,7 +15,7 @@ * * \author Lassi Marttala BMW 2011-2012 * - * \file + * \file dlt-test-multi-process.c * For further information see http://www.genivi.org/. * @licence end@ */ diff --git a/src/tests/dlt-test-multi-process.h b/src/tests/dlt-test-multi-process.h index 92a8a5a..0c252ae 100644 --- a/src/tests/dlt-test-multi-process.h +++ b/src/tests/dlt-test-multi-process.h @@ -15,7 +15,7 @@ * * \author Lassi Marttala BMW 2011-2012 * - * \file + * \file dlt-test-multi-process.h * For further information see http://www.genivi.org/. * @licence end@ */ diff --git a/src/tests/dlt-test-stress-client.c b/src/tests/dlt-test-stress-client.c index bc628c9..db346f6 100644 --- a/src/tests/dlt-test-stress-client.c +++ b/src/tests/dlt-test-stress-client.c @@ -15,7 +15,7 @@ * * \author Alexander Wenzel BMW 2011-2012 * - * \file + * \file dlt-test-stress-client.c * For further information see http://www.genivi.org/. * @licence end@ */ diff --git a/src/tests/dlt-test-stress-user.c b/src/tests/dlt-test-stress-user.c index e8827ca..9065d92 100644 --- a/src/tests/dlt-test-stress-user.c +++ b/src/tests/dlt-test-stress-user.c @@ -15,7 +15,7 @@ * * \author Alexander Wenzel BMW 2011-2012 * - * \file + * \file dlt-test-stress-user.c * For further information see http://www.genivi.org/. * @licence end@ */ diff --git a/src/tests/dlt-test-stress.c b/src/tests/dlt-test-stress.c index 6e8baf1..81c5e53 100755 --- a/src/tests/dlt-test-stress.c +++ b/src/tests/dlt-test-stress.c @@ -15,7 +15,7 @@ * * \author Alexander Wenzel BMW 2011-2012 * - * \file + * \file dlt-test-stress.c * For further information see http://www.genivi.org/. * @licence end@ */ diff --git a/src/tests/dlt-test-user.c b/src/tests/dlt-test-user.c index 96e3491..cbbf0cf 100755 --- a/src/tests/dlt-test-user.c +++ b/src/tests/dlt-test-user.c @@ -15,7 +15,7 @@ * * \author Alexander Wenzel BMW 2011-2012 * - * \file + * \file dlt-test-user.c * For further information see http://www.genivi.org/. * @licence end@ */ -- cgit v1.2.1 From ab8ba08cdc407c7f2020a4bda7f01e88488b3ee4 Mon Sep 17 00:00:00 2001 From: Lassi Marttala Date: Mon, 26 Mar 2012 11:53:57 +0200 Subject: Increase versions. --- CMakeLists.txt | 2 +- README.txt | 2 +- ReleaseNotes.txt | 6 +++++- doc/dlt-daemon.1 | 2 +- doc/dlt-receive.1 | 2 +- doc/dlt-system.1 | 2 +- doc/dlt-system.conf.5 | 2 +- doc/dlt.conf.5 | 2 +- 8 files changed, 12 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 58a4cf4..f6339e2 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -23,7 +23,7 @@ set( CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS TRUE ) # Set version parameters set( DLT_MAJOR_VERSION 2) set( DLT_MINOR_VERSION 5) -set( DLT_PATCH_LEVEL 1) +set( DLT_PATCH_LEVEL 2) set( DLT_VERSION ${DLT_MAJOR_VERSION}.${DLT_MINOR_VERSION}.${DLT_PATCH_LEVEL}) set( DLT_VERSION_STATE RELEASE ) set( DLT_REVISION "") diff --git a/README.txt b/README.txt index 740c7b9..d407019 100644 --- a/README.txt +++ b/README.txt @@ -1,6 +1,6 @@ DLT - Automotive Diagnostic Log and Trace -Version: 2.5.1 +Version: 2.5.2 This component provides a standardised log and trace interface, based on the standardised protocol specified in the AUTOSAR standard 4.0 DLT. diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index 8e44b37..54401f9 100755 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -1,6 +1,6 @@ DLT - Automotive Diagnostic Log and Trace -Version: 2.5.1 +Version: 2.5.2 This component provides a standardised log and trace interface, based on the standardised protocol specified in the AUTOSAR standard 4.0 DLT. @@ -41,6 +41,10 @@ Christian Muck (christian.muck@bmw.de) Changes in this release ----------------------- +2.5.2 + + * Change to Mozilla Public License Version 2.0 + 2.5.1 * Fixed bug with comparinson between signed and unsigned integer and protection for a buffer overflow. diff --git a/doc/dlt-daemon.1 b/doc/dlt-daemon.1 index ee324cf..b63c291 100644 --- a/doc/dlt-daemon.1 +++ b/doc/dlt-daemon.1 @@ -1,4 +1,4 @@ -.TH dlt-daemon 1 "March 2, 2012" "version 2.5.1" "USER COMMANDS" +.TH dlt-daemon 1 "March 2, 2012" "version 2.5.2" "USER COMMANDS" .SH NAME dlt-daemon \- DLT daemon for logging and tracing purpose .SH SYNOPSIS diff --git a/doc/dlt-receive.1 b/doc/dlt-receive.1 index 9602bfc..31d3208 100644 --- a/doc/dlt-receive.1 +++ b/doc/dlt-receive.1 @@ -1,4 +1,4 @@ -.TH dlt-receive 1 "March 2, 2012" "version 2.5.1" "USER COMMANDS" +.TH dlt-receive 1 "March 2, 2012" "version 2.5.2" "USER COMMANDS" .SH NAME dlt-receive \- Console based client for DLT Logging .SH SYNOPSIS diff --git a/doc/dlt-system.1 b/doc/dlt-system.1 index 14630e9..20e5d1b 100644 --- a/doc/dlt-system.1 +++ b/doc/dlt-system.1 @@ -1,4 +1,4 @@ -.TH dlt-system 1 "March 2, 2012" "version 2.5.1" "USER COMMANDS" +.TH dlt-system 1 "March 2, 2012" "version 2.5.2" "USER COMMANDS" .SH NAME dlt-system \- DLT system logging process .SH SYNOPSIS diff --git a/doc/dlt-system.conf.5 b/doc/dlt-system.conf.5 index 8671d2c..576baeb 100644 --- a/doc/dlt-system.conf.5 +++ b/doc/dlt-system.conf.5 @@ -1,4 +1,4 @@ -.TH dlt-system.conf 5 "March 2, 2012" "version 2.5.1" "USER COMMANDS" +.TH dlt-system.conf 5 "March 2, 2012" "version 2.5.2" "USER COMMANDS" .SH NAME dlt-system.conf \- DLT system process configuration file .SH DESCRIPTION diff --git a/doc/dlt.conf.5 b/doc/dlt.conf.5 index 9ffaf0e..fcb9b5a 100644 --- a/doc/dlt.conf.5 +++ b/doc/dlt.conf.5 @@ -1,4 +1,4 @@ -.TH dlt.conf 5 "March 2, 2012" "version 2.5.1" "USER COMMANDS" +.TH dlt.conf 5 "March 2, 2012" "version 2.5.2" "USER COMMANDS" .SH NAME dlt.conf \- DLT daemon configuration file .SH DESCRIPTION -- cgit v1.2.1 From 2017da5d9554685c558ee6784142e0ea480fc78e Mon Sep 17 00:00:00 2001 From: Christian Muck Date: Tue, 27 Mar 2012 08:33:16 +0200 Subject: Corrected email of Alexander Wenzel Signed-off-by: Christian Muck --- CMakeLists.txt | 2 +- LICENSE.txt | 2 +- doc/CMakeLists.txt | 2 +- include/CMakeLists.txt | 2 +- include/dlt/CMakeLists.txt | 2 +- include/dlt/dlt.h | 2 +- include/dlt/dlt_client.h | 2 +- include/dlt/dlt_common.h | 2 +- include/dlt/dlt_offline_trace.h | 2 +- include/dlt/dlt_protocol.h | 2 +- include/dlt/dlt_shm.h | 2 +- include/dlt/dlt_types.h | 2 +- include/dlt/dlt_user.h | 2 +- include/dlt/dlt_user_macros.h | 2 +- src/CMakeLists.txt | 2 +- src/adaptor/CMakeLists.txt | 2 +- src/adaptor/dlt-adaptor-stdin.c | 2 +- src/adaptor/dlt-adaptor-udp.c | 2 +- src/console/CMakeLists.txt | 2 +- src/console/dlt-convert.c | 2 +- src/console/dlt-receive.c | 2 +- src/daemon/CMakeLists.txt | 2 +- src/daemon/dlt-daemon.c | 2 +- src/daemon/dlt-daemon.h | 2 +- src/daemon/dlt-daemon_cfg.h | 2 +- src/daemon/dlt_daemon_common.c | 2 +- src/daemon/dlt_daemon_common.h | 2 +- src/daemon/dlt_daemon_common_cfg.h | 2 +- src/examples/CMakeLists.txt | 2 +- src/examples/dlt-example-filetransfer.c | 2 +- src/examples/dlt-example-user-func.c | 2 +- src/examples/dlt-example-user.c | 2 +- src/lib/CMakeLists.txt | 2 +- src/lib/dlt_client.c | 2 +- src/lib/dlt_client_cfg.h | 2 +- src/lib/dlt_filetransfer.c | 2 +- src/lib/dlt_user.c | 2 +- src/lib/dlt_user_cfg.h | 2 +- src/shared/dlt_common.c | 2 +- src/shared/dlt_common_cfg.h | 2 +- src/shared/dlt_offline_trace.c | 2 +- src/shared/dlt_shm.c | 2 +- src/shared/dlt_user_shared.c | 2 +- src/shared/dlt_user_shared.h | 2 +- src/shared/dlt_user_shared_cfg.h | 2 +- src/system/CMakeLists.txt | 2 +- src/system/dlt-system-log.c | 2 +- src/system/dlt-system-log.h | 2 +- src/system/dlt-system.c | 2 +- src/system/dlt-system.h | 2 +- src/system/dlt-system_cfg.h | 2 +- src/tests/CMakeLists.txt | 2 +- src/tests/dlt-test-client.c | 2 +- src/tests/dlt-test-filetransfer.c | 2 +- src/tests/dlt-test-stress-client.c | 2 +- src/tests/dlt-test-stress-user.c | 2 +- src/tests/dlt-test-stress.c | 2 +- src/tests/dlt-test-user.c | 2 +- systemd/CMakeLists.txt | 2 +- testscripts/CMakeLists.txt | 2 +- 60 files changed, 60 insertions(+), 60 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f6339e2..05677bb 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,7 +2,7 @@ # Dlt - Diagnostic Log and Trace # @licence make begin@ # -# Copyright (C) 2011-2012, BMW AG - Alexander Wenzel +# Copyright (C) 2011-2012, BMW AG - Alexander Wenzel # # Contributions are licensed to the GENIVI Alliance under one or more # Contribution License Agreements. diff --git a/LICENSE.txt b/LICENSE.txt index 2c9f996..611d164 100755 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,6 +1,6 @@ # @licence make begin@ # - # Copyright (C) 2011-2012, BMW AG - Alexander Wenzel + # Copyright (C) 2011-2012, BMW AG - Alexander Wenzel # # Contributions are licensed to the GENIVI Alliance under one or more # Contribution License Agreements. diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt index b95fd58..fbcccb9 100755 --- a/doc/CMakeLists.txt +++ b/doc/CMakeLists.txt @@ -2,7 +2,7 @@ # Dlt - Diagnostic Log and Trace # @licence make begin@ # -# Copyright (C) 2011-2012, BMW AG - Alexander Wenzel +# Copyright (C) 2011-2012, BMW AG - Alexander Wenzel # # Contributions are licensed to the GENIVI Alliance under one or more # Contribution License Agreements. diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt index aa7fd66..b567380 100755 --- a/include/CMakeLists.txt +++ b/include/CMakeLists.txt @@ -2,7 +2,7 @@ # Dlt - Diagnostic Log and Trace # @licence make begin@ # -# Copyright (C) 2011-2012, BMW AG - Alexander Wenzel +# Copyright (C) 2011-2012, BMW AG - Alexander Wenzel # # Contributions are licensed to the GENIVI Alliance under one or more # Contribution License Agreements. diff --git a/include/dlt/CMakeLists.txt b/include/dlt/CMakeLists.txt index 50b97d2..95e764d 100755 --- a/include/dlt/CMakeLists.txt +++ b/include/dlt/CMakeLists.txt @@ -2,7 +2,7 @@ # Dlt - Diagnostic Log and Trace # @licence make begin@ # -# Copyright (C) 2011-2012, BMW AG - Alexander Wenzel +# Copyright (C) 2011-2012, BMW AG - Alexander Wenzel # # Contributions are licensed to the GENIVI Alliance under one or more # Contribution License Agreements. diff --git a/include/dlt/dlt.h b/include/dlt/dlt.h index 7437258..5c2d118 100755 --- a/include/dlt/dlt.h +++ b/include/dlt/dlt.h @@ -13,7 +13,7 @@ * this file, You can obtain one at http://mozilla.org/MPL/2.0/. * * - * \author Alexander Wenzel BMW 2011-2012 + * \author Alexander Wenzel BMW 2011-2012 * * \file dlt.h * For further information see http://www.genivi.org/. diff --git a/include/dlt/dlt_client.h b/include/dlt/dlt_client.h index c3dbc43..450d8cc 100755 --- a/include/dlt/dlt_client.h +++ b/include/dlt/dlt_client.h @@ -13,7 +13,7 @@ * this file, You can obtain one at http://mozilla.org/MPL/2.0/. * * - * \author Alexander Wenzel BMW 2011-2012 + * \author Alexander Wenzel BMW 2011-2012 * * \file dlt_client.h * For further information see http://www.genivi.org/. diff --git a/include/dlt/dlt_common.h b/include/dlt/dlt_common.h index c3acf49..686df19 100755 --- a/include/dlt/dlt_common.h +++ b/include/dlt/dlt_common.h @@ -13,7 +13,7 @@ * this file, You can obtain one at http://mozilla.org/MPL/2.0/. * * - * \author Alexander Wenzel BMW 2011-2012 + * \author Alexander Wenzel BMW 2011-2012 * * \file dlt_common.h * For further information see http://www.genivi.org/. diff --git a/include/dlt/dlt_offline_trace.h b/include/dlt/dlt_offline_trace.h index 49471e4..4b93719 100644 --- a/include/dlt/dlt_offline_trace.h +++ b/include/dlt/dlt_offline_trace.h @@ -13,7 +13,7 @@ * this file, You can obtain one at http://mozilla.org/MPL/2.0/. * * - * \author Alexander Wenzel BMW 2011-2012 + * \author Alexander Wenzel BMW 2011-2012 * * \file dlt_offline_trace.h * For further information see http://www.genivi.org/. diff --git a/include/dlt/dlt_protocol.h b/include/dlt/dlt_protocol.h index eeece40..1c30d66 100755 --- a/include/dlt/dlt_protocol.h +++ b/include/dlt/dlt_protocol.h @@ -13,7 +13,7 @@ * this file, You can obtain one at http://mozilla.org/MPL/2.0/. * * - * \author Alexander Wenzel BMW 2011-2012 + * \author Alexander Wenzel BMW 2011-2012 * * \file dlt_protocal.h * For further information see http://www.genivi.org/. diff --git a/include/dlt/dlt_shm.h b/include/dlt/dlt_shm.h index 1ae53a2..f8b821a 100644 --- a/include/dlt/dlt_shm.h +++ b/include/dlt/dlt_shm.h @@ -13,7 +13,7 @@ * this file, You can obtain one at http://mozilla.org/MPL/2.0/. * * - * \author Alexander Wenzel BMW 2011-2012 + * \author Alexander Wenzel BMW 2011-2012 * * \file dlt_shm.h * For further information see http://www.genivi.org/. diff --git a/include/dlt/dlt_types.h b/include/dlt/dlt_types.h index 9b18969..fd67fbc 100755 --- a/include/dlt/dlt_types.h +++ b/include/dlt/dlt_types.h @@ -13,7 +13,7 @@ * this file, You can obtain one at http://mozilla.org/MPL/2.0/. * * - * \author Alexander Wenzel BMW 2011-2012 + * \author Alexander Wenzel BMW 2011-2012 * * \file dlt_types.h * For further information see http://www.genivi.org/. diff --git a/include/dlt/dlt_user.h b/include/dlt/dlt_user.h index 250d6d2..b5135d4 100755 --- a/include/dlt/dlt_user.h +++ b/include/dlt/dlt_user.h @@ -13,7 +13,7 @@ * this file, You can obtain one at http://mozilla.org/MPL/2.0/. * * - * \author Alexander Wenzel BMW 2011-2012 + * \author Alexander Wenzel BMW 2011-2012 * * \file dlt_user.h * For further information see http://www.genivi.org/. diff --git a/include/dlt/dlt_user_macros.h b/include/dlt/dlt_user_macros.h index 9fd1f80..17a8ddb 100755 --- a/include/dlt/dlt_user_macros.h +++ b/include/dlt/dlt_user_macros.h @@ -13,7 +13,7 @@ * this file, You can obtain one at http://mozilla.org/MPL/2.0/. * * - * \author Alexander Wenzel BMW 2011-2012 + * \author Alexander Wenzel BMW 2011-2012 * * \file dlt_user_macros.h * For further information see http://www.genivi.org/. diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 8d126f8..e7b84c0 100755 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -2,7 +2,7 @@ # Dlt - Diagnostic Log and Trace # @licence make begin@ # -# Copyright (C) 2011-2012, BMW AG - Alexander Wenzel +# Copyright (C) 2011-2012, BMW AG - Alexander Wenzel # # Contributions are licensed to the GENIVI Alliance under one or more # Contribution License Agreements. diff --git a/src/adaptor/CMakeLists.txt b/src/adaptor/CMakeLists.txt index 8289cd5..45736d2 100755 --- a/src/adaptor/CMakeLists.txt +++ b/src/adaptor/CMakeLists.txt @@ -2,7 +2,7 @@ # Dlt - Diagnostic Log and Trace # @licence make begin@ # -# Copyright (C) 2011-2012, BMW AG - Alexander Wenzel +# Copyright (C) 2011-2012, BMW AG - Alexander Wenzel # # Contributions are licensed to the GENIVI Alliance under one or more # Contribution License Agreements. diff --git a/src/adaptor/dlt-adaptor-stdin.c b/src/adaptor/dlt-adaptor-stdin.c index ea9b122..fa3ab72 100755 --- a/src/adaptor/dlt-adaptor-stdin.c +++ b/src/adaptor/dlt-adaptor-stdin.c @@ -13,7 +13,7 @@ * this file, You can obtain one at http://mozilla.org/MPL/2.0/. * * - * \author Alexander Wenzel BMW 2011-2012 + * \author Alexander Wenzel BMW 2011-2012 * * \file dlt-adaptor-stdin.c * For further information see http://www.genivi.org/. diff --git a/src/adaptor/dlt-adaptor-udp.c b/src/adaptor/dlt-adaptor-udp.c index 2f81794..11873e1 100755 --- a/src/adaptor/dlt-adaptor-udp.c +++ b/src/adaptor/dlt-adaptor-udp.c @@ -13,7 +13,7 @@ * this file, You can obtain one at http://mozilla.org/MPL/2.0/. * * - * \author Alexander Wenzel BMW 2011-2012 + * \author Alexander Wenzel BMW 2011-2012 * * \file dlt-adaptor-udp.c * For further information see http://www.genivi.org/. diff --git a/src/console/CMakeLists.txt b/src/console/CMakeLists.txt index 416bf10..bc60d43 100755 --- a/src/console/CMakeLists.txt +++ b/src/console/CMakeLists.txt @@ -2,7 +2,7 @@ # Dlt - Diagnostic Log and Trace # @licence make begin@ # -# Copyright (C) 2011-2012, BMW AG - Alexander Wenzel +# Copyright (C) 2011-2012, BMW AG - Alexander Wenzel # # Contributions are licensed to the GENIVI Alliance under one or more # Contribution License Agreements. diff --git a/src/console/dlt-convert.c b/src/console/dlt-convert.c index 678aadf..854576c 100755 --- a/src/console/dlt-convert.c +++ b/src/console/dlt-convert.c @@ -13,7 +13,7 @@ * this file, You can obtain one at http://mozilla.org/MPL/2.0/. * * - * \author Alexander Wenzel BMW 2011-2012 + * \author Alexander Wenzel BMW 2011-2012 * * \file dlt-convert.c * For further information see http://www.genivi.org/. diff --git a/src/console/dlt-receive.c b/src/console/dlt-receive.c index 5a697e0..0f0a908 100755 --- a/src/console/dlt-receive.c +++ b/src/console/dlt-receive.c @@ -13,7 +13,7 @@ * this file, You can obtain one at http://mozilla.org/MPL/2.0/. * * - * \author Alexander Wenzel BMW 2011-2012 + * \author Alexander Wenzel BMW 2011-2012 * * \file dlt-receive.c * For further information see http://www.genivi.org/. diff --git a/src/daemon/CMakeLists.txt b/src/daemon/CMakeLists.txt index ce66c7b..b868a0f 100755 --- a/src/daemon/CMakeLists.txt +++ b/src/daemon/CMakeLists.txt @@ -2,7 +2,7 @@ # Dlt - Diagnostic Log and Trace # @licence make begin@ # -# Copyright (C) 2011-2012, BMW AG - Alexander Wenzel +# Copyright (C) 2011-2012, BMW AG - Alexander Wenzel # # Contributions are licensed to the GENIVI Alliance under one or more # Contribution License Agreements. diff --git a/src/daemon/dlt-daemon.c b/src/daemon/dlt-daemon.c index 84abc30..79d8bea 100755 --- a/src/daemon/dlt-daemon.c +++ b/src/daemon/dlt-daemon.c @@ -13,7 +13,7 @@ * this file, You can obtain one at http://mozilla.org/MPL/2.0/. * * - * \author Alexander Wenzel BMW 2011-2012 + * \author Alexander Wenzel BMW 2011-2012 * * \file dlt-daemon.c * For further information see http://www.genivi.org/. diff --git a/src/daemon/dlt-daemon.h b/src/daemon/dlt-daemon.h index e35c849..36ad2ba 100755 --- a/src/daemon/dlt-daemon.h +++ b/src/daemon/dlt-daemon.h @@ -13,7 +13,7 @@ * this file, You can obtain one at http://mozilla.org/MPL/2.0/. * * - * \author Alexander Wenzel BMW 2011-2012 + * \author Alexander Wenzel BMW 2011-2012 * * \file dlt-daemon.h * For further information see http://www.genivi.org/. diff --git a/src/daemon/dlt-daemon_cfg.h b/src/daemon/dlt-daemon_cfg.h index a46cdef..a038070 100755 --- a/src/daemon/dlt-daemon_cfg.h +++ b/src/daemon/dlt-daemon_cfg.h @@ -13,7 +13,7 @@ * this file, You can obtain one at http://mozilla.org/MPL/2.0/. * * - * \author Alexander Wenzel BMW 2011-2012 + * \author Alexander Wenzel BMW 2011-2012 * * \file dlt-daemon_cfg.h * For further information see http://www.genivi.org/. diff --git a/src/daemon/dlt_daemon_common.c b/src/daemon/dlt_daemon_common.c index 5838c76..fe82ec1 100755 --- a/src/daemon/dlt_daemon_common.c +++ b/src/daemon/dlt_daemon_common.c @@ -13,7 +13,7 @@ * this file, You can obtain one at http://mozilla.org/MPL/2.0/. * * - * \author Alexander Wenzel BMW 2011-2012 + * \author Alexander Wenzel BMW 2011-2012 * * \file dlt_daemon_common.c * For further information see http://www.genivi.org/. diff --git a/src/daemon/dlt_daemon_common.h b/src/daemon/dlt_daemon_common.h index a9aaa4c..9bbe3c7 100755 --- a/src/daemon/dlt_daemon_common.h +++ b/src/daemon/dlt_daemon_common.h @@ -13,7 +13,7 @@ * this file, You can obtain one at http://mozilla.org/MPL/2.0/. * * - * \author Alexander Wenzel BMW 2011-2012 + * \author Alexander Wenzel BMW 2011-2012 * * \file dlt_daemon_common.h * For further information see http://www.genivi.org/. diff --git a/src/daemon/dlt_daemon_common_cfg.h b/src/daemon/dlt_daemon_common_cfg.h index 808c68b..5783708 100755 --- a/src/daemon/dlt_daemon_common_cfg.h +++ b/src/daemon/dlt_daemon_common_cfg.h @@ -13,7 +13,7 @@ * this file, You can obtain one at http://mozilla.org/MPL/2.0/. * * - * \author Alexander Wenzel BMW 2011-2012 + * \author Alexander Wenzel BMW 2011-2012 * * \file dlt_daemon_common_cfg.h * For further information see http://www.genivi.org/. diff --git a/src/examples/CMakeLists.txt b/src/examples/CMakeLists.txt index fb02fb6..302a7ac 100755 --- a/src/examples/CMakeLists.txt +++ b/src/examples/CMakeLists.txt @@ -2,7 +2,7 @@ # Dlt - Diagnostic Log and Trace # @licence make begin@ # -# Copyright (C) 2011-2012, BMW AG - Alexander Wenzel +# Copyright (C) 2011-2012, BMW AG - Alexander Wenzel # # Contributions are licensed to the GENIVI Alliance under one or more # Contribution License Agreements. diff --git a/src/examples/dlt-example-filetransfer.c b/src/examples/dlt-example-filetransfer.c index 6c18b21..adbe85b 100644 --- a/src/examples/dlt-example-filetransfer.c +++ b/src/examples/dlt-example-filetransfer.c @@ -13,7 +13,7 @@ * this file, You can obtain one at http://mozilla.org/MPL/2.0/. * * - * \author Alexander Wenzel BMW 2011-2012 + * \author Alexander Wenzel BMW 2011-2012 * * \file dlt-example-filetransfer.c * For further information see http://www.genivi.org/. diff --git a/src/examples/dlt-example-user-func.c b/src/examples/dlt-example-user-func.c index 9bc15f4..e716335 100755 --- a/src/examples/dlt-example-user-func.c +++ b/src/examples/dlt-example-user-func.c @@ -13,7 +13,7 @@ * this file, You can obtain one at http://mozilla.org/MPL/2.0/. * * - * \author Alexander Wenzel BMW 2011-2012 + * \author Alexander Wenzel BMW 2011-2012 * * \file dlt-example-user-func.c * For further information see http://www.genivi.org/. diff --git a/src/examples/dlt-example-user.c b/src/examples/dlt-example-user.c index 4b55624..ad4e654 100755 --- a/src/examples/dlt-example-user.c +++ b/src/examples/dlt-example-user.c @@ -13,7 +13,7 @@ * this file, You can obtain one at http://mozilla.org/MPL/2.0/. * * - * \author Alexander Wenzel BMW 2011-2012 + * \author Alexander Wenzel BMW 2011-2012 * * \file dlt-example-user.c * For further information see http://www.genivi.org/. diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt index 2133279..00e096a 100755 --- a/src/lib/CMakeLists.txt +++ b/src/lib/CMakeLists.txt @@ -2,7 +2,7 @@ # Dlt - Diagnostic Log and Trace # @licence make begin@ # -# Copyright (C) 2011-2012, BMW AG - Alexander Wenzel +# Copyright (C) 2011-2012, BMW AG - Alexander Wenzel # # Contributions are licensed to the GENIVI Alliance under one or more # Contribution License Agreements. diff --git a/src/lib/dlt_client.c b/src/lib/dlt_client.c index acc72f4..39b5b07 100755 --- a/src/lib/dlt_client.c +++ b/src/lib/dlt_client.c @@ -13,7 +13,7 @@ * this file, You can obtain one at http://mozilla.org/MPL/2.0/. * * - * \author Alexander Wenzel BMW 2011-2012 + * \author Alexander Wenzel BMW 2011-2012 * * \file dlt_client.c * For further information see http://www.genivi.org/. diff --git a/src/lib/dlt_client_cfg.h b/src/lib/dlt_client_cfg.h index d011606..8bb3885 100755 --- a/src/lib/dlt_client_cfg.h +++ b/src/lib/dlt_client_cfg.h @@ -13,7 +13,7 @@ * this file, You can obtain one at http://mozilla.org/MPL/2.0/. * * - * \author Alexander Wenzel BMW 2011-2012 + * \author Alexander Wenzel BMW 2011-2012 * * \file dlt_client_cfg.h * For further information see http://www.genivi.org/. diff --git a/src/lib/dlt_filetransfer.c b/src/lib/dlt_filetransfer.c index dbfaa82..359ad2c 100644 --- a/src/lib/dlt_filetransfer.c +++ b/src/lib/dlt_filetransfer.c @@ -13,7 +13,7 @@ * this file, You can obtain one at http://mozilla.org/MPL/2.0/. * * - * \author Alexander Wenzel BMW 2011-2012 + * \author Alexander Wenzel BMW 2011-2012 * * \file dlt_filetransfer.c * For further information see http://www.genivi.org/. diff --git a/src/lib/dlt_user.c b/src/lib/dlt_user.c index e91e294..568ae86 100755 --- a/src/lib/dlt_user.c +++ b/src/lib/dlt_user.c @@ -13,7 +13,7 @@ * this file, You can obtain one at http://mozilla.org/MPL/2.0/. * * - * \author Alexander Wenzel BMW 2011-2012 + * \author Alexander Wenzel BMW 2011-2012 * * \file dlt_user.c * For further information see http://www.genivi.org/. diff --git a/src/lib/dlt_user_cfg.h b/src/lib/dlt_user_cfg.h index 297b904..cf1ad9d 100755 --- a/src/lib/dlt_user_cfg.h +++ b/src/lib/dlt_user_cfg.h @@ -13,7 +13,7 @@ * this file, You can obtain one at http://mozilla.org/MPL/2.0/. * * - * \author Alexander Wenzel BMW 2011-2012 + * \author Alexander Wenzel BMW 2011-2012 * * \file dlt_user_cfg.h * For further information see http://www.genivi.org/. diff --git a/src/shared/dlt_common.c b/src/shared/dlt_common.c index 457cb75..4ebdaf1 100755 --- a/src/shared/dlt_common.c +++ b/src/shared/dlt_common.c @@ -13,7 +13,7 @@ * this file, You can obtain one at http://mozilla.org/MPL/2.0/. * * - * \author Alexander Wenzel BMW 2011-2012 + * \author Alexander Wenzel BMW 2011-2012 * * \file dlt_common.c * For further information see http://www.genivi.org/. diff --git a/src/shared/dlt_common_cfg.h b/src/shared/dlt_common_cfg.h index 81cb2c4..4021737 100755 --- a/src/shared/dlt_common_cfg.h +++ b/src/shared/dlt_common_cfg.h @@ -13,7 +13,7 @@ * this file, You can obtain one at http://mozilla.org/MPL/2.0/. * * - * \author Alexander Wenzel BMW 2011-2012 + * \author Alexander Wenzel BMW 2011-2012 * * \file dlt_common_cfg.h * For further information see http://www.genivi.org/. diff --git a/src/shared/dlt_offline_trace.c b/src/shared/dlt_offline_trace.c index 228bdfb..4aba9b8 100644 --- a/src/shared/dlt_offline_trace.c +++ b/src/shared/dlt_offline_trace.c @@ -13,7 +13,7 @@ * this file, You can obtain one at http://mozilla.org/MPL/2.0/. * * - * \author Alexander Wenzel BMW 2011-2012 + * \author Alexander Wenzel BMW 2011-2012 * * \file dlt_offline_trace.c * For further information see http://www.genivi.org/. diff --git a/src/shared/dlt_shm.c b/src/shared/dlt_shm.c index 891a573..a3eab81 100644 --- a/src/shared/dlt_shm.c +++ b/src/shared/dlt_shm.c @@ -13,7 +13,7 @@ * this file, You can obtain one at http://mozilla.org/MPL/2.0/. * * - * \author Alexander Wenzel BMW 2011-2012 + * \author Alexander Wenzel BMW 2011-2012 * * \file dlt_shm.c * For further information see http://www.genivi.org/. diff --git a/src/shared/dlt_user_shared.c b/src/shared/dlt_user_shared.c index 7271c2c..300b77e 100755 --- a/src/shared/dlt_user_shared.c +++ b/src/shared/dlt_user_shared.c @@ -13,7 +13,7 @@ * this file, You can obtain one at http://mozilla.org/MPL/2.0/. * * - * \author Alexander Wenzel BMW 2011-2012 + * \author Alexander Wenzel BMW 2011-2012 * * \file dlt_user_shared.c * For further information see http://www.genivi.org/. diff --git a/src/shared/dlt_user_shared.h b/src/shared/dlt_user_shared.h index ec891c3..251a12e 100755 --- a/src/shared/dlt_user_shared.h +++ b/src/shared/dlt_user_shared.h @@ -13,7 +13,7 @@ * this file, You can obtain one at http://mozilla.org/MPL/2.0/. * * - * \author Alexander Wenzel BMW 2011-2012 + * \author Alexander Wenzel BMW 2011-2012 * * \file dlt_user_shared.h * For further information see http://www.genivi.org/. diff --git a/src/shared/dlt_user_shared_cfg.h b/src/shared/dlt_user_shared_cfg.h index 23ef43e..20b49bd 100755 --- a/src/shared/dlt_user_shared_cfg.h +++ b/src/shared/dlt_user_shared_cfg.h @@ -13,7 +13,7 @@ * this file, You can obtain one at http://mozilla.org/MPL/2.0/. * * - * \author Alexander Wenzel BMW 2011-2012 + * \author Alexander Wenzel BMW 2011-2012 * * \file dlt_user_shared_cfg.h * For further information see http://www.genivi.org/. diff --git a/src/system/CMakeLists.txt b/src/system/CMakeLists.txt index 2964e29..18bbb2b 100755 --- a/src/system/CMakeLists.txt +++ b/src/system/CMakeLists.txt @@ -2,7 +2,7 @@ # Dlt - Diagnostic Log and Trace # @licence make begin@ # -# Copyright (C) 2011-2012, BMW AG - Alexander Wenzel +# Copyright (C) 2011-2012, BMW AG - Alexander Wenzel # # Contributions are licensed to the GENIVI Alliance under one or more # Contribution License Agreements. diff --git a/src/system/dlt-system-log.c b/src/system/dlt-system-log.c index 8ec47d9..c9dada4 100644 --- a/src/system/dlt-system-log.c +++ b/src/system/dlt-system-log.c @@ -13,7 +13,7 @@ * this file, You can obtain one at http://mozilla.org/MPL/2.0/. * * - * \author Alexander Wenzel BMW 2011-2012 + * \author Alexander Wenzel BMW 2011-2012 * * \file dlt-system-log.c * For further information see http://www.genivi.org/. diff --git a/src/system/dlt-system-log.h b/src/system/dlt-system-log.h index ad439ef..d79ce8e 100644 --- a/src/system/dlt-system-log.h +++ b/src/system/dlt-system-log.h @@ -13,7 +13,7 @@ * this file, You can obtain one at http://mozilla.org/MPL/2.0/. * * - * \author Alexander Wenzel BMW 2011-2012 + * \author Alexander Wenzel BMW 2011-2012 * * \file dlt-system-log.h * For further information see http://www.genivi.org/. diff --git a/src/system/dlt-system.c b/src/system/dlt-system.c index 0200310..e8dd7c5 100755 --- a/src/system/dlt-system.c +++ b/src/system/dlt-system.c @@ -13,7 +13,7 @@ * this file, You can obtain one at http://mozilla.org/MPL/2.0/. * * - * \author Alexander Wenzel BMW 2011-2012 + * \author Alexander Wenzel BMW 2011-2012 * * \file dlt-system.c * For further information see http://www.genivi.org/. diff --git a/src/system/dlt-system.h b/src/system/dlt-system.h index 91a2fb3..2c5825a 100644 --- a/src/system/dlt-system.h +++ b/src/system/dlt-system.h @@ -13,7 +13,7 @@ * this file, You can obtain one at http://mozilla.org/MPL/2.0/. * * - * \author Alexander Wenzel BMW 2011-2012 + * \author Alexander Wenzel BMW 2011-2012 * * \file dlt-system.h * For further information see http://www.genivi.org/. diff --git a/src/system/dlt-system_cfg.h b/src/system/dlt-system_cfg.h index deb845f..79ce5e4 100644 --- a/src/system/dlt-system_cfg.h +++ b/src/system/dlt-system_cfg.h @@ -13,7 +13,7 @@ * this file, You can obtain one at http://mozilla.org/MPL/2.0/. * * - * \author Alexander Wenzel BMW 2011-2012 + * \author Alexander Wenzel BMW 2011-2012 * * \file dlt-system_cfg.h * For further information see http://www.genivi.org/. diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt index 9ad5180..3d5ab91 100755 --- a/src/tests/CMakeLists.txt +++ b/src/tests/CMakeLists.txt @@ -2,7 +2,7 @@ # Dlt - Diagnostic Log and Trace # @licence make begin@ # -# Copyright (C) 2011-2012, BMW AG - Alexander Wenzel +# Copyright (C) 2011-2012, BMW AG - Alexander Wenzel # # Contributions are licensed to the GENIVI Alliance under one or more # Contribution License Agreements. diff --git a/src/tests/dlt-test-client.c b/src/tests/dlt-test-client.c index d25d90e..318bd32 100755 --- a/src/tests/dlt-test-client.c +++ b/src/tests/dlt-test-client.c @@ -13,7 +13,7 @@ * this file, You can obtain one at http://mozilla.org/MPL/2.0/. * * - * \author Alexander Wenzel BMW 2011-2012 + * \author Alexander Wenzel BMW 2011-2012 * * \file dlt-test-client.c * For further information see http://www.genivi.org/. diff --git a/src/tests/dlt-test-filetransfer.c b/src/tests/dlt-test-filetransfer.c index 45575bb..2d0b9ef 100644 --- a/src/tests/dlt-test-filetransfer.c +++ b/src/tests/dlt-test-filetransfer.c @@ -13,7 +13,7 @@ * this file, You can obtain one at http://mozilla.org/MPL/2.0/. * * - * \author Alexander Wenzel BMW 2011-2012 + * \author Alexander Wenzel BMW 2011-2012 * * \file dlt-test-filetransfer.c * For further information see http://www.genivi.org/. diff --git a/src/tests/dlt-test-stress-client.c b/src/tests/dlt-test-stress-client.c index db346f6..5c0310d 100644 --- a/src/tests/dlt-test-stress-client.c +++ b/src/tests/dlt-test-stress-client.c @@ -13,7 +13,7 @@ * this file, You can obtain one at http://mozilla.org/MPL/2.0/. * * - * \author Alexander Wenzel BMW 2011-2012 + * \author Alexander Wenzel BMW 2011-2012 * * \file dlt-test-stress-client.c * For further information see http://www.genivi.org/. diff --git a/src/tests/dlt-test-stress-user.c b/src/tests/dlt-test-stress-user.c index 9065d92..5696705 100644 --- a/src/tests/dlt-test-stress-user.c +++ b/src/tests/dlt-test-stress-user.c @@ -13,7 +13,7 @@ * this file, You can obtain one at http://mozilla.org/MPL/2.0/. * * - * \author Alexander Wenzel BMW 2011-2012 + * \author Alexander Wenzel BMW 2011-2012 * * \file dlt-test-stress-user.c * For further information see http://www.genivi.org/. diff --git a/src/tests/dlt-test-stress.c b/src/tests/dlt-test-stress.c index 81c5e53..89443f9 100755 --- a/src/tests/dlt-test-stress.c +++ b/src/tests/dlt-test-stress.c @@ -13,7 +13,7 @@ * this file, You can obtain one at http://mozilla.org/MPL/2.0/. * * - * \author Alexander Wenzel BMW 2011-2012 + * \author Alexander Wenzel BMW 2011-2012 * * \file dlt-test-stress.c * For further information see http://www.genivi.org/. diff --git a/src/tests/dlt-test-user.c b/src/tests/dlt-test-user.c index cbbf0cf..7a3f2fa 100755 --- a/src/tests/dlt-test-user.c +++ b/src/tests/dlt-test-user.c @@ -13,7 +13,7 @@ * this file, You can obtain one at http://mozilla.org/MPL/2.0/. * * - * \author Alexander Wenzel BMW 2011-2012 + * \author Alexander Wenzel BMW 2011-2012 * * \file dlt-test-user.c * For further information see http://www.genivi.org/. diff --git a/systemd/CMakeLists.txt b/systemd/CMakeLists.txt index 0a2c5e0..e51250d 100644 --- a/systemd/CMakeLists.txt +++ b/systemd/CMakeLists.txt @@ -2,7 +2,7 @@ # Dlt - Diagnostic Log and Trace # @licence make begin@ # -# Copyright (C) 2011-2012, BMW AG - Alexander Wenzel +# Copyright (C) 2011-2012, BMW AG - Alexander Wenzel # # Contributions are licensed to the GENIVI Alliance under one or more # Contribution License Agreements. diff --git a/testscripts/CMakeLists.txt b/testscripts/CMakeLists.txt index 63d9e81..34413c3 100755 --- a/testscripts/CMakeLists.txt +++ b/testscripts/CMakeLists.txt @@ -2,7 +2,7 @@ # Dlt - Diagnostic Log and Trace # @licence make begin@ # -# Copyright (C) 2011-2012, BMW AG - Alexander Wenzel +# Copyright (C) 2011-2012, BMW AG - Alexander Wenzel # # Contributions are licensed to the GENIVI Alliance under one or more # Contribution License Agreements. -- cgit v1.2.1