From 0613aaf9422622cc040a659cfc412e7f80361ff0 Mon Sep 17 00:00:00 2001 From: Jan Holst Jensen Date: Thu, 10 Oct 2024 20:36:18 +0200 Subject: [PATCH 1/3] Change licence to MIT licence so we use the same licence as InChI 1.07 and forward. Change source file licence headers to be much briefer and reference the full RInChI MIT licence text by relative file name path. Add CONTRIBUTORS file to keep source file licence headers brief and simple. --- CONTRIBUTORS.txt | 15 + LICENCE.txt | 34 +++ scripts/rewrite_license_headers.py | 65 ++--- scripts/sourcefile_license_header.txt | 4 + src/LICENCES/LICENCE.TXT | 268 ------------------ src/LICENCES/RINCHI_LICENCE.TXT | 17 -- src/LICENCES/bsd_license.txt | 34 --- src/LICENCES/rinchi_license.txt | 34 --- .../rinchi_cmdline/rinchi_cmdline.cpp | 42 +-- .../rxn_from_molfiles/rxn_from_molfiles.cpp | 42 +-- src/lib/inchi_api_intf.cpp | 42 +-- src/lib/inchi_api_intf.h | 42 +-- src/lib/inchi_generator.cpp | 42 +-- src/lib/inchi_generator.h | 42 +-- src/lib/rinchi_hashing.cpp | 42 +-- src/lib/rinchi_hashing.h | 42 +-- src/lib/rinchi_logger.cpp | 42 +-- src/lib/rinchi_logger.h | 42 +-- src/lib/rinchi_platform.h | 42 +-- src/lib/rinchi_utils.cpp | 42 +-- src/lib/rinchi_utils.h | 42 +-- src/lib/unit_test.cpp | 42 +-- src/lib/unit_test.h | 42 +-- src/parsers/generic_line_reader.h | 42 +-- src/parsers/mdl_molfile.cpp | 42 +-- src/parsers/mdl_molfile.h | 42 +-- src/parsers/mdl_molfile_reader.cpp | 42 +-- src/parsers/mdl_molfile_reader.h | 42 +-- src/parsers/mdl_rdfile.h | 42 +-- src/parsers/mdl_rdfile_reader.cpp | 42 +-- src/parsers/mdl_rdfile_reader.h | 42 +-- src/parsers/mdl_rxnfile.h | 42 +-- src/parsers/mdl_rxnfile_reader.cpp | 42 +-- src/parsers/mdl_rxnfile_reader.h | 42 +-- src/parsers/rinchi_reader.cpp | 42 +-- src/parsers/rinchi_reader.h | 42 +-- src/rinchi/rinchi_consts.cpp | 42 +-- src/rinchi/rinchi_consts.h | 42 +-- src/rinchi/rinchi_reaction.cpp | 42 +-- src/rinchi/rinchi_reaction.h | 42 +-- src/rinchi_lib/rinchi_lib.cpp | 42 +-- src/rinchi_lib/rinchi_lib.h | 42 +-- src/rinchi_lib/rinchi_lib.py | 42 +-- src/rinchi_lib/test.py | 42 +-- src/rinchi_ora_cartridge/packages/rinorca.pck | 42 +-- .../rinchi_ora_cartridge.cpp | 42 +-- .../rinchi_ora_cartridge.h | 42 +-- src/test/test_suite/rinchi_test_suite.cpp | 42 +-- .../test_suite/tests/Cambridge_data_tests.cpp | 42 +-- .../test_suite/tests/Cambridge_data_tests.h | 42 +-- .../tests/USPTO_patent_data_tests.cpp | 42 +-- .../tests/USPTO_patent_data_tests.h | 42 +-- .../test_suite/tests/molfile_reader_tests.cpp | 42 +-- .../test_suite/tests/molfile_reader_tests.h | 42 +-- src/test/test_suite/tests/rdfile_tests.cpp | 42 +-- src/test/test_suite/tests/rdfile_tests.h | 42 +-- src/test/test_suite/tests/reaction_tests.cpp | 42 +-- src/test/test_suite/tests/reaction_tests.h | 42 +-- .../test_suite/tests/rinchi_reader_tests.cpp | 42 +-- .../test_suite/tests/rinchi_reader_tests.h | 42 +-- src/test/test_suite/tests/rxnfile_tests.cpp | 42 +-- src/test/test_suite/tests/rxnfile_tests.h | 42 +-- .../test_suite/tests/special_atoms_tests.cpp | 42 +-- .../test_suite/tests/special_atoms_tests.h | 42 +-- src/writers/mdl_rdfile_writer.cpp | 42 +-- src/writers/mdl_rdfile_writer.h | 42 +-- src/writers/mdl_rxnfile_writer.cpp | 42 +-- src/writers/mdl_rxnfile_writer.h | 42 +-- 68 files changed, 439 insertions(+), 2552 deletions(-) create mode 100644 CONTRIBUTORS.txt create mode 100644 LICENCE.txt create mode 100644 scripts/sourcefile_license_header.txt delete mode 100644 src/LICENCES/LICENCE.TXT delete mode 100644 src/LICENCES/RINCHI_LICENCE.TXT delete mode 100644 src/LICENCES/bsd_license.txt delete mode 100644 src/LICENCES/rinchi_license.txt diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt new file mode 100644 index 000000000..12fab8341 --- /dev/null +++ b/CONTRIBUTORS.txt @@ -0,0 +1,15 @@ +Biochemfusion Holding ApS +www.biochemfusion.com + +Files originally contributed: + + src/lib/inchi_api_intf.cpp and .h + src/lib/inchi_generator.cpp and .h + src/lib/rinchi_utils.cpp and .h + src/lib/unit_test.cpp and .h + src/parsers/generic_line_reader.h + src/parsers/mdl_molfile.cpp and .h + src/parsers/mdl_molfile_reader.cpp and .h + +; End of file listing for Biochemfusion. + diff --git a/LICENCE.txt b/LICENCE.txt new file mode 100644 index 000000000..82c1a86ec --- /dev/null +++ b/LICENCE.txt @@ -0,0 +1,34 @@ +MIT License + +Copyright (C) 2024 InChI Project + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. + +The InChI library and programs are free software developed under the +auspices of the International Union of Pure and Applied Chemistry (IUPAC). +Originally developed at NIST. Modifications and additions by IUPAC and the +InChI Trust. + +Some portions of code were developed/changed by external contributors +(either contractor or volunteer) which are listed in the file +'CONTRIBUTORS.txt'. + +For inquiries, contact +info@inchi-trust.org + diff --git a/scripts/rewrite_license_headers.py b/scripts/rewrite_license_headers.py index a88b1ca74..2b8e08818 100644 --- a/scripts/rewrite_license_headers.py +++ b/scripts/rewrite_license_headers.py @@ -4,18 +4,18 @@ import sys import os +import datetime +import re processed_file_count = 0 def process_source_file(a_filename): - global BSD_LICENSE_TXT global RINCHI_LICENSE_TXT - global BSD_LICENSE_TXT_PYTHON global RINCHI_LICENSE_TXT_PYTHON source_txt = open(a_filename).readlines() start_line = 0 - while start_line < len(source_txt) and source_txt[start_line].find(BSD_LICENSE_MARKER_BEGIN) < 0 and source_txt[start_line].find(RINCHI_LICENSE_MARKER_BEGIN) < 0: + while start_line < len(source_txt) and source_txt[start_line].find(LICENSE_MARKER_BEGIN) < 0: start_line = start_line + 1 if start_line < len(source_txt): @@ -26,16 +26,17 @@ def process_source_file(a_filename): if stop_line >= len(source_txt): raise Exception, "File '" + a_filename + "' has a license-begin marker but no end marker." - if source_txt[start_line].find(BSD_LICENSE_MARKER_BEGIN) >= 0: - if a_filename.endswith('.py'): - new_txt = source_txt[0:start_line + 1] + BSD_LICENSE_TXT_PYTHON + source_txt[stop_line:] - else: - new_txt = source_txt[0:start_line + 1] + BSD_LICENSE_TXT + source_txt[stop_line:] + # print(a_filename) + license_path = re.sub("/[a-zA-Z0-9_-]*?/", "/../", a_filename) + license_path = re.sub("/[a-zA-Z0-9_-]*?/", "/../", license_path) + license_path = license_path[0:license_path.rfind("/")] + "/LICENCE.txt" + # Convert first parent folder reference to current folder reference. + license_path = license_path[1:] + + if a_filename.endswith('.py'): + new_txt = source_txt[0:start_line + 1] + [s.replace("%LICENSE_PATH%", license_path) for s in RINCHI_LICENSE_TXT_PYTHON] + source_txt[stop_line:] else: - if a_filename.endswith('.py'): - new_txt = source_txt[0:start_line + 1] + RINCHI_LICENSE_TXT_PYTHON + source_txt[stop_line:] - else: - new_txt = source_txt[0:start_line + 1] + RINCHI_LICENSE_TXT + source_txt[stop_line:] + new_txt = source_txt[0:start_line + 1] + [s.replace("%LICENSE_PATH%", license_path) for s in RINCHI_LICENSE_TXT] + source_txt[stop_line:] open(a_filename, "w").write("".join(new_txt)) else: @@ -58,36 +59,22 @@ def process_dir(a_dir): BASE_DIR = "../src/" -BSD_LICENSE_TXT = [""] -RINCHI_LICENSE_TXT = [""] - -if len(sys.argv) < 2: - raise Exception, "You must pass either a revision date or the command 'CLEAR'." -if sys.argv[1].upper() != "CLEAR": - BSD_LICENSE_TXT = open("../src/LICENCES/bsd_license.txt").readlines() - RINCHI_LICENSE_TXT = open("../src/LICENCES/rinchi_license.txt").readlines() - todays_date = sys.argv[1] -else: - todays_date = "" - -# Replace keywords/variables in LICENSE_TXT texts with values. -rinchi_consts = open("../src/rinchi/rinchi_consts.cpp").readlines() -rinchi_version = [x for x in rinchi_consts if x.find("RINCHI_VERSION =") > 0] -if len(rinchi_version) != 1: - raise Exception, "Can't determine RINCHI_VERSION." -rinchi_version = rinchi_version[0] -rinchi_version = rinchi_version[rinchi_version.find("="):] -rinchi_version = rinchi_version.replace('"', '').replace("=", "").replace("\r", "").replace("\n", "").replace(";", "").replace(" ", "") - -BSD_LICENSE_TXT = [s.replace("%RINCHI_VERSION%", rinchi_version).replace("%TODAY%", todays_date) for s in BSD_LICENSE_TXT] -RINCHI_LICENSE_TXT = [s.replace("%RINCHI_VERSION%", rinchi_version).replace("%TODAY%", todays_date) for s in RINCHI_LICENSE_TXT] +RINCHI_LICENSE_TXT = open("./sourcefile_license_header.txt").readlines() +current_year = str(datetime.datetime.now().year) + +RINCHI_LICENSE_TXT = [s.replace("%CURRENT_YEAR%", current_year) for s in RINCHI_LICENSE_TXT] # Special version for Python code, since Python doesn't have multi-line comments. -BSD_LICENSE_TXT_PYTHON = ["#" + s for s in BSD_LICENSE_TXT] -RINCHI_LICENSE_TXT_PYTHON = ["#" + s for s in RINCHI_LICENSE_TXT] +RINCHI_LICENSE_TXT_PYTHON = ["# " + s for s in RINCHI_LICENSE_TXT] +# Normal C/C++ version. +RINCHI_LICENSE_TXT = ["// " + s for s in RINCHI_LICENSE_TXT] +print("".join(RINCHI_LICENSE_TXT)) + +if len(sys.argv) >= 2 and sys.argv[1].upper() == "CLEAR": + RINCHI_LICENSE_TXT = [""] + RINCHI_LICENSE_TXT_PYTHON = [""] -BSD_LICENSE_MARKER_BEGIN = "#pragma region BSD-license" -RINCHI_LICENSE_MARKER_BEGIN = "#pragma region InChI-Trust Licence" +LICENSE_MARKER_BEGIN = "#pragma region RInChI-license" LICENSE_MARKER_END = "#pragma endregion" process_dir(BASE_DIR) diff --git a/scripts/sourcefile_license_header.txt b/scripts/sourcefile_license_header.txt new file mode 100644 index 000000000..bd9aa780f --- /dev/null +++ b/scripts/sourcefile_license_header.txt @@ -0,0 +1,4 @@ +Copyright (C) 2017 - %CURRENT_YEAR% InChI Project. All Rights Reserved. +This file is part of the RInChI source code. +The contents are covered by the terms of the MIT license +included in the file %LICENSE_PATH%. diff --git a/src/LICENCES/LICENCE.TXT b/src/LICENCES/LICENCE.TXT deleted file mode 100644 index 88e26b6f1..000000000 --- a/src/LICENCES/LICENCE.TXT +++ /dev/null @@ -1,268 +0,0 @@ -IUPAC/InChI-Trust Licence for the -International Chemical Identifier (InChI) Software -("IUPAC/InChI-Trust InChI Licence No. 1.0") - - -Copyright (c) IUPAC and InChI Trust Limited -This library is free software; you can redistribute it and/or modify it under the terms of the -IUPAC/InChI Trust InChI Licence No. 1.0), or (at your option) any later version. - -Terms and Conditions for Copying, Distribution and Modification of the InChI Software - - 0. This Licence 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 Licence. The Licensee is addressed as "you". - - 'IUPAC' means the International Union of Pure and Applied Chemistry. - - 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 Licence; 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 Licence and to -the absence of any warranty; and distribute a copy of this Licence 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 Licence. This requirement does not extend to any "work that uses the Library" that might also -be compiled or linked against the "work based on the Library." - -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 Licence, 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 Licence, 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 Licence. - -3. You may opt to apply the terms of the ordinary GNU General Public Licence instead of this Licence -to a given copy of the Library. To do this, you must alter all the notices that refer to this Licence, so -that they refer to the ordinary GNU General Public Licence, version 2, instead of to this Licence. (If a -newer version than version 2 of the ordinary GNU General Public Licence 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 Licence 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 Licence. - -6. You may 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. - -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 Licence. You must supply a copy of this Licence. 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 Licence. 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 to the Library were used in the work (which must be distributed -under Sections 1 and 2 above). - -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. - -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 Licence, 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 Licence. Any attempt otherwise to copy, modify, sublicense, link with, or -distribute the Library is void, and will automatically terminate your rights under this Licence. -However, parties who have received copies, or rights, from you under this Licence will not have their -Licences terminated so long as such parties remain in full compliance. - -9. You are not required to accept this Licence, 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 Licence. Therefore, by modifying or distributing the -Library (or any work based on the Library), you indicate your acceptance of this Licence 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 Licence 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 Licence. - -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 Licence, they do not excuse you from the conditions of -this Licence. If you cannot distribute so as to satisfy simultaneously your obligations under this -Licence and any other pertinent obligations, then as a consequence you may not distribute the Library -at all. For example, if a patent Licence 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 Licence 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 Licence 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 Licence. - -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 Licence 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 Licence incorporates the -limitation as if written in the body of this Licence. - -13. IUPAC and the InChI Trust Limited may publish revised and/or new versions of the IUPAC/InChI -Trust Licence for the International Chemical Identifier (InChI) Software 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 Licence which applied 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 IUPAC and the InChI Trust -Limited. - -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. - -15. If you modify the Library in any way whatsoever, the output from any such modified Library may -not be referred to as 'InChI' or any similar name. Any attempt to refer to such output as 'InChI' will -automatically terminate your rights under this Licence. - -NO WARRANTY - -16. 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 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. - -17. In no event unless required by applicable law or agreed to in writing will any copyright -holder, or any 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 - -Instructions for Use - -You must attach the following notices to the library at the beginning of each source file - as a -minimum each file needs to contain the "copyright" line and a link to the full notice. - -[INSERT YOUR LIBRARY'S NAME AND ITS PURPOSE] -Copyright (c) [YEAR][COPYRIGHT OWNER] -This library is free software; you can redistribute it and/or modify it under the terms of the -IUPAC/InChI Trust InChI Licence 1.0, or any later version. - -Please note that this library is distributed WITHOUT ANY WARRANTIES whatsoever, -whether expressed or implied. See the IUPAC/InChI Trust Licence for the International -Chemical Identifier (InChI) Software ("IUPAC/InChI-Trust InChI Licence No. 1.0") for -more details. - -You should have received a copy of the IUPAC/InChI Trust InChI Licence No. 1.0 with this -library; if not, please write to: - -The InChI Trust -8 Cavendish Avenue -Cambridge CB1 7US -UK - -or e-mail to alan@inchi-trust.org - -In the event that you require anything else or have any questions, please write to: - -[INSERT COPYRIGHT OWNERS DETAILS] -[INSERT ADDRESS] - -or contact us via email at: [INSERT EMAIL ADDRESS] - - -(c) 2011 IUPAC and InChI Trust Limited - diff --git a/src/LICENCES/RINCHI_LICENCE.TXT b/src/LICENCES/RINCHI_LICENCE.TXT deleted file mode 100644 index d07fab233..000000000 --- a/src/LICENCES/RINCHI_LICENCE.TXT +++ /dev/null @@ -1,17 +0,0 @@ -Licence for the -Reaction International Chemical Identifier (RInChI) Software - -The RInChI source code is released under the terms of the InChI -licence ("IUPAC/InChI Trust InChI Licence No. 1.0" in "LICENCE.TXT"), -except for the following files that are released under a BSD-style licence. - - src/lib/inchi_api_intf.cpp and .h - src/lib/inchi_generator.cpp and .h - src/lib/rinchi_utils.cpp and .h - src/lib/unit_test.cpp and .h - src/parsers/generic_line_reader.h - src/parsers/mdl_molfile.cpp and .h - src/parsers/mdl_molfile_reader.cpp and .h - -For explicit licence details, see the respective source file copyright -headers. diff --git a/src/LICENCES/bsd_license.txt b/src/LICENCES/bsd_license.txt deleted file mode 100644 index 6479fef4b..000000000 --- a/src/LICENCES/bsd_license.txt +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Reaction International Chemical Identifier (RInChI) - * Version 1 - * Software version %RINCHI_VERSION% - * %TODAY% - * - * This source file is based on work created by Biochemfusion Holding ApS. - * It is released under a BSD-style license. - * - * Copyright (C) 2010 - 2015, Biochemfusion Holding ApS - * (http://www.biochemfusion.com). All rights reserved. - * - * Redistribution and use for any purpose in source and binary forms, with or - * without modification, are permitted, subject to the following restrictions: - * - * 1. The origin of this software must not be misrepresented; you must not - * claim that you wrote the original software. If you use this software - * in a product, an acknowledgment in the product documentation would be - * appreciated but is not required. - * 2. Altered source versions must be plainly marked as such, and must not be - * misrepresented as being the original software. - * 3. This notice may not be removed or altered from any source distribution. - * - * THIS SOFTWARE IS PROVIDED BY Biochemfusion Holding ApS ``AS IS'' AND ANY - * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL Biochemfusion Holding ApS BE LIABLE FOR ANY - * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -*/ diff --git a/src/LICENCES/rinchi_license.txt b/src/LICENCES/rinchi_license.txt deleted file mode 100644 index eb9b08eae..000000000 --- a/src/LICENCES/rinchi_license.txt +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Reaction International Chemical Identifier (RInChI) - * Version 1 - * Software version %RINCHI_VERSION% - * %TODAY% - * - * The RInChI library and programs are free software developed under the - * auspices of the International Union of Pure and Applied Chemistry (IUPAC). - * - * IUPAC/InChI-Trust Licence No.1.0 for the - * Reaction International Chemical Identifier (RInChI) Software version 1.0 - * Copyright (C) IUPAC and InChI Trust Limited - * - * This library is free software; you can redistribute it and/or modify it - * under the terms of the IUPAC/InChI Trust InChI Licence No.1.0, - * or any later version. - * - * Please note that this library is distributed WITHOUT ANY WARRANTIES - * whatsoever, whether expressed or implied. See the IUPAC/InChI Trust - * Licence for the International Chemical Identifier (InChI) Software - * ("IUPAC/InChI-Trust InChI Licence No. 1.0" in "LICENCE.TXT") - * for more details. - * - * You should have received a copy of the IUPAC/InChI Trust InChI - * Licence No. 1.0 with this library; if not, please write to: - * - * The InChI Trust - * 8 Cavendish Avenue - * Cambridge CB1 7US - * UK - * - * or email to: alan@inchi-trust.org. - * - */ diff --git a/src/example_apps/rinchi_cmdline/rinchi_cmdline.cpp b/src/example_apps/rinchi_cmdline/rinchi_cmdline.cpp index 05a89ef09..b37626edb 100644 --- a/src/example_apps/rinchi_cmdline/rinchi_cmdline.cpp +++ b/src/example_apps/rinchi_cmdline/rinchi_cmdline.cpp @@ -1,40 +1,10 @@ #ifdef MSVC -#pragma region InChI-Trust Licence -/* - * Reaction International Chemical Identifier (RInChI) - * Version 1 - * Software version 1.00 - * 2022-01-14 - * - * The RInChI library and programs are free software developed under the - * auspices of the International Union of Pure and Applied Chemistry (IUPAC). - * - * IUPAC/InChI-Trust Licence No.1.0 for the - * Reaction International Chemical Identifier (RInChI) Software version 1.0 - * Copyright (C) IUPAC and InChI Trust Limited - * - * This library is free software; you can redistribute it and/or modify it - * under the terms of the IUPAC/InChI Trust InChI Licence No.1.0, - * or any later version. - * - * Please note that this library is distributed WITHOUT ANY WARRANTIES - * whatsoever, whether expressed or implied. See the IUPAC/InChI Trust - * Licence for the International Chemical Identifier (InChI) Software - * ("IUPAC/InChI-Trust InChI Licence No. 1.0" in "LICENCE.TXT") - * for more details. - * - * You should have received a copy of the IUPAC/InChI Trust InChI - * Licence No. 1.0 with this library; if not, please write to: - * - * The InChI Trust - * 8 Cavendish Avenue - * Cambridge CB1 7US - * UK - * - * or email to: alan@inchi-trust.org. - * - */ -#pragma endregion +#pragma region RInChI-license +// Copyright (C) 2017 - 2024 InChI Project. All Rights Reserved. +// This file is part of the RInChI source code. +// The contents are covered by the terms of the MIT license +// included in the file ./../../../LICENCE.txt. +#pragma endregion #endif #include diff --git a/src/example_apps/rxn_from_molfiles/rxn_from_molfiles.cpp b/src/example_apps/rxn_from_molfiles/rxn_from_molfiles.cpp index 4cb1fa760..19f73e547 100644 --- a/src/example_apps/rxn_from_molfiles/rxn_from_molfiles.cpp +++ b/src/example_apps/rxn_from_molfiles/rxn_from_molfiles.cpp @@ -1,40 +1,10 @@ #ifdef MSVC -#pragma region InChI-Trust Licence -/* - * Reaction International Chemical Identifier (RInChI) - * Version 1 - * Software version 1.00 - * 2022-01-14 - * - * The RInChI library and programs are free software developed under the - * auspices of the International Union of Pure and Applied Chemistry (IUPAC). - * - * IUPAC/InChI-Trust Licence No.1.0 for the - * Reaction International Chemical Identifier (RInChI) Software version 1.0 - * Copyright (C) IUPAC and InChI Trust Limited - * - * This library is free software; you can redistribute it and/or modify it - * under the terms of the IUPAC/InChI Trust InChI Licence No.1.0, - * or any later version. - * - * Please note that this library is distributed WITHOUT ANY WARRANTIES - * whatsoever, whether expressed or implied. See the IUPAC/InChI Trust - * Licence for the International Chemical Identifier (InChI) Software - * ("IUPAC/InChI-Trust InChI Licence No. 1.0" in "LICENCE.TXT") - * for more details. - * - * You should have received a copy of the IUPAC/InChI Trust InChI - * Licence No. 1.0 with this library; if not, please write to: - * - * The InChI Trust - * 8 Cavendish Avenue - * Cambridge CB1 7US - * UK - * - * or email to: alan@inchi-trust.org. - * - */ -#pragma endregion +#pragma region RInChI-license +// Copyright (C) 2017 - 2024 InChI Project. All Rights Reserved. +// This file is part of the RInChI source code. +// The contents are covered by the terms of the MIT license +// included in the file ./../../../LICENCE.txt. +#pragma endregion #endif #include diff --git a/src/lib/inchi_api_intf.cpp b/src/lib/inchi_api_intf.cpp index 1070fa8bf..83cf64913 100644 --- a/src/lib/inchi_api_intf.cpp +++ b/src/lib/inchi_api_intf.cpp @@ -1,40 +1,10 @@ #ifdef MSVC -#pragma region BSD-license -/* - * Reaction International Chemical Identifier (RInChI) - * Version 1 - * Software version 1.00 - * 2022-01-14 - * - * This source file is based on work created by Biochemfusion Holding ApS. - * It is released under a BSD-style license. - * - * Copyright (C) 2010 - 2015, Biochemfusion Holding ApS - * (http://www.biochemfusion.com). All rights reserved. - * - * Redistribution and use for any purpose in source and binary forms, with or - * without modification, are permitted, subject to the following restrictions: - * - * 1. The origin of this software must not be misrepresented; you must not - * claim that you wrote the original software. If you use this software - * in a product, an acknowledgment in the product documentation would be - * appreciated but is not required. - * 2. Altered source versions must be plainly marked as such, and must not be - * misrepresented as being the original software. - * 3. This notice may not be removed or altered from any source distribution. - * - * THIS SOFTWARE IS PROVIDED BY Biochemfusion Holding ApS ``AS IS'' AND ANY - * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL Biochemfusion Holding ApS BE LIABLE FOR ANY - * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -*/ -#pragma endregion +#pragma region RInChI-license +// Copyright (C) 2017 - 2024 InChI Project. All Rights Reserved. +// This file is part of the RInChI source code. +// The contents are covered by the terms of the MIT license +// included in the file ./../../LICENCE.txt. +#pragma endregion #endif #include diff --git a/src/lib/inchi_api_intf.h b/src/lib/inchi_api_intf.h index 0018adc59..5af5152a9 100644 --- a/src/lib/inchi_api_intf.h +++ b/src/lib/inchi_api_intf.h @@ -2,42 +2,12 @@ #define IUPAC_RINCHI_INCHI_API_INTF_HEADER_GUARD #ifdef MSVC -#pragma region BSD-license -/* - * Reaction International Chemical Identifier (RInChI) - * Version 1 - * Software version 1.00 - * 2022-01-14 - * - * This source file is based on work created by Biochemfusion Holding ApS. - * It is released under a BSD-style license. - * - * Copyright (C) 2010 - 2015, Biochemfusion Holding ApS - * (http://www.biochemfusion.com). All rights reserved. - * - * Redistribution and use for any purpose in source and binary forms, with or - * without modification, are permitted, subject to the following restrictions: - * - * 1. The origin of this software must not be misrepresented; you must not - * claim that you wrote the original software. If you use this software - * in a product, an acknowledgment in the product documentation would be - * appreciated but is not required. - * 2. Altered source versions must be plainly marked as such, and must not be - * misrepresented as being the original software. - * 3. This notice may not be removed or altered from any source distribution. - * - * THIS SOFTWARE IS PROVIDED BY Biochemfusion Holding ApS ``AS IS'' AND ANY - * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL Biochemfusion Holding ApS BE LIABLE FOR ANY - * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -*/ -#pragma endregion +#pragma region RInChI-license +// Copyright (C) 2017 - 2024 InChI Project. All Rights Reserved. +// This file is part of the RInChI source code. +// The contents are covered by the terms of the MIT license +// included in the file ./../../LICENCE.txt. +#pragma endregion #endif #include diff --git a/src/lib/inchi_generator.cpp b/src/lib/inchi_generator.cpp index 1911bf098..b7c68aeb4 100644 --- a/src/lib/inchi_generator.cpp +++ b/src/lib/inchi_generator.cpp @@ -1,40 +1,10 @@ #ifdef MSVC -#pragma region BSD-license -/* - * Reaction International Chemical Identifier (RInChI) - * Version 1 - * Software version 1.00 - * 2022-01-14 - * - * This source file is based on work created by Biochemfusion Holding ApS. - * It is released under a BSD-style license. - * - * Copyright (C) 2010 - 2015, Biochemfusion Holding ApS - * (http://www.biochemfusion.com). All rights reserved. - * - * Redistribution and use for any purpose in source and binary forms, with or - * without modification, are permitted, subject to the following restrictions: - * - * 1. The origin of this software must not be misrepresented; you must not - * claim that you wrote the original software. If you use this software - * in a product, an acknowledgment in the product documentation would be - * appreciated but is not required. - * 2. Altered source versions must be plainly marked as such, and must not be - * misrepresented as being the original software. - * 3. This notice may not be removed or altered from any source distribution. - * - * THIS SOFTWARE IS PROVIDED BY Biochemfusion Holding ApS ``AS IS'' AND ANY - * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL Biochemfusion Holding ApS BE LIABLE FOR ANY - * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -*/ -#pragma endregion +#pragma region RInChI-license +// Copyright (C) 2017 - 2024 InChI Project. All Rights Reserved. +// This file is part of the RInChI source code. +// The contents are covered by the terms of the MIT license +// included in the file ./../../LICENCE.txt. +#pragma endregion #endif #include diff --git a/src/lib/inchi_generator.h b/src/lib/inchi_generator.h index 162139d48..8f0e98b99 100644 --- a/src/lib/inchi_generator.h +++ b/src/lib/inchi_generator.h @@ -2,42 +2,12 @@ #define IUPAC_RINCHI_INCHI_GENERATOR_HEADER_GUARD #ifdef MSVC -#pragma region BSD-license -/* - * Reaction International Chemical Identifier (RInChI) - * Version 1 - * Software version 1.00 - * 2022-01-14 - * - * This source file is based on work created by Biochemfusion Holding ApS. - * It is released under a BSD-style license. - * - * Copyright (C) 2010 - 2015, Biochemfusion Holding ApS - * (http://www.biochemfusion.com). All rights reserved. - * - * Redistribution and use for any purpose in source and binary forms, with or - * without modification, are permitted, subject to the following restrictions: - * - * 1. The origin of this software must not be misrepresented; you must not - * claim that you wrote the original software. If you use this software - * in a product, an acknowledgment in the product documentation would be - * appreciated but is not required. - * 2. Altered source versions must be plainly marked as such, and must not be - * misrepresented as being the original software. - * 3. This notice may not be removed or altered from any source distribution. - * - * THIS SOFTWARE IS PROVIDED BY Biochemfusion Holding ApS ``AS IS'' AND ANY - * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL Biochemfusion Holding ApS BE LIABLE FOR ANY - * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -*/ -#pragma endregion +#pragma region RInChI-license +// Copyright (C) 2017 - 2024 InChI Project. All Rights Reserved. +// This file is part of the RInChI source code. +// The contents are covered by the terms of the MIT license +// included in the file ./../../LICENCE.txt. +#pragma endregion #endif #include diff --git a/src/lib/rinchi_hashing.cpp b/src/lib/rinchi_hashing.cpp index ae86a7de9..3a21dc5ad 100644 --- a/src/lib/rinchi_hashing.cpp +++ b/src/lib/rinchi_hashing.cpp @@ -1,40 +1,10 @@ #ifdef MSVC -#pragma region InChI-Trust Licence -/* - * Reaction International Chemical Identifier (RInChI) - * Version 1 - * Software version 1.00 - * 2022-01-14 - * - * The RInChI library and programs are free software developed under the - * auspices of the International Union of Pure and Applied Chemistry (IUPAC). - * - * IUPAC/InChI-Trust Licence No.1.0 for the - * Reaction International Chemical Identifier (RInChI) Software version 1.0 - * Copyright (C) IUPAC and InChI Trust Limited - * - * This library is free software; you can redistribute it and/or modify it - * under the terms of the IUPAC/InChI Trust InChI Licence No.1.0, - * or any later version. - * - * Please note that this library is distributed WITHOUT ANY WARRANTIES - * whatsoever, whether expressed or implied. See the IUPAC/InChI Trust - * Licence for the International Chemical Identifier (InChI) Software - * ("IUPAC/InChI-Trust InChI Licence No. 1.0" in "LICENCE.TXT") - * for more details. - * - * You should have received a copy of the IUPAC/InChI Trust InChI - * Licence No. 1.0 with this library; if not, please write to: - * - * The InChI Trust - * 8 Cavendish Avenue - * Cambridge CB1 7US - * UK - * - * or email to: alan@inchi-trust.org. - * - */ -#pragma endregion +#pragma region RInChI-license +// Copyright (C) 2017 - 2024 InChI Project. All Rights Reserved. +// This file is part of the RInChI source code. +// The contents are covered by the terms of the MIT license +// included in the file ./../../LICENCE.txt. +#pragma endregion #endif #include diff --git a/src/lib/rinchi_hashing.h b/src/lib/rinchi_hashing.h index 797863d8f..e17633758 100644 --- a/src/lib/rinchi_hashing.h +++ b/src/lib/rinchi_hashing.h @@ -2,42 +2,12 @@ #define IUPAC_RINCHI_HASHING_HEADER_GUARD #ifdef MSVC -#pragma region InChI-Trust Licence -/* - * Reaction International Chemical Identifier (RInChI) - * Version 1 - * Software version 1.00 - * 2022-01-14 - * - * The RInChI library and programs are free software developed under the - * auspices of the International Union of Pure and Applied Chemistry (IUPAC). - * - * IUPAC/InChI-Trust Licence No.1.0 for the - * Reaction International Chemical Identifier (RInChI) Software version 1.0 - * Copyright (C) IUPAC and InChI Trust Limited - * - * This library is free software; you can redistribute it and/or modify it - * under the terms of the IUPAC/InChI Trust InChI Licence No.1.0, - * or any later version. - * - * Please note that this library is distributed WITHOUT ANY WARRANTIES - * whatsoever, whether expressed or implied. See the IUPAC/InChI Trust - * Licence for the International Chemical Identifier (InChI) Software - * ("IUPAC/InChI-Trust InChI Licence No. 1.0" in "LICENCE.TXT") - * for more details. - * - * You should have received a copy of the IUPAC/InChI Trust InChI - * Licence No. 1.0 with this library; if not, please write to: - * - * The InChI Trust - * 8 Cavendish Avenue - * Cambridge CB1 7US - * UK - * - * or email to: alan@inchi-trust.org. - * - */ -#pragma endregion +#pragma region RInChI-license +// Copyright (C) 2017 - 2024 InChI Project. All Rights Reserved. +// This file is part of the RInChI source code. +// The contents are covered by the terms of the MIT license +// included in the file ./../../LICENCE.txt. +#pragma endregion #endif #include diff --git a/src/lib/rinchi_logger.cpp b/src/lib/rinchi_logger.cpp index fa2eabe50..1827c128a 100644 --- a/src/lib/rinchi_logger.cpp +++ b/src/lib/rinchi_logger.cpp @@ -1,40 +1,10 @@ #ifdef MSVC -#pragma region InChI-Trust Licence -/* - * Reaction International Chemical Identifier (RInChI) - * Version 1 - * Software version 1.00 - * 2022-01-14 - * - * The RInChI library and programs are free software developed under the - * auspices of the International Union of Pure and Applied Chemistry (IUPAC). - * - * IUPAC/InChI-Trust Licence No.1.0 for the - * Reaction International Chemical Identifier (RInChI) Software version 1.0 - * Copyright (C) IUPAC and InChI Trust Limited - * - * This library is free software; you can redistribute it and/or modify it - * under the terms of the IUPAC/InChI Trust InChI Licence No.1.0, - * or any later version. - * - * Please note that this library is distributed WITHOUT ANY WARRANTIES - * whatsoever, whether expressed or implied. See the IUPAC/InChI Trust - * Licence for the International Chemical Identifier (InChI) Software - * ("IUPAC/InChI-Trust InChI Licence No. 1.0" in "LICENCE.TXT") - * for more details. - * - * You should have received a copy of the IUPAC/InChI Trust InChI - * Licence No. 1.0 with this library; if not, please write to: - * - * The InChI Trust - * 8 Cavendish Avenue - * Cambridge CB1 7US - * UK - * - * or email to: alan@inchi-trust.org. - * - */ -#pragma endregion +#pragma region RInChI-license +// Copyright (C) 2017 - 2024 InChI Project. All Rights Reserved. +// This file is part of the RInChI source code. +// The contents are covered by the terms of the MIT license +// included in the file ./../../LICENCE.txt. +#pragma endregion #endif #include diff --git a/src/lib/rinchi_logger.h b/src/lib/rinchi_logger.h index 2495c56f7..0c4f85fe1 100644 --- a/src/lib/rinchi_logger.h +++ b/src/lib/rinchi_logger.h @@ -2,42 +2,12 @@ #define IUPAC_RINCHI_LOGGER_HEADER_GUARD #ifdef MSVC -#pragma region InChI-Trust Licence -/* - * Reaction International Chemical Identifier (RInChI) - * Version 1 - * Software version 1.00 - * 2022-01-14 - * - * The RInChI library and programs are free software developed under the - * auspices of the International Union of Pure and Applied Chemistry (IUPAC). - * - * IUPAC/InChI-Trust Licence No.1.0 for the - * Reaction International Chemical Identifier (RInChI) Software version 1.0 - * Copyright (C) IUPAC and InChI Trust Limited - * - * This library is free software; you can redistribute it and/or modify it - * under the terms of the IUPAC/InChI Trust InChI Licence No.1.0, - * or any later version. - * - * Please note that this library is distributed WITHOUT ANY WARRANTIES - * whatsoever, whether expressed or implied. See the IUPAC/InChI Trust - * Licence for the International Chemical Identifier (InChI) Software - * ("IUPAC/InChI-Trust InChI Licence No. 1.0" in "LICENCE.TXT") - * for more details. - * - * You should have received a copy of the IUPAC/InChI Trust InChI - * Licence No. 1.0 with this library; if not, please write to: - * - * The InChI Trust - * 8 Cavendish Avenue - * Cambridge CB1 7US - * UK - * - * or email to: alan@inchi-trust.org. - * - */ -#pragma endregion +#pragma region RInChI-license +// Copyright (C) 2017 - 2024 InChI Project. All Rights Reserved. +// This file is part of the RInChI source code. +// The contents are covered by the terms of the MIT license +// included in the file ./../../LICENCE.txt. +#pragma endregion #endif #include "rinchi_utils.h" diff --git a/src/lib/rinchi_platform.h b/src/lib/rinchi_platform.h index df89df66f..a72615365 100644 --- a/src/lib/rinchi_platform.h +++ b/src/lib/rinchi_platform.h @@ -2,42 +2,12 @@ #define IUPAC_RINCHI_PLATFORM_HEADER_GUARD #ifdef MSVC -#pragma region InChI-Trust Licence -/* - * Reaction International Chemical Identifier (RInChI) - * Version 1 - * Software version 1.00 - * 2022-01-14 - * - * The RInChI library and programs are free software developed under the - * auspices of the International Union of Pure and Applied Chemistry (IUPAC). - * - * IUPAC/InChI-Trust Licence No.1.0 for the - * Reaction International Chemical Identifier (RInChI) Software version 1.0 - * Copyright (C) IUPAC and InChI Trust Limited - * - * This library is free software; you can redistribute it and/or modify it - * under the terms of the IUPAC/InChI Trust InChI Licence No.1.0, - * or any later version. - * - * Please note that this library is distributed WITHOUT ANY WARRANTIES - * whatsoever, whether expressed or implied. See the IUPAC/InChI Trust - * Licence for the International Chemical Identifier (InChI) Software - * ("IUPAC/InChI-Trust InChI Licence No. 1.0" in "LICENCE.TXT") - * for more details. - * - * You should have received a copy of the IUPAC/InChI Trust InChI - * Licence No. 1.0 with this library; if not, please write to: - * - * The InChI Trust - * 8 Cavendish Avenue - * Cambridge CB1 7US - * UK - * - * or email to: alan@inchi-trust.org. - * - */ -#pragma endregion +#pragma region RInChI-license +// Copyright (C) 2017 - 2024 InChI Project. All Rights Reserved. +// This file is part of the RInChI source code. +// The contents are covered by the terms of the MIT license +// included in the file ./../../LICENCE.txt. +#pragma endregion #endif #ifdef _WIN32 diff --git a/src/lib/rinchi_utils.cpp b/src/lib/rinchi_utils.cpp index 40f1e2f69..e8fcc5218 100644 --- a/src/lib/rinchi_utils.cpp +++ b/src/lib/rinchi_utils.cpp @@ -1,40 +1,10 @@ #ifdef MSVC -#pragma region BSD-license -/* - * Reaction International Chemical Identifier (RInChI) - * Version 1 - * Software version 1.00 - * 2022-01-14 - * - * This source file is based on work created by Biochemfusion Holding ApS. - * It is released under a BSD-style license. - * - * Copyright (C) 2010 - 2015, Biochemfusion Holding ApS - * (http://www.biochemfusion.com). All rights reserved. - * - * Redistribution and use for any purpose in source and binary forms, with or - * without modification, are permitted, subject to the following restrictions: - * - * 1. The origin of this software must not be misrepresented; you must not - * claim that you wrote the original software. If you use this software - * in a product, an acknowledgment in the product documentation would be - * appreciated but is not required. - * 2. Altered source versions must be plainly marked as such, and must not be - * misrepresented as being the original software. - * 3. This notice may not be removed or altered from any source distribution. - * - * THIS SOFTWARE IS PROVIDED BY Biochemfusion Holding ApS ``AS IS'' AND ANY - * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL Biochemfusion Holding ApS BE LIABLE FOR ANY - * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -*/ -#pragma endregion +#pragma region RInChI-license +// Copyright (C) 2017 - 2024 InChI Project. All Rights Reserved. +// This file is part of the RInChI source code. +// The contents are covered by the terms of the MIT license +// included in the file ./../../LICENCE.txt. +#pragma endregion #endif #include diff --git a/src/lib/rinchi_utils.h b/src/lib/rinchi_utils.h index ee6750277..bb1aa591c 100644 --- a/src/lib/rinchi_utils.h +++ b/src/lib/rinchi_utils.h @@ -2,42 +2,12 @@ #define IUPAC_RINCHI_UTILS_HEADER_GUARD #ifdef MSVC -#pragma region BSD-license -/* - * Reaction International Chemical Identifier (RInChI) - * Version 1 - * Software version 1.00 - * 2022-01-14 - * - * This source file is based on work created by Biochemfusion Holding ApS. - * It is released under a BSD-style license. - * - * Copyright (C) 2010 - 2015, Biochemfusion Holding ApS - * (http://www.biochemfusion.com). All rights reserved. - * - * Redistribution and use for any purpose in source and binary forms, with or - * without modification, are permitted, subject to the following restrictions: - * - * 1. The origin of this software must not be misrepresented; you must not - * claim that you wrote the original software. If you use this software - * in a product, an acknowledgment in the product documentation would be - * appreciated but is not required. - * 2. Altered source versions must be plainly marked as such, and must not be - * misrepresented as being the original software. - * 3. This notice may not be removed or altered from any source distribution. - * - * THIS SOFTWARE IS PROVIDED BY Biochemfusion Holding ApS ``AS IS'' AND ANY - * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL Biochemfusion Holding ApS BE LIABLE FOR ANY - * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -*/ -#pragma endregion +#pragma region RInChI-license +// Copyright (C) 2017 - 2024 InChI Project. All Rights Reserved. +// This file is part of the RInChI source code. +// The contents are covered by the terms of the MIT license +// included in the file ./../../LICENCE.txt. +#pragma endregion #endif #include diff --git a/src/lib/unit_test.cpp b/src/lib/unit_test.cpp index 2625b93bf..4680b26f7 100644 --- a/src/lib/unit_test.cpp +++ b/src/lib/unit_test.cpp @@ -1,40 +1,10 @@ #ifdef MSVC -#pragma region BSD-license -/* - * Reaction International Chemical Identifier (RInChI) - * Version 1 - * Software version 1.00 - * 2022-01-14 - * - * This source file is based on work created by Biochemfusion Holding ApS. - * It is released under a BSD-style license. - * - * Copyright (C) 2010 - 2015, Biochemfusion Holding ApS - * (http://www.biochemfusion.com). All rights reserved. - * - * Redistribution and use for any purpose in source and binary forms, with or - * without modification, are permitted, subject to the following restrictions: - * - * 1. The origin of this software must not be misrepresented; you must not - * claim that you wrote the original software. If you use this software - * in a product, an acknowledgment in the product documentation would be - * appreciated but is not required. - * 2. Altered source versions must be plainly marked as such, and must not be - * misrepresented as being the original software. - * 3. This notice may not be removed or altered from any source distribution. - * - * THIS SOFTWARE IS PROVIDED BY Biochemfusion Holding ApS ``AS IS'' AND ANY - * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL Biochemfusion Holding ApS BE LIABLE FOR ANY - * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -*/ -#pragma endregion +#pragma region RInChI-license +// Copyright (C) 2017 - 2024 InChI Project. All Rights Reserved. +// This file is part of the RInChI source code. +// The contents are covered by the terms of the MIT license +// included in the file ./../../LICENCE.txt. +#pragma endregion #endif #include diff --git a/src/lib/unit_test.h b/src/lib/unit_test.h index 6f4fa11e3..7631d842e 100644 --- a/src/lib/unit_test.h +++ b/src/lib/unit_test.h @@ -2,42 +2,12 @@ #define IUPAC_RINCHI_UNITTEST_HEADER_GUARD #ifdef MSVC -#pragma region BSD-license -/* - * Reaction International Chemical Identifier (RInChI) - * Version 1 - * Software version 1.00 - * 2022-01-14 - * - * This source file is based on work created by Biochemfusion Holding ApS. - * It is released under a BSD-style license. - * - * Copyright (C) 2010 - 2015, Biochemfusion Holding ApS - * (http://www.biochemfusion.com). All rights reserved. - * - * Redistribution and use for any purpose in source and binary forms, with or - * without modification, are permitted, subject to the following restrictions: - * - * 1. The origin of this software must not be misrepresented; you must not - * claim that you wrote the original software. If you use this software - * in a product, an acknowledgment in the product documentation would be - * appreciated but is not required. - * 2. Altered source versions must be plainly marked as such, and must not be - * misrepresented as being the original software. - * 3. This notice may not be removed or altered from any source distribution. - * - * THIS SOFTWARE IS PROVIDED BY Biochemfusion Holding ApS ``AS IS'' AND ANY - * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL Biochemfusion Holding ApS BE LIABLE FOR ANY - * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -*/ -#pragma endregion +#pragma region RInChI-license +// Copyright (C) 2017 - 2024 InChI Project. All Rights Reserved. +// This file is part of the RInChI source code. +// The contents are covered by the terms of the MIT license +// included in the file ./../../LICENCE.txt. +#pragma endregion #endif #include diff --git a/src/parsers/generic_line_reader.h b/src/parsers/generic_line_reader.h index 5b8967f64..5773cbad5 100644 --- a/src/parsers/generic_line_reader.h +++ b/src/parsers/generic_line_reader.h @@ -2,42 +2,12 @@ #define IUPAC_RINCHI_GENERIC_LINE_READER_HEADER_GUARD #ifdef MSVC -#pragma region BSD-license -/* - * Reaction International Chemical Identifier (RInChI) - * Version 1 - * Software version 1.00 - * 2022-01-14 - * - * This source file is based on work created by Biochemfusion Holding ApS. - * It is released under a BSD-style license. - * - * Copyright (C) 2010 - 2015, Biochemfusion Holding ApS - * (http://www.biochemfusion.com). All rights reserved. - * - * Redistribution and use for any purpose in source and binary forms, with or - * without modification, are permitted, subject to the following restrictions: - * - * 1. The origin of this software must not be misrepresented; you must not - * claim that you wrote the original software. If you use this software - * in a product, an acknowledgment in the product documentation would be - * appreciated but is not required. - * 2. Altered source versions must be plainly marked as such, and must not be - * misrepresented as being the original software. - * 3. This notice may not be removed or altered from any source distribution. - * - * THIS SOFTWARE IS PROVIDED BY Biochemfusion Holding ApS ``AS IS'' AND ANY - * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL Biochemfusion Holding ApS BE LIABLE FOR ANY - * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -*/ -#pragma endregion +#pragma region RInChI-license +// Copyright (C) 2017 - 2024 InChI Project. All Rights Reserved. +// This file is part of the RInChI source code. +// The contents are covered by the terms of the MIT license +// included in the file ./../../LICENCE.txt. +#pragma endregion #endif #include diff --git a/src/parsers/mdl_molfile.cpp b/src/parsers/mdl_molfile.cpp index 1b29892e4..20c84679e 100644 --- a/src/parsers/mdl_molfile.cpp +++ b/src/parsers/mdl_molfile.cpp @@ -1,40 +1,10 @@ #ifdef MSVC -#pragma region BSD-license -/* - * Reaction International Chemical Identifier (RInChI) - * Version 1 - * Software version 1.00 - * 2022-01-14 - * - * This source file is based on work created by Biochemfusion Holding ApS. - * It is released under a BSD-style license. - * - * Copyright (C) 2010 - 2015, Biochemfusion Holding ApS - * (http://www.biochemfusion.com). All rights reserved. - * - * Redistribution and use for any purpose in source and binary forms, with or - * without modification, are permitted, subject to the following restrictions: - * - * 1. The origin of this software must not be misrepresented; you must not - * claim that you wrote the original software. If you use this software - * in a product, an acknowledgment in the product documentation would be - * appreciated but is not required. - * 2. Altered source versions must be plainly marked as such, and must not be - * misrepresented as being the original software. - * 3. This notice may not be removed or altered from any source distribution. - * - * THIS SOFTWARE IS PROVIDED BY Biochemfusion Holding ApS ``AS IS'' AND ANY - * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL Biochemfusion Holding ApS BE LIABLE FOR ANY - * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -*/ -#pragma endregion +#pragma region RInChI-license +// Copyright (C) 2017 - 2024 InChI Project. All Rights Reserved. +// This file is part of the RInChI source code. +// The contents are covered by the terms of the MIT license +// included in the file ./../../LICENCE.txt. +#pragma endregion #endif #include "mdl_molfile.h" diff --git a/src/parsers/mdl_molfile.h b/src/parsers/mdl_molfile.h index 335fc584b..04851d683 100644 --- a/src/parsers/mdl_molfile.h +++ b/src/parsers/mdl_molfile.h @@ -2,42 +2,12 @@ #define IUPAC_RINCHI_MDL_MOLFILE_HEADER_GUARD #ifdef MSVC -#pragma region BSD-license -/* - * Reaction International Chemical Identifier (RInChI) - * Version 1 - * Software version 1.00 - * 2022-01-14 - * - * This source file is based on work created by Biochemfusion Holding ApS. - * It is released under a BSD-style license. - * - * Copyright (C) 2010 - 2015, Biochemfusion Holding ApS - * (http://www.biochemfusion.com). All rights reserved. - * - * Redistribution and use for any purpose in source and binary forms, with or - * without modification, are permitted, subject to the following restrictions: - * - * 1. The origin of this software must not be misrepresented; you must not - * claim that you wrote the original software. If you use this software - * in a product, an acknowledgment in the product documentation would be - * appreciated but is not required. - * 2. Altered source versions must be plainly marked as such, and must not be - * misrepresented as being the original software. - * 3. This notice may not be removed or altered from any source distribution. - * - * THIS SOFTWARE IS PROVIDED BY Biochemfusion Holding ApS ``AS IS'' AND ANY - * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL Biochemfusion Holding ApS BE LIABLE FOR ANY - * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -*/ -#pragma endregion +#pragma region RInChI-license +// Copyright (C) 2017 - 2024 InChI Project. All Rights Reserved. +// This file is part of the RInChI source code. +// The contents are covered by the terms of the MIT license +// included in the file ./../../LICENCE.txt. +#pragma endregion #endif #include diff --git a/src/parsers/mdl_molfile_reader.cpp b/src/parsers/mdl_molfile_reader.cpp index 9b63399e7..abcc0c475 100644 --- a/src/parsers/mdl_molfile_reader.cpp +++ b/src/parsers/mdl_molfile_reader.cpp @@ -1,40 +1,10 @@ #ifdef MSVC -#pragma region BSD-license -/* - * Reaction International Chemical Identifier (RInChI) - * Version 1 - * Software version 1.00 - * 2022-01-14 - * - * This source file is based on work created by Biochemfusion Holding ApS. - * It is released under a BSD-style license. - * - * Copyright (C) 2010 - 2015, Biochemfusion Holding ApS - * (http://www.biochemfusion.com). All rights reserved. - * - * Redistribution and use for any purpose in source and binary forms, with or - * without modification, are permitted, subject to the following restrictions: - * - * 1. The origin of this software must not be misrepresented; you must not - * claim that you wrote the original software. If you use this software - * in a product, an acknowledgment in the product documentation would be - * appreciated but is not required. - * 2. Altered source versions must be plainly marked as such, and must not be - * misrepresented as being the original software. - * 3. This notice may not be removed or altered from any source distribution. - * - * THIS SOFTWARE IS PROVIDED BY Biochemfusion Holding ApS ``AS IS'' AND ANY - * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL Biochemfusion Holding ApS BE LIABLE FOR ANY - * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -*/ -#pragma endregion +#pragma region RInChI-license +// Copyright (C) 2017 - 2024 InChI Project. All Rights Reserved. +// This file is part of the RInChI source code. +// The contents are covered by the terms of the MIT license +// included in the file ./../../LICENCE.txt. +#pragma endregion #endif #include diff --git a/src/parsers/mdl_molfile_reader.h b/src/parsers/mdl_molfile_reader.h index 4cd14ac91..c6991e3ad 100644 --- a/src/parsers/mdl_molfile_reader.h +++ b/src/parsers/mdl_molfile_reader.h @@ -2,42 +2,12 @@ #define IUPAC_RINCHI_MDLMOLFILEREADER_HEADER_GUARD #ifdef MSVC -#pragma region BSD-license -/* - * Reaction International Chemical Identifier (RInChI) - * Version 1 - * Software version 1.00 - * 2022-01-14 - * - * This source file is based on work created by Biochemfusion Holding ApS. - * It is released under a BSD-style license. - * - * Copyright (C) 2010 - 2015, Biochemfusion Holding ApS - * (http://www.biochemfusion.com). All rights reserved. - * - * Redistribution and use for any purpose in source and binary forms, with or - * without modification, are permitted, subject to the following restrictions: - * - * 1. The origin of this software must not be misrepresented; you must not - * claim that you wrote the original software. If you use this software - * in a product, an acknowledgment in the product documentation would be - * appreciated but is not required. - * 2. Altered source versions must be plainly marked as such, and must not be - * misrepresented as being the original software. - * 3. This notice may not be removed or altered from any source distribution. - * - * THIS SOFTWARE IS PROVIDED BY Biochemfusion Holding ApS ``AS IS'' AND ANY - * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL Biochemfusion Holding ApS BE LIABLE FOR ANY - * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -*/ -#pragma endregion +#pragma region RInChI-license +// Copyright (C) 2017 - 2024 InChI Project. All Rights Reserved. +// This file is part of the RInChI source code. +// The contents are covered by the terms of the MIT license +// included in the file ./../../LICENCE.txt. +#pragma endregion #endif #include diff --git a/src/parsers/mdl_rdfile.h b/src/parsers/mdl_rdfile.h index 1aaa36562..efc44986c 100644 --- a/src/parsers/mdl_rdfile.h +++ b/src/parsers/mdl_rdfile.h @@ -2,42 +2,12 @@ #define IUPAC_RINCHI_MDL_RDFILE_HEADER_GUARD #ifdef MSVC -#pragma region InChI-Trust Licence -/* - * Reaction International Chemical Identifier (RInChI) - * Version 1 - * Software version 1.00 - * 2022-01-14 - * - * The RInChI library and programs are free software developed under the - * auspices of the International Union of Pure and Applied Chemistry (IUPAC). - * - * IUPAC/InChI-Trust Licence No.1.0 for the - * Reaction International Chemical Identifier (RInChI) Software version 1.0 - * Copyright (C) IUPAC and InChI Trust Limited - * - * This library is free software; you can redistribute it and/or modify it - * under the terms of the IUPAC/InChI Trust InChI Licence No.1.0, - * or any later version. - * - * Please note that this library is distributed WITHOUT ANY WARRANTIES - * whatsoever, whether expressed or implied. See the IUPAC/InChI Trust - * Licence for the International Chemical Identifier (InChI) Software - * ("IUPAC/InChI-Trust InChI Licence No. 1.0" in "LICENCE.TXT") - * for more details. - * - * You should have received a copy of the IUPAC/InChI Trust InChI - * Licence No. 1.0 with this library; if not, please write to: - * - * The InChI Trust - * 8 Cavendish Avenue - * Cambridge CB1 7US - * UK - * - * or email to: alan@inchi-trust.org. - * - */ -#pragma endregion +#pragma region RInChI-license +// Copyright (C) 2017 - 2024 InChI Project. All Rights Reserved. +// This file is part of the RInChI source code. +// The contents are covered by the terms of the MIT license +// included in the file ./../../LICENCE.txt. +#pragma endregion #endif /** Constants defining tags in MDL RD files. **/ diff --git a/src/parsers/mdl_rdfile_reader.cpp b/src/parsers/mdl_rdfile_reader.cpp index c3792cca6..a0238afb1 100644 --- a/src/parsers/mdl_rdfile_reader.cpp +++ b/src/parsers/mdl_rdfile_reader.cpp @@ -1,40 +1,10 @@ #ifdef MSVC -#pragma region InChI-Trust Licence -/* - * Reaction International Chemical Identifier (RInChI) - * Version 1 - * Software version 1.00 - * 2022-01-14 - * - * The RInChI library and programs are free software developed under the - * auspices of the International Union of Pure and Applied Chemistry (IUPAC). - * - * IUPAC/InChI-Trust Licence No.1.0 for the - * Reaction International Chemical Identifier (RInChI) Software version 1.0 - * Copyright (C) IUPAC and InChI Trust Limited - * - * This library is free software; you can redistribute it and/or modify it - * under the terms of the IUPAC/InChI Trust InChI Licence No.1.0, - * or any later version. - * - * Please note that this library is distributed WITHOUT ANY WARRANTIES - * whatsoever, whether expressed or implied. See the IUPAC/InChI Trust - * Licence for the International Chemical Identifier (InChI) Software - * ("IUPAC/InChI-Trust InChI Licence No. 1.0" in "LICENCE.TXT") - * for more details. - * - * You should have received a copy of the IUPAC/InChI Trust InChI - * Licence No. 1.0 with this library; if not, please write to: - * - * The InChI Trust - * 8 Cavendish Avenue - * Cambridge CB1 7US - * UK - * - * or email to: alan@inchi-trust.org. - * - */ -#pragma endregion +#pragma region RInChI-license +// Copyright (C) 2017 - 2024 InChI Project. All Rights Reserved. +// This file is part of the RInChI source code. +// The contents are covered by the terms of the MIT license +// included in the file ./../../LICENCE.txt. +#pragma endregion #endif #include diff --git a/src/parsers/mdl_rdfile_reader.h b/src/parsers/mdl_rdfile_reader.h index 3bde864d6..9f35a73da 100644 --- a/src/parsers/mdl_rdfile_reader.h +++ b/src/parsers/mdl_rdfile_reader.h @@ -2,42 +2,12 @@ #define IUPAC_RINCHI_MDLRDFILEREADER_HEADER_GUARD #ifdef MSVC -#pragma region InChI-Trust Licence -/* - * Reaction International Chemical Identifier (RInChI) - * Version 1 - * Software version 1.00 - * 2022-01-14 - * - * The RInChI library and programs are free software developed under the - * auspices of the International Union of Pure and Applied Chemistry (IUPAC). - * - * IUPAC/InChI-Trust Licence No.1.0 for the - * Reaction International Chemical Identifier (RInChI) Software version 1.0 - * Copyright (C) IUPAC and InChI Trust Limited - * - * This library is free software; you can redistribute it and/or modify it - * under the terms of the IUPAC/InChI Trust InChI Licence No.1.0, - * or any later version. - * - * Please note that this library is distributed WITHOUT ANY WARRANTIES - * whatsoever, whether expressed or implied. See the IUPAC/InChI Trust - * Licence for the International Chemical Identifier (InChI) Software - * ("IUPAC/InChI-Trust InChI Licence No. 1.0" in "LICENCE.TXT") - * for more details. - * - * You should have received a copy of the IUPAC/InChI Trust InChI - * Licence No. 1.0 with this library; if not, please write to: - * - * The InChI Trust - * 8 Cavendish Avenue - * Cambridge CB1 7US - * UK - * - * or email to: alan@inchi-trust.org. - * - */ -#pragma endregion +#pragma region RInChI-license +// Copyright (C) 2017 - 2024 InChI Project. All Rights Reserved. +// This file is part of the RInChI source code. +// The contents are covered by the terms of the MIT license +// included in the file ./../../LICENCE.txt. +#pragma endregion #endif #include diff --git a/src/parsers/mdl_rxnfile.h b/src/parsers/mdl_rxnfile.h index 9d16c3952..d8d8f9ace 100644 --- a/src/parsers/mdl_rxnfile.h +++ b/src/parsers/mdl_rxnfile.h @@ -2,42 +2,12 @@ #define IUPAC_RINCHI_MDL_RXNFILE_HEADER_GUARD #ifdef MSVC -#pragma region InChI-Trust Licence -/* - * Reaction International Chemical Identifier (RInChI) - * Version 1 - * Software version 1.00 - * 2022-01-14 - * - * The RInChI library and programs are free software developed under the - * auspices of the International Union of Pure and Applied Chemistry (IUPAC). - * - * IUPAC/InChI-Trust Licence No.1.0 for the - * Reaction International Chemical Identifier (RInChI) Software version 1.0 - * Copyright (C) IUPAC and InChI Trust Limited - * - * This library is free software; you can redistribute it and/or modify it - * under the terms of the IUPAC/InChI Trust InChI Licence No.1.0, - * or any later version. - * - * Please note that this library is distributed WITHOUT ANY WARRANTIES - * whatsoever, whether expressed or implied. See the IUPAC/InChI Trust - * Licence for the International Chemical Identifier (InChI) Software - * ("IUPAC/InChI-Trust InChI Licence No. 1.0" in "LICENCE.TXT") - * for more details. - * - * You should have received a copy of the IUPAC/InChI Trust InChI - * Licence No. 1.0 with this library; if not, please write to: - * - * The InChI Trust - * 8 Cavendish Avenue - * Cambridge CB1 7US - * UK - * - * or email to: alan@inchi-trust.org. - * - */ -#pragma endregion +#pragma region RInChI-license +// Copyright (C) 2017 - 2024 InChI Project. All Rights Reserved. +// This file is part of the RInChI source code. +// The contents are covered by the terms of the MIT license +// included in the file ./../../LICENCE.txt. +#pragma endregion #endif /** Constants defining tags in MDL rxn files. **/ diff --git a/src/parsers/mdl_rxnfile_reader.cpp b/src/parsers/mdl_rxnfile_reader.cpp index d9cb9523a..8dc8e8b8b 100644 --- a/src/parsers/mdl_rxnfile_reader.cpp +++ b/src/parsers/mdl_rxnfile_reader.cpp @@ -1,40 +1,10 @@ #ifdef MSVC -#pragma region InChI-Trust Licence -/* - * Reaction International Chemical Identifier (RInChI) - * Version 1 - * Software version 1.00 - * 2022-01-14 - * - * The RInChI library and programs are free software developed under the - * auspices of the International Union of Pure and Applied Chemistry (IUPAC). - * - * IUPAC/InChI-Trust Licence No.1.0 for the - * Reaction International Chemical Identifier (RInChI) Software version 1.0 - * Copyright (C) IUPAC and InChI Trust Limited - * - * This library is free software; you can redistribute it and/or modify it - * under the terms of the IUPAC/InChI Trust InChI Licence No.1.0, - * or any later version. - * - * Please note that this library is distributed WITHOUT ANY WARRANTIES - * whatsoever, whether expressed or implied. See the IUPAC/InChI Trust - * Licence for the International Chemical Identifier (InChI) Software - * ("IUPAC/InChI-Trust InChI Licence No. 1.0" in "LICENCE.TXT") - * for more details. - * - * You should have received a copy of the IUPAC/InChI Trust InChI - * Licence No. 1.0 with this library; if not, please write to: - * - * The InChI Trust - * 8 Cavendish Avenue - * Cambridge CB1 7US - * UK - * - * or email to: alan@inchi-trust.org. - * - */ -#pragma endregion +#pragma region RInChI-license +// Copyright (C) 2017 - 2024 InChI Project. All Rights Reserved. +// This file is part of the RInChI source code. +// The contents are covered by the terms of the MIT license +// included in the file ./../../LICENCE.txt. +#pragma endregion #endif #include diff --git a/src/parsers/mdl_rxnfile_reader.h b/src/parsers/mdl_rxnfile_reader.h index 3fa43c418..50a1b3dbc 100644 --- a/src/parsers/mdl_rxnfile_reader.h +++ b/src/parsers/mdl_rxnfile_reader.h @@ -2,42 +2,12 @@ #define IUPAC_RINCHI_MDLRXNFILEREADER_HEADER_GUARD #ifdef MSVC -#pragma region InChI-Trust Licence -/* - * Reaction International Chemical Identifier (RInChI) - * Version 1 - * Software version 1.00 - * 2022-01-14 - * - * The RInChI library and programs are free software developed under the - * auspices of the International Union of Pure and Applied Chemistry (IUPAC). - * - * IUPAC/InChI-Trust Licence No.1.0 for the - * Reaction International Chemical Identifier (RInChI) Software version 1.0 - * Copyright (C) IUPAC and InChI Trust Limited - * - * This library is free software; you can redistribute it and/or modify it - * under the terms of the IUPAC/InChI Trust InChI Licence No.1.0, - * or any later version. - * - * Please note that this library is distributed WITHOUT ANY WARRANTIES - * whatsoever, whether expressed or implied. See the IUPAC/InChI Trust - * Licence for the International Chemical Identifier (InChI) Software - * ("IUPAC/InChI-Trust InChI Licence No. 1.0" in "LICENCE.TXT") - * for more details. - * - * You should have received a copy of the IUPAC/InChI Trust InChI - * Licence No. 1.0 with this library; if not, please write to: - * - * The InChI Trust - * 8 Cavendish Avenue - * Cambridge CB1 7US - * UK - * - * or email to: alan@inchi-trust.org. - * - */ -#pragma endregion +#pragma region RInChI-license +// Copyright (C) 2017 - 2024 InChI Project. All Rights Reserved. +// This file is part of the RInChI source code. +// The contents are covered by the terms of the MIT license +// included in the file ./../../LICENCE.txt. +#pragma endregion #endif #include "generic_line_reader.h" diff --git a/src/parsers/rinchi_reader.cpp b/src/parsers/rinchi_reader.cpp index f898d4115..fc4267aba 100644 --- a/src/parsers/rinchi_reader.cpp +++ b/src/parsers/rinchi_reader.cpp @@ -1,40 +1,10 @@ #ifdef MSVC -#pragma region InChI-Trust Licence -/* - * Reaction International Chemical Identifier (RInChI) - * Version 1 - * Software version 1.00 - * 2022-01-14 - * - * The RInChI library and programs are free software developed under the - * auspices of the International Union of Pure and Applied Chemistry (IUPAC). - * - * IUPAC/InChI-Trust Licence No.1.0 for the - * Reaction International Chemical Identifier (RInChI) Software version 1.0 - * Copyright (C) IUPAC and InChI Trust Limited - * - * This library is free software; you can redistribute it and/or modify it - * under the terms of the IUPAC/InChI Trust InChI Licence No.1.0, - * or any later version. - * - * Please note that this library is distributed WITHOUT ANY WARRANTIES - * whatsoever, whether expressed or implied. See the IUPAC/InChI Trust - * Licence for the International Chemical Identifier (InChI) Software - * ("IUPAC/InChI-Trust InChI Licence No. 1.0" in "LICENCE.TXT") - * for more details. - * - * You should have received a copy of the IUPAC/InChI Trust InChI - * Licence No. 1.0 with this library; if not, please write to: - * - * The InChI Trust - * 8 Cavendish Avenue - * Cambridge CB1 7US - * UK - * - * or email to: alan@inchi-trust.org. - * - */ -#pragma endregion +#pragma region RInChI-license +// Copyright (C) 2017 - 2024 InChI Project. All Rights Reserved. +// This file is part of the RInChI source code. +// The contents are covered by the terms of the MIT license +// included in the file ./../../LICENCE.txt. +#pragma endregion #endif #include diff --git a/src/parsers/rinchi_reader.h b/src/parsers/rinchi_reader.h index 7ffd12b4b..b1981d64f 100644 --- a/src/parsers/rinchi_reader.h +++ b/src/parsers/rinchi_reader.h @@ -2,42 +2,12 @@ #define IUPAC_RINCHI_RINCHIREADER_HEADER_GUARD #ifdef MSVC -#pragma region InChI-Trust Licence -/* - * Reaction International Chemical Identifier (RInChI) - * Version 1 - * Software version 1.00 - * 2022-01-14 - * - * The RInChI library and programs are free software developed under the - * auspices of the International Union of Pure and Applied Chemistry (IUPAC). - * - * IUPAC/InChI-Trust Licence No.1.0 for the - * Reaction International Chemical Identifier (RInChI) Software version 1.0 - * Copyright (C) IUPAC and InChI Trust Limited - * - * This library is free software; you can redistribute it and/or modify it - * under the terms of the IUPAC/InChI Trust InChI Licence No.1.0, - * or any later version. - * - * Please note that this library is distributed WITHOUT ANY WARRANTIES - * whatsoever, whether expressed or implied. See the IUPAC/InChI Trust - * Licence for the International Chemical Identifier (InChI) Software - * ("IUPAC/InChI-Trust InChI Licence No. 1.0" in "LICENCE.TXT") - * for more details. - * - * You should have received a copy of the IUPAC/InChI Trust InChI - * Licence No. 1.0 with this library; if not, please write to: - * - * The InChI Trust - * 8 Cavendish Avenue - * Cambridge CB1 7US - * UK - * - * or email to: alan@inchi-trust.org. - * - */ -#pragma endregion +#pragma region RInChI-license +// Copyright (C) 2017 - 2024 InChI Project. All Rights Reserved. +// This file is part of the RInChI source code. +// The contents are covered by the terms of the MIT license +// included in the file ./../../LICENCE.txt. +#pragma endregion #endif #include diff --git a/src/rinchi/rinchi_consts.cpp b/src/rinchi/rinchi_consts.cpp index 6c3968110..47c7247c6 100644 --- a/src/rinchi/rinchi_consts.cpp +++ b/src/rinchi/rinchi_consts.cpp @@ -1,40 +1,10 @@ #ifdef MSVC -#pragma region InChI-Trust Licence -/* - * Reaction International Chemical Identifier (RInChI) - * Version 1 - * Software version 1.00 - * 2022-01-14 - * - * The RInChI library and programs are free software developed under the - * auspices of the International Union of Pure and Applied Chemistry (IUPAC). - * - * IUPAC/InChI-Trust Licence No.1.0 for the - * Reaction International Chemical Identifier (RInChI) Software version 1.0 - * Copyright (C) IUPAC and InChI Trust Limited - * - * This library is free software; you can redistribute it and/or modify it - * under the terms of the IUPAC/InChI Trust InChI Licence No.1.0, - * or any later version. - * - * Please note that this library is distributed WITHOUT ANY WARRANTIES - * whatsoever, whether expressed or implied. See the IUPAC/InChI Trust - * Licence for the International Chemical Identifier (InChI) Software - * ("IUPAC/InChI-Trust InChI Licence No. 1.0" in "LICENCE.TXT") - * for more details. - * - * You should have received a copy of the IUPAC/InChI Trust InChI - * Licence No. 1.0 with this library; if not, please write to: - * - * The InChI Trust - * 8 Cavendish Avenue - * Cambridge CB1 7US - * UK - * - * or email to: alan@inchi-trust.org. - * - */ -#pragma endregion +#pragma region RInChI-license +// Copyright (C) 2017 - 2024 InChI Project. All Rights Reserved. +// This file is part of the RInChI source code. +// The contents are covered by the terms of the MIT license +// included in the file ./../../LICENCE.txt. +#pragma endregion #endif #include "rinchi_consts.h" diff --git a/src/rinchi/rinchi_consts.h b/src/rinchi/rinchi_consts.h index a0bf28c5e..3379db80d 100644 --- a/src/rinchi/rinchi_consts.h +++ b/src/rinchi/rinchi_consts.h @@ -2,42 +2,12 @@ #define IUPAC_RINCHI_CONSTS_HEADER_GUARD #ifdef MSVC -#pragma region InChI-Trust Licence -/* - * Reaction International Chemical Identifier (RInChI) - * Version 1 - * Software version 1.00 - * 2022-01-14 - * - * The RInChI library and programs are free software developed under the - * auspices of the International Union of Pure and Applied Chemistry (IUPAC). - * - * IUPAC/InChI-Trust Licence No.1.0 for the - * Reaction International Chemical Identifier (RInChI) Software version 1.0 - * Copyright (C) IUPAC and InChI Trust Limited - * - * This library is free software; you can redistribute it and/or modify it - * under the terms of the IUPAC/InChI Trust InChI Licence No.1.0, - * or any later version. - * - * Please note that this library is distributed WITHOUT ANY WARRANTIES - * whatsoever, whether expressed or implied. See the IUPAC/InChI Trust - * Licence for the International Chemical Identifier (InChI) Software - * ("IUPAC/InChI-Trust InChI Licence No. 1.0" in "LICENCE.TXT") - * for more details. - * - * You should have received a copy of the IUPAC/InChI Trust InChI - * Licence No. 1.0 with this library; if not, please write to: - * - * The InChI Trust - * 8 Cavendish Avenue - * Cambridge CB1 7US - * UK - * - * or email to: alan@inchi-trust.org. - * - */ -#pragma endregion +#pragma region RInChI-license +// Copyright (C) 2017 - 2024 InChI Project. All Rights Reserved. +// This file is part of the RInChI source code. +// The contents are covered by the terms of the MIT license +// included in the file ./../../LICENCE.txt. +#pragma endregion #endif #include diff --git a/src/rinchi/rinchi_reaction.cpp b/src/rinchi/rinchi_reaction.cpp index 12d7a4bc4..06bbca33b 100644 --- a/src/rinchi/rinchi_reaction.cpp +++ b/src/rinchi/rinchi_reaction.cpp @@ -1,40 +1,10 @@ #ifdef MSVC -#pragma region InChI-Trust Licence -/* - * Reaction International Chemical Identifier (RInChI) - * Version 1 - * Software version 1.00 - * 2022-01-14 - * - * The RInChI library and programs are free software developed under the - * auspices of the International Union of Pure and Applied Chemistry (IUPAC). - * - * IUPAC/InChI-Trust Licence No.1.0 for the - * Reaction International Chemical Identifier (RInChI) Software version 1.0 - * Copyright (C) IUPAC and InChI Trust Limited - * - * This library is free software; you can redistribute it and/or modify it - * under the terms of the IUPAC/InChI Trust InChI Licence No.1.0, - * or any later version. - * - * Please note that this library is distributed WITHOUT ANY WARRANTIES - * whatsoever, whether expressed or implied. See the IUPAC/InChI Trust - * Licence for the International Chemical Identifier (InChI) Software - * ("IUPAC/InChI-Trust InChI Licence No. 1.0" in "LICENCE.TXT") - * for more details. - * - * You should have received a copy of the IUPAC/InChI Trust InChI - * Licence No. 1.0 with this library; if not, please write to: - * - * The InChI Trust - * 8 Cavendish Avenue - * Cambridge CB1 7US - * UK - * - * or email to: alan@inchi-trust.org. - * - */ -#pragma endregion +#pragma region RInChI-license +// Copyright (C) 2017 - 2024 InChI Project. All Rights Reserved. +// This file is part of the RInChI source code. +// The contents are covered by the terms of the MIT license +// included in the file ./../../LICENCE.txt. +#pragma endregion #endif #include diff --git a/src/rinchi/rinchi_reaction.h b/src/rinchi/rinchi_reaction.h index 8e3ce3a79..ad6f77a54 100644 --- a/src/rinchi/rinchi_reaction.h +++ b/src/rinchi/rinchi_reaction.h @@ -2,42 +2,12 @@ #define IUPAC_RINCHI_REACTION_HEADER_GUARD #ifdef MSVC -#pragma region InChI-Trust Licence -/* - * Reaction International Chemical Identifier (RInChI) - * Version 1 - * Software version 1.00 - * 2022-01-14 - * - * The RInChI library and programs are free software developed under the - * auspices of the International Union of Pure and Applied Chemistry (IUPAC). - * - * IUPAC/InChI-Trust Licence No.1.0 for the - * Reaction International Chemical Identifier (RInChI) Software version 1.0 - * Copyright (C) IUPAC and InChI Trust Limited - * - * This library is free software; you can redistribute it and/or modify it - * under the terms of the IUPAC/InChI Trust InChI Licence No.1.0, - * or any later version. - * - * Please note that this library is distributed WITHOUT ANY WARRANTIES - * whatsoever, whether expressed or implied. See the IUPAC/InChI Trust - * Licence for the International Chemical Identifier (InChI) Software - * ("IUPAC/InChI-Trust InChI Licence No. 1.0" in "LICENCE.TXT") - * for more details. - * - * You should have received a copy of the IUPAC/InChI Trust InChI - * Licence No. 1.0 with this library; if not, please write to: - * - * The InChI Trust - * 8 Cavendish Avenue - * Cambridge CB1 7US - * UK - * - * or email to: alan@inchi-trust.org. - * - */ -#pragma endregion +#pragma region RInChI-license +// Copyright (C) 2017 - 2024 InChI Project. All Rights Reserved. +// This file is part of the RInChI source code. +// The contents are covered by the terms of the MIT license +// included in the file ./../../LICENCE.txt. +#pragma endregion #endif #include diff --git a/src/rinchi_lib/rinchi_lib.cpp b/src/rinchi_lib/rinchi_lib.cpp index 637beb5d3..2fe3bba40 100644 --- a/src/rinchi_lib/rinchi_lib.cpp +++ b/src/rinchi_lib/rinchi_lib.cpp @@ -1,40 +1,10 @@ #ifdef MSVC -#pragma region InChI-Trust Licence -/* - * Reaction International Chemical Identifier (RInChI) - * Version 1 - * Software version 1.00 - * 2022-01-14 - * - * The RInChI library and programs are free software developed under the - * auspices of the International Union of Pure and Applied Chemistry (IUPAC). - * - * IUPAC/InChI-Trust Licence No.1.0 for the - * Reaction International Chemical Identifier (RInChI) Software version 1.0 - * Copyright (C) IUPAC and InChI Trust Limited - * - * This library is free software; you can redistribute it and/or modify it - * under the terms of the IUPAC/InChI Trust InChI Licence No.1.0, - * or any later version. - * - * Please note that this library is distributed WITHOUT ANY WARRANTIES - * whatsoever, whether expressed or implied. See the IUPAC/InChI Trust - * Licence for the International Chemical Identifier (InChI) Software - * ("IUPAC/InChI-Trust InChI Licence No. 1.0" in "LICENCE.TXT") - * for more details. - * - * You should have received a copy of the IUPAC/InChI Trust InChI - * Licence No. 1.0 with this library; if not, please write to: - * - * The InChI Trust - * 8 Cavendish Avenue - * Cambridge CB1 7US - * UK - * - * or email to: alan@inchi-trust.org. - * - */ -#pragma endregion +#pragma region RInChI-license +// Copyright (C) 2017 - 2024 InChI Project. All Rights Reserved. +// This file is part of the RInChI source code. +// The contents are covered by the terms of the MIT license +// included in the file ./../../LICENCE.txt. +#pragma endregion #endif #include diff --git a/src/rinchi_lib/rinchi_lib.h b/src/rinchi_lib/rinchi_lib.h index 1c161ef2c..ebe59427d 100644 --- a/src/rinchi_lib/rinchi_lib.h +++ b/src/rinchi_lib/rinchi_lib.h @@ -2,42 +2,12 @@ #define IUPAC_RINCHI_RINCHI_LIB_HEADER_GUARD #ifdef MSVC -#pragma region InChI-Trust Licence -/* - * Reaction International Chemical Identifier (RInChI) - * Version 1 - * Software version 1.00 - * 2022-01-14 - * - * The RInChI library and programs are free software developed under the - * auspices of the International Union of Pure and Applied Chemistry (IUPAC). - * - * IUPAC/InChI-Trust Licence No.1.0 for the - * Reaction International Chemical Identifier (RInChI) Software version 1.0 - * Copyright (C) IUPAC and InChI Trust Limited - * - * This library is free software; you can redistribute it and/or modify it - * under the terms of the IUPAC/InChI Trust InChI Licence No.1.0, - * or any later version. - * - * Please note that this library is distributed WITHOUT ANY WARRANTIES - * whatsoever, whether expressed or implied. See the IUPAC/InChI Trust - * Licence for the International Chemical Identifier (InChI) Software - * ("IUPAC/InChI-Trust InChI Licence No. 1.0" in "LICENCE.TXT") - * for more details. - * - * You should have received a copy of the IUPAC/InChI Trust InChI - * Licence No. 1.0 with this library; if not, please write to: - * - * The InChI Trust - * 8 Cavendish Avenue - * Cambridge CB1 7US - * UK - * - * or email to: alan@inchi-trust.org. - * - */ -#pragma endregion +#pragma region RInChI-license +// Copyright (C) 2017 - 2024 InChI Project. All Rights Reserved. +// This file is part of the RInChI source code. +// The contents are covered by the terms of the MIT license +// included in the file ./../../LICENCE.txt. +#pragma endregion #endif #define RETURN_CODE_SUCCESS 0 diff --git a/src/rinchi_lib/rinchi_lib.py b/src/rinchi_lib/rinchi_lib.py index 6644eb2c6..40d0b75b0 100644 --- a/src/rinchi_lib/rinchi_lib.py +++ b/src/rinchi_lib/rinchi_lib.py @@ -1,39 +1,9 @@ -#pragma region InChI-Trust Licence -#/* -# * Reaction International Chemical Identifier (RInChI) -# * Version 1 -# * Software version 1.00 -# * 2022-01-14 -# * -# * The RInChI library and programs are free software developed under the -# * auspices of the International Union of Pure and Applied Chemistry (IUPAC). -# * -# * IUPAC/InChI-Trust Licence No.1.0 for the -# * Reaction International Chemical Identifier (RInChI) Software version 1.0 -# * Copyright (C) IUPAC and InChI Trust Limited -# * -# * This library is free software; you can redistribute it and/or modify it -# * under the terms of the IUPAC/InChI Trust InChI Licence No.1.0, -# * or any later version. -# * -# * Please note that this library is distributed WITHOUT ANY WARRANTIES -# * whatsoever, whether expressed or implied. See the IUPAC/InChI Trust -# * Licence for the International Chemical Identifier (InChI) Software -# * ("IUPAC/InChI-Trust InChI Licence No. 1.0" in "LICENCE.TXT") -# * for more details. -# * -# * You should have received a copy of the IUPAC/InChI Trust InChI -# * Licence No. 1.0 with this library; if not, please write to: -# * -# * The InChI Trust -# * 8 Cavendish Avenue -# * Cambridge CB1 7US -# * UK -# * -# * or email to: alan@inchi-trust.org. -# * -# */ -#pragma endregion +#pragma region RInChI-license +# Copyright (C) 2017 - 2024 InChI Project. All Rights Reserved. +# This file is part of the RInChI source code. +# The contents are covered by the terms of the MIT license +# included in the file ./../../LICENCE.txt. +#pragma endregion import os from ctypes import * diff --git a/src/rinchi_lib/test.py b/src/rinchi_lib/test.py index 7b5d4ee5a..3b1656467 100644 --- a/src/rinchi_lib/test.py +++ b/src/rinchi_lib/test.py @@ -1,39 +1,9 @@ -#pragma region InChI-Trust Licence -#/* -# * Reaction International Chemical Identifier (RInChI) -# * Version 1 -# * Software version 1.00 -# * 2022-01-14 -# * -# * The RInChI library and programs are free software developed under the -# * auspices of the International Union of Pure and Applied Chemistry (IUPAC). -# * -# * IUPAC/InChI-Trust Licence No.1.0 for the -# * Reaction International Chemical Identifier (RInChI) Software version 1.0 -# * Copyright (C) IUPAC and InChI Trust Limited -# * -# * This library is free software; you can redistribute it and/or modify it -# * under the terms of the IUPAC/InChI Trust InChI Licence No.1.0, -# * or any later version. -# * -# * Please note that this library is distributed WITHOUT ANY WARRANTIES -# * whatsoever, whether expressed or implied. See the IUPAC/InChI Trust -# * Licence for the International Chemical Identifier (InChI) Software -# * ("IUPAC/InChI-Trust InChI Licence No. 1.0" in "LICENCE.TXT") -# * for more details. -# * -# * You should have received a copy of the IUPAC/InChI Trust InChI -# * Licence No. 1.0 with this library; if not, please write to: -# * -# * The InChI Trust -# * 8 Cavendish Avenue -# * Cambridge CB1 7US -# * UK -# * -# * or email to: alan@inchi-trust.org. -# * -# */ -#pragma endregion +#pragma region RInChI-license +# Copyright (C) 2017 - 2024 InChI Project. All Rights Reserved. +# This file is part of the RInChI source code. +# The contents are covered by the terms of the MIT license +# included in the file ./../../LICENCE.txt. +#pragma endregion import rinchi_lib diff --git a/src/rinchi_ora_cartridge/packages/rinorca.pck b/src/rinchi_ora_cartridge/packages/rinorca.pck index dc873768e..a55f5bf04 100644 --- a/src/rinchi_ora_cartridge/packages/rinorca.pck +++ b/src/rinchi_ora_cartridge/packages/rinorca.pck @@ -1,41 +1,11 @@ create or replace package rinorca is ---#pragma region InChI-Trust Licence -/* - * Reaction International Chemical Identifier (RInChI) - * Version 1 - * Software version 1.00 - * 2022-01-14 - * - * The RInChI library and programs are free software developed under the - * auspices of the International Union of Pure and Applied Chemistry (IUPAC). - * - * IUPAC/InChI-Trust Licence No.1.0 for the - * Reaction International Chemical Identifier (RInChI) Software version 1.0 - * Copyright (C) IUPAC and InChI Trust Limited - * - * This library is free software; you can redistribute it and/or modify it - * under the terms of the IUPAC/InChI Trust InChI Licence No.1.0, - * or any later version. - * - * Please note that this library is distributed WITHOUT ANY WARRANTIES - * whatsoever, whether expressed or implied. See the IUPAC/InChI Trust - * Licence for the International Chemical Identifier (InChI) Software - * ("IUPAC/InChI-Trust InChI Licence No. 1.0" in "LICENCE.TXT") - * for more details. - * - * You should have received a copy of the IUPAC/InChI Trust InChI - * Licence No. 1.0 with this library; if not, please write to: - * - * The InChI Trust - * 8 Cavendish Avenue - * Cambridge CB1 7US - * UK - * - * or email to: alan@inchi-trust.org. - * - */ ---#pragma endregion +#pragma region RInChI-license +// Copyright (C) 2017 - 2024 InChI Project. All Rights Reserved. +// This file is part of the RInChI source code. +// The contents are covered by the terms of the MIT license +// included in the file ./../../../LICENCE.txt. +#pragma endregion -- Author : JHJE -- Created : 2014-11-26 23:15:43 diff --git a/src/rinchi_ora_cartridge/rinchi_ora_cartridge.cpp b/src/rinchi_ora_cartridge/rinchi_ora_cartridge.cpp index 884fce210..97752f716 100644 --- a/src/rinchi_ora_cartridge/rinchi_ora_cartridge.cpp +++ b/src/rinchi_ora_cartridge/rinchi_ora_cartridge.cpp @@ -1,40 +1,10 @@ #ifdef MSVC -#pragma region InChI-Trust Licence -/* - * Reaction International Chemical Identifier (RInChI) - * Version 1 - * Software version 1.00 - * 2022-01-14 - * - * The RInChI library and programs are free software developed under the - * auspices of the International Union of Pure and Applied Chemistry (IUPAC). - * - * IUPAC/InChI-Trust Licence No.1.0 for the - * Reaction International Chemical Identifier (RInChI) Software version 1.0 - * Copyright (C) IUPAC and InChI Trust Limited - * - * This library is free software; you can redistribute it and/or modify it - * under the terms of the IUPAC/InChI Trust InChI Licence No.1.0, - * or any later version. - * - * Please note that this library is distributed WITHOUT ANY WARRANTIES - * whatsoever, whether expressed or implied. See the IUPAC/InChI Trust - * Licence for the International Chemical Identifier (InChI) Software - * ("IUPAC/InChI-Trust InChI Licence No. 1.0" in "LICENCE.TXT") - * for more details. - * - * You should have received a copy of the IUPAC/InChI Trust InChI - * Licence No. 1.0 with this library; if not, please write to: - * - * The InChI Trust - * 8 Cavendish Avenue - * Cambridge CB1 7US - * UK - * - * or email to: alan@inchi-trust.org. - * - */ -#pragma endregion +#pragma region RInChI-license +// Copyright (C) 2017 - 2024 InChI Project. All Rights Reserved. +// This file is part of the RInChI source code. +// The contents are covered by the terms of the MIT license +// included in the file ./../../LICENCE.txt. +#pragma endregion #endif #include diff --git a/src/rinchi_ora_cartridge/rinchi_ora_cartridge.h b/src/rinchi_ora_cartridge/rinchi_ora_cartridge.h index 2d91a5af8..cbc54a3a6 100644 --- a/src/rinchi_ora_cartridge/rinchi_ora_cartridge.h +++ b/src/rinchi_ora_cartridge/rinchi_ora_cartridge.h @@ -1,42 +1,12 @@ #pragma once #ifdef MSVC -#pragma region InChI-Trust Licence -/* - * Reaction International Chemical Identifier (RInChI) - * Version 1 - * Software version 1.00 - * 2022-01-14 - * - * The RInChI library and programs are free software developed under the - * auspices of the International Union of Pure and Applied Chemistry (IUPAC). - * - * IUPAC/InChI-Trust Licence No.1.0 for the - * Reaction International Chemical Identifier (RInChI) Software version 1.0 - * Copyright (C) IUPAC and InChI Trust Limited - * - * This library is free software; you can redistribute it and/or modify it - * under the terms of the IUPAC/InChI Trust InChI Licence No.1.0, - * or any later version. - * - * Please note that this library is distributed WITHOUT ANY WARRANTIES - * whatsoever, whether expressed or implied. See the IUPAC/InChI Trust - * Licence for the International Chemical Identifier (InChI) Software - * ("IUPAC/InChI-Trust InChI Licence No. 1.0" in "LICENCE.TXT") - * for more details. - * - * You should have received a copy of the IUPAC/InChI Trust InChI - * Licence No. 1.0 with this library; if not, please write to: - * - * The InChI Trust - * 8 Cavendish Avenue - * Cambridge CB1 7US - * UK - * - * or email to: alan@inchi-trust.org. - * - */ -#pragma endregion +#pragma region RInChI-license +// Copyright (C) 2017 - 2024 InChI Project. All Rights Reserved. +// This file is part of the RInChI source code. +// The contents are covered by the terms of the MIT license +// included in the file ./../../LICENCE.txt. +#pragma endregion #endif #define RETURN_CODE_SUCCESS 0 diff --git a/src/test/test_suite/rinchi_test_suite.cpp b/src/test/test_suite/rinchi_test_suite.cpp index 4b72cfb8b..ece2f5c3e 100644 --- a/src/test/test_suite/rinchi_test_suite.cpp +++ b/src/test/test_suite/rinchi_test_suite.cpp @@ -1,40 +1,10 @@ #ifdef MSVC -#pragma region InChI-Trust Licence -/* - * Reaction International Chemical Identifier (RInChI) - * Version 1 - * Software version 1.00 - * 2022-01-14 - * - * The RInChI library and programs are free software developed under the - * auspices of the International Union of Pure and Applied Chemistry (IUPAC). - * - * IUPAC/InChI-Trust Licence No.1.0 for the - * Reaction International Chemical Identifier (RInChI) Software version 1.0 - * Copyright (C) IUPAC and InChI Trust Limited - * - * This library is free software; you can redistribute it and/or modify it - * under the terms of the IUPAC/InChI Trust InChI Licence No.1.0, - * or any later version. - * - * Please note that this library is distributed WITHOUT ANY WARRANTIES - * whatsoever, whether expressed or implied. See the IUPAC/InChI Trust - * Licence for the International Chemical Identifier (InChI) Software - * ("IUPAC/InChI-Trust InChI Licence No. 1.0" in "LICENCE.TXT") - * for more details. - * - * You should have received a copy of the IUPAC/InChI Trust InChI - * Licence No. 1.0 with this library; if not, please write to: - * - * The InChI Trust - * 8 Cavendish Avenue - * Cambridge CB1 7US - * UK - * - * or email to: alan@inchi-trust.org. - * - */ -#pragma endregion +#pragma region RInChI-license +// Copyright (C) 2017 - 2024 InChI Project. All Rights Reserved. +// This file is part of the RInChI source code. +// The contents are covered by the terms of the MIT license +// included in the file ./../../../LICENCE.txt. +#pragma endregion #endif /** diff --git a/src/test/test_suite/tests/Cambridge_data_tests.cpp b/src/test/test_suite/tests/Cambridge_data_tests.cpp index b0d68cbdd..8ccdc00df 100644 --- a/src/test/test_suite/tests/Cambridge_data_tests.cpp +++ b/src/test/test_suite/tests/Cambridge_data_tests.cpp @@ -1,40 +1,10 @@ #ifdef MSVC -#pragma region InChI-Trust Licence -/* - * Reaction International Chemical Identifier (RInChI) - * Version 1 - * Software version 1.00 - * 2022-01-14 - * - * The RInChI library and programs are free software developed under the - * auspices of the International Union of Pure and Applied Chemistry (IUPAC). - * - * IUPAC/InChI-Trust Licence No.1.0 for the - * Reaction International Chemical Identifier (RInChI) Software version 1.0 - * Copyright (C) IUPAC and InChI Trust Limited - * - * This library is free software; you can redistribute it and/or modify it - * under the terms of the IUPAC/InChI Trust InChI Licence No.1.0, - * or any later version. - * - * Please note that this library is distributed WITHOUT ANY WARRANTIES - * whatsoever, whether expressed or implied. See the IUPAC/InChI Trust - * Licence for the International Chemical Identifier (InChI) Software - * ("IUPAC/InChI-Trust InChI Licence No. 1.0" in "LICENCE.TXT") - * for more details. - * - * You should have received a copy of the IUPAC/InChI Trust InChI - * Licence No. 1.0 with this library; if not, please write to: - * - * The InChI Trust - * 8 Cavendish Avenue - * Cambridge CB1 7US - * UK - * - * or email to: alan@inchi-trust.org. - * - */ -#pragma endregion +#pragma region RInChI-license +// Copyright (C) 2017 - 2024 InChI Project. All Rights Reserved. +// This file is part of the RInChI source code. +// The contents are covered by the terms of the MIT license +// included in the file ./../../../../LICENCE.txt. +#pragma endregion #endif #include diff --git a/src/test/test_suite/tests/Cambridge_data_tests.h b/src/test/test_suite/tests/Cambridge_data_tests.h index 97400e6c1..badb1c22e 100644 --- a/src/test/test_suite/tests/Cambridge_data_tests.h +++ b/src/test/test_suite/tests/Cambridge_data_tests.h @@ -2,42 +2,12 @@ #define IUPAC_RINCHI_CAMBRIDGEDATA_RXNFILETESTS_HEADER_GUARD #ifdef MSVC -#pragma region InChI-Trust Licence -/* - * Reaction International Chemical Identifier (RInChI) - * Version 1 - * Software version 1.00 - * 2022-01-14 - * - * The RInChI library and programs are free software developed under the - * auspices of the International Union of Pure and Applied Chemistry (IUPAC). - * - * IUPAC/InChI-Trust Licence No.1.0 for the - * Reaction International Chemical Identifier (RInChI) Software version 1.0 - * Copyright (C) IUPAC and InChI Trust Limited - * - * This library is free software; you can redistribute it and/or modify it - * under the terms of the IUPAC/InChI Trust InChI Licence No.1.0, - * or any later version. - * - * Please note that this library is distributed WITHOUT ANY WARRANTIES - * whatsoever, whether expressed or implied. See the IUPAC/InChI Trust - * Licence for the International Chemical Identifier (InChI) Software - * ("IUPAC/InChI-Trust InChI Licence No. 1.0" in "LICENCE.TXT") - * for more details. - * - * You should have received a copy of the IUPAC/InChI Trust InChI - * Licence No. 1.0 with this library; if not, please write to: - * - * The InChI Trust - * 8 Cavendish Avenue - * Cambridge CB1 7US - * UK - * - * or email to: alan@inchi-trust.org. - * - */ -#pragma endregion +#pragma region RInChI-license +// Copyright (C) 2017 - 2024 InChI Project. All Rights Reserved. +// This file is part of the RInChI source code. +// The contents are covered by the terms of the MIT license +// included in the file ./../../../../LICENCE.txt. +#pragma endregion #endif #include diff --git a/src/test/test_suite/tests/USPTO_patent_data_tests.cpp b/src/test/test_suite/tests/USPTO_patent_data_tests.cpp index a9523f7e5..67ef55559 100644 --- a/src/test/test_suite/tests/USPTO_patent_data_tests.cpp +++ b/src/test/test_suite/tests/USPTO_patent_data_tests.cpp @@ -1,40 +1,10 @@ #ifdef MSVC -#pragma region InChI-Trust Licence -/* - * Reaction International Chemical Identifier (RInChI) - * Version 1 - * Software version 1.00 - * 2022-01-14 - * - * The RInChI library and programs are free software developed under the - * auspices of the International Union of Pure and Applied Chemistry (IUPAC). - * - * IUPAC/InChI-Trust Licence No.1.0 for the - * Reaction International Chemical Identifier (RInChI) Software version 1.0 - * Copyright (C) IUPAC and InChI Trust Limited - * - * This library is free software; you can redistribute it and/or modify it - * under the terms of the IUPAC/InChI Trust InChI Licence No.1.0, - * or any later version. - * - * Please note that this library is distributed WITHOUT ANY WARRANTIES - * whatsoever, whether expressed or implied. See the IUPAC/InChI Trust - * Licence for the International Chemical Identifier (InChI) Software - * ("IUPAC/InChI-Trust InChI Licence No. 1.0" in "LICENCE.TXT") - * for more details. - * - * You should have received a copy of the IUPAC/InChI Trust InChI - * Licence No. 1.0 with this library; if not, please write to: - * - * The InChI Trust - * 8 Cavendish Avenue - * Cambridge CB1 7US - * UK - * - * or email to: alan@inchi-trust.org. - * - */ -#pragma endregion +#pragma region RInChI-license +// Copyright (C) 2017 - 2024 InChI Project. All Rights Reserved. +// This file is part of the RInChI source code. +// The contents are covered by the terms of the MIT license +// included in the file ./../../../../LICENCE.txt. +#pragma endregion #endif #include diff --git a/src/test/test_suite/tests/USPTO_patent_data_tests.h b/src/test/test_suite/tests/USPTO_patent_data_tests.h index 344ccee55..a9223e27d 100644 --- a/src/test/test_suite/tests/USPTO_patent_data_tests.h +++ b/src/test/test_suite/tests/USPTO_patent_data_tests.h @@ -2,42 +2,12 @@ #define IUPAC_RINCHI_USPTO_PATENTDATA_TESTS_HEADER_GUARD #ifdef MSVC -#pragma region InChI-Trust Licence -/* - * Reaction International Chemical Identifier (RInChI) - * Version 1 - * Software version 1.00 - * 2022-01-14 - * - * The RInChI library and programs are free software developed under the - * auspices of the International Union of Pure and Applied Chemistry (IUPAC). - * - * IUPAC/InChI-Trust Licence No.1.0 for the - * Reaction International Chemical Identifier (RInChI) Software version 1.0 - * Copyright (C) IUPAC and InChI Trust Limited - * - * This library is free software; you can redistribute it and/or modify it - * under the terms of the IUPAC/InChI Trust InChI Licence No.1.0, - * or any later version. - * - * Please note that this library is distributed WITHOUT ANY WARRANTIES - * whatsoever, whether expressed or implied. See the IUPAC/InChI Trust - * Licence for the International Chemical Identifier (InChI) Software - * ("IUPAC/InChI-Trust InChI Licence No. 1.0" in "LICENCE.TXT") - * for more details. - * - * You should have received a copy of the IUPAC/InChI Trust InChI - * Licence No. 1.0 with this library; if not, please write to: - * - * The InChI Trust - * 8 Cavendish Avenue - * Cambridge CB1 7US - * UK - * - * or email to: alan@inchi-trust.org. - * - */ -#pragma endregion +#pragma region RInChI-license +// Copyright (C) 2017 - 2024 InChI Project. All Rights Reserved. +// This file is part of the RInChI source code. +// The contents are covered by the terms of the MIT license +// included in the file ./../../../../LICENCE.txt. +#pragma endregion #endif #include diff --git a/src/test/test_suite/tests/molfile_reader_tests.cpp b/src/test/test_suite/tests/molfile_reader_tests.cpp index afd87a006..8e07b1778 100644 --- a/src/test/test_suite/tests/molfile_reader_tests.cpp +++ b/src/test/test_suite/tests/molfile_reader_tests.cpp @@ -1,40 +1,10 @@ #ifdef MSVC -#pragma region InChI-Trust Licence -/* - * Reaction International Chemical Identifier (RInChI) - * Version 1 - * Software version 1.00 - * 2022-01-14 - * - * The RInChI library and programs are free software developed under the - * auspices of the International Union of Pure and Applied Chemistry (IUPAC). - * - * IUPAC/InChI-Trust Licence No.1.0 for the - * Reaction International Chemical Identifier (RInChI) Software version 1.0 - * Copyright (C) IUPAC and InChI Trust Limited - * - * This library is free software; you can redistribute it and/or modify it - * under the terms of the IUPAC/InChI Trust InChI Licence No.1.0, - * or any later version. - * - * Please note that this library is distributed WITHOUT ANY WARRANTIES - * whatsoever, whether expressed or implied. See the IUPAC/InChI Trust - * Licence for the International Chemical Identifier (InChI) Software - * ("IUPAC/InChI-Trust InChI Licence No. 1.0" in "LICENCE.TXT") - * for more details. - * - * You should have received a copy of the IUPAC/InChI Trust InChI - * Licence No. 1.0 with this library; if not, please write to: - * - * The InChI Trust - * 8 Cavendish Avenue - * Cambridge CB1 7US - * UK - * - * or email to: alan@inchi-trust.org. - * - */ -#pragma endregion +#pragma region RInChI-license +// Copyright (C) 2017 - 2024 InChI Project. All Rights Reserved. +// This file is part of the RInChI source code. +// The contents are covered by the terms of the MIT license +// included in the file ./../../../../LICENCE.txt. +#pragma endregion #endif diff --git a/src/test/test_suite/tests/molfile_reader_tests.h b/src/test/test_suite/tests/molfile_reader_tests.h index cf29ed08c..c531c2bad 100644 --- a/src/test/test_suite/tests/molfile_reader_tests.h +++ b/src/test/test_suite/tests/molfile_reader_tests.h @@ -2,42 +2,12 @@ #define IUPAC_RINCHI_MOLFILEREADERTESTS_HEADER_GUARD #ifdef MSVC -#pragma region InChI-Trust Licence -/* - * Reaction International Chemical Identifier (RInChI) - * Version 1 - * Software version 1.00 - * 2022-01-14 - * - * The RInChI library and programs are free software developed under the - * auspices of the International Union of Pure and Applied Chemistry (IUPAC). - * - * IUPAC/InChI-Trust Licence No.1.0 for the - * Reaction International Chemical Identifier (RInChI) Software version 1.0 - * Copyright (C) IUPAC and InChI Trust Limited - * - * This library is free software; you can redistribute it and/or modify it - * under the terms of the IUPAC/InChI Trust InChI Licence No.1.0, - * or any later version. - * - * Please note that this library is distributed WITHOUT ANY WARRANTIES - * whatsoever, whether expressed or implied. See the IUPAC/InChI Trust - * Licence for the International Chemical Identifier (InChI) Software - * ("IUPAC/InChI-Trust InChI Licence No. 1.0" in "LICENCE.TXT") - * for more details. - * - * You should have received a copy of the IUPAC/InChI Trust InChI - * Licence No. 1.0 with this library; if not, please write to: - * - * The InChI Trust - * 8 Cavendish Avenue - * Cambridge CB1 7US - * UK - * - * or email to: alan@inchi-trust.org. - * - */ -#pragma endregion +#pragma region RInChI-license +// Copyright (C) 2017 - 2024 InChI Project. All Rights Reserved. +// This file is part of the RInChI source code. +// The contents are covered by the terms of the MIT license +// included in the file ./../../../../LICENCE.txt. +#pragma endregion #endif #include diff --git a/src/test/test_suite/tests/rdfile_tests.cpp b/src/test/test_suite/tests/rdfile_tests.cpp index 9ca1d7575..5d830ef6a 100644 --- a/src/test/test_suite/tests/rdfile_tests.cpp +++ b/src/test/test_suite/tests/rdfile_tests.cpp @@ -1,40 +1,10 @@ #ifdef MSVC -#pragma region InChI-Trust Licence -/* - * Reaction International Chemical Identifier (RInChI) - * Version 1 - * Software version 1.00 - * 2022-01-14 - * - * The RInChI library and programs are free software developed under the - * auspices of the International Union of Pure and Applied Chemistry (IUPAC). - * - * IUPAC/InChI-Trust Licence No.1.0 for the - * Reaction International Chemical Identifier (RInChI) Software version 1.0 - * Copyright (C) IUPAC and InChI Trust Limited - * - * This library is free software; you can redistribute it and/or modify it - * under the terms of the IUPAC/InChI Trust InChI Licence No.1.0, - * or any later version. - * - * Please note that this library is distributed WITHOUT ANY WARRANTIES - * whatsoever, whether expressed or implied. See the IUPAC/InChI Trust - * Licence for the International Chemical Identifier (InChI) Software - * ("IUPAC/InChI-Trust InChI Licence No. 1.0" in "LICENCE.TXT") - * for more details. - * - * You should have received a copy of the IUPAC/InChI Trust InChI - * Licence No. 1.0 with this library; if not, please write to: - * - * The InChI Trust - * 8 Cavendish Avenue - * Cambridge CB1 7US - * UK - * - * or email to: alan@inchi-trust.org. - * - */ -#pragma endregion +#pragma region RInChI-license +// Copyright (C) 2017 - 2024 InChI Project. All Rights Reserved. +// This file is part of the RInChI source code. +// The contents are covered by the terms of the MIT license +// included in the file ./../../../../LICENCE.txt. +#pragma endregion #endif #include diff --git a/src/test/test_suite/tests/rdfile_tests.h b/src/test/test_suite/tests/rdfile_tests.h index 55975972f..36a1b43ce 100644 --- a/src/test/test_suite/tests/rdfile_tests.h +++ b/src/test/test_suite/tests/rdfile_tests.h @@ -2,42 +2,12 @@ #define IUPAC_RINCHI_RDFILETESTS_HEADER_GUARD #ifdef MSVC -#pragma region InChI-Trust Licence -/* - * Reaction International Chemical Identifier (RInChI) - * Version 1 - * Software version 1.00 - * 2022-01-14 - * - * The RInChI library and programs are free software developed under the - * auspices of the International Union of Pure and Applied Chemistry (IUPAC). - * - * IUPAC/InChI-Trust Licence No.1.0 for the - * Reaction International Chemical Identifier (RInChI) Software version 1.0 - * Copyright (C) IUPAC and InChI Trust Limited - * - * This library is free software; you can redistribute it and/or modify it - * under the terms of the IUPAC/InChI Trust InChI Licence No.1.0, - * or any later version. - * - * Please note that this library is distributed WITHOUT ANY WARRANTIES - * whatsoever, whether expressed or implied. See the IUPAC/InChI Trust - * Licence for the International Chemical Identifier (InChI) Software - * ("IUPAC/InChI-Trust InChI Licence No. 1.0" in "LICENCE.TXT") - * for more details. - * - * You should have received a copy of the IUPAC/InChI Trust InChI - * Licence No. 1.0 with this library; if not, please write to: - * - * The InChI Trust - * 8 Cavendish Avenue - * Cambridge CB1 7US - * UK - * - * or email to: alan@inchi-trust.org. - * - */ -#pragma endregion +#pragma region RInChI-license +// Copyright (C) 2017 - 2024 InChI Project. All Rights Reserved. +// This file is part of the RInChI source code. +// The contents are covered by the terms of the MIT license +// included in the file ./../../../../LICENCE.txt. +#pragma endregion #endif #include "unit_test.h" diff --git a/src/test/test_suite/tests/reaction_tests.cpp b/src/test/test_suite/tests/reaction_tests.cpp index b579fbb93..0b274bc9b 100644 --- a/src/test/test_suite/tests/reaction_tests.cpp +++ b/src/test/test_suite/tests/reaction_tests.cpp @@ -1,40 +1,10 @@ #ifdef MSVC -#pragma region InChI-Trust Licence -/* - * Reaction International Chemical Identifier (RInChI) - * Version 1 - * Software version 1.00 - * 2022-01-14 - * - * The RInChI library and programs are free software developed under the - * auspices of the International Union of Pure and Applied Chemistry (IUPAC). - * - * IUPAC/InChI-Trust Licence No.1.0 for the - * Reaction International Chemical Identifier (RInChI) Software version 1.0 - * Copyright (C) IUPAC and InChI Trust Limited - * - * This library is free software; you can redistribute it and/or modify it - * under the terms of the IUPAC/InChI Trust InChI Licence No.1.0, - * or any later version. - * - * Please note that this library is distributed WITHOUT ANY WARRANTIES - * whatsoever, whether expressed or implied. See the IUPAC/InChI Trust - * Licence for the International Chemical Identifier (InChI) Software - * ("IUPAC/InChI-Trust InChI Licence No. 1.0" in "LICENCE.TXT") - * for more details. - * - * You should have received a copy of the IUPAC/InChI Trust InChI - * Licence No. 1.0 with this library; if not, please write to: - * - * The InChI Trust - * 8 Cavendish Avenue - * Cambridge CB1 7US - * UK - * - * or email to: alan@inchi-trust.org. - * - */ -#pragma endregion +#pragma region RInChI-license +// Copyright (C) 2017 - 2024 InChI Project. All Rights Reserved. +// This file is part of the RInChI source code. +// The contents are covered by the terms of the MIT license +// included in the file ./../../../../LICENCE.txt. +#pragma endregion #endif #include diff --git a/src/test/test_suite/tests/reaction_tests.h b/src/test/test_suite/tests/reaction_tests.h index a57415427..2000fdaf7 100644 --- a/src/test/test_suite/tests/reaction_tests.h +++ b/src/test/test_suite/tests/reaction_tests.h @@ -2,42 +2,12 @@ #define IUPAC_RINCHI_REACTIONTESTS_HEADER_GUARD #ifdef MSVC -#pragma region InChI-Trust Licence -/* - * Reaction International Chemical Identifier (RInChI) - * Version 1 - * Software version 1.00 - * 2022-01-14 - * - * The RInChI library and programs are free software developed under the - * auspices of the International Union of Pure and Applied Chemistry (IUPAC). - * - * IUPAC/InChI-Trust Licence No.1.0 for the - * Reaction International Chemical Identifier (RInChI) Software version 1.0 - * Copyright (C) IUPAC and InChI Trust Limited - * - * This library is free software; you can redistribute it and/or modify it - * under the terms of the IUPAC/InChI Trust InChI Licence No.1.0, - * or any later version. - * - * Please note that this library is distributed WITHOUT ANY WARRANTIES - * whatsoever, whether expressed or implied. See the IUPAC/InChI Trust - * Licence for the International Chemical Identifier (InChI) Software - * ("IUPAC/InChI-Trust InChI Licence No. 1.0" in "LICENCE.TXT") - * for more details. - * - * You should have received a copy of the IUPAC/InChI Trust InChI - * Licence No. 1.0 with this library; if not, please write to: - * - * The InChI Trust - * 8 Cavendish Avenue - * Cambridge CB1 7US - * UK - * - * or email to: alan@inchi-trust.org. - * - */ -#pragma endregion +#pragma region RInChI-license +// Copyright (C) 2017 - 2024 InChI Project. All Rights Reserved. +// This file is part of the RInChI source code. +// The contents are covered by the terms of the MIT license +// included in the file ./../../../../LICENCE.txt. +#pragma endregion #endif #include diff --git a/src/test/test_suite/tests/rinchi_reader_tests.cpp b/src/test/test_suite/tests/rinchi_reader_tests.cpp index d9c999575..2e91a6653 100644 --- a/src/test/test_suite/tests/rinchi_reader_tests.cpp +++ b/src/test/test_suite/tests/rinchi_reader_tests.cpp @@ -1,40 +1,10 @@ #ifdef MSVC -#pragma region InChI-Trust Licence -/* - * Reaction International Chemical Identifier (RInChI) - * Version 1 - * Software version 1.00 - * 2022-01-14 - * - * The RInChI library and programs are free software developed under the - * auspices of the International Union of Pure and Applied Chemistry (IUPAC). - * - * IUPAC/InChI-Trust Licence No.1.0 for the - * Reaction International Chemical Identifier (RInChI) Software version 1.0 - * Copyright (C) IUPAC and InChI Trust Limited - * - * This library is free software; you can redistribute it and/or modify it - * under the terms of the IUPAC/InChI Trust InChI Licence No.1.0, - * or any later version. - * - * Please note that this library is distributed WITHOUT ANY WARRANTIES - * whatsoever, whether expressed or implied. See the IUPAC/InChI Trust - * Licence for the International Chemical Identifier (InChI) Software - * ("IUPAC/InChI-Trust InChI Licence No. 1.0" in "LICENCE.TXT") - * for more details. - * - * You should have received a copy of the IUPAC/InChI Trust InChI - * Licence No. 1.0 with this library; if not, please write to: - * - * The InChI Trust - * 8 Cavendish Avenue - * Cambridge CB1 7US - * UK - * - * or email to: alan@inchi-trust.org. - * - */ -#pragma endregion +#pragma region RInChI-license +// Copyright (C) 2017 - 2024 InChI Project. All Rights Reserved. +// This file is part of the RInChI source code. +// The contents are covered by the terms of the MIT license +// included in the file ./../../../../LICENCE.txt. +#pragma endregion #endif #include diff --git a/src/test/test_suite/tests/rinchi_reader_tests.h b/src/test/test_suite/tests/rinchi_reader_tests.h index 80dfaa985..b2ef7fc88 100644 --- a/src/test/test_suite/tests/rinchi_reader_tests.h +++ b/src/test/test_suite/tests/rinchi_reader_tests.h @@ -2,42 +2,12 @@ #define IUPAC_RINCHI_RINCHIREADERTESTS_HEADER_GUARD #ifdef MSVC -#pragma region InChI-Trust Licence -/* - * Reaction International Chemical Identifier (RInChI) - * Version 1 - * Software version 1.00 - * 2022-01-14 - * - * The RInChI library and programs are free software developed under the - * auspices of the International Union of Pure and Applied Chemistry (IUPAC). - * - * IUPAC/InChI-Trust Licence No.1.0 for the - * Reaction International Chemical Identifier (RInChI) Software version 1.0 - * Copyright (C) IUPAC and InChI Trust Limited - * - * This library is free software; you can redistribute it and/or modify it - * under the terms of the IUPAC/InChI Trust InChI Licence No.1.0, - * or any later version. - * - * Please note that this library is distributed WITHOUT ANY WARRANTIES - * whatsoever, whether expressed or implied. See the IUPAC/InChI Trust - * Licence for the International Chemical Identifier (InChI) Software - * ("IUPAC/InChI-Trust InChI Licence No. 1.0" in "LICENCE.TXT") - * for more details. - * - * You should have received a copy of the IUPAC/InChI Trust InChI - * Licence No. 1.0 with this library; if not, please write to: - * - * The InChI Trust - * 8 Cavendish Avenue - * Cambridge CB1 7US - * UK - * - * or email to: alan@inchi-trust.org. - * - */ -#pragma endregion +#pragma region RInChI-license +// Copyright (C) 2017 - 2024 InChI Project. All Rights Reserved. +// This file is part of the RInChI source code. +// The contents are covered by the terms of the MIT license +// included in the file ./../../../../LICENCE.txt. +#pragma endregion #endif #include diff --git a/src/test/test_suite/tests/rxnfile_tests.cpp b/src/test/test_suite/tests/rxnfile_tests.cpp index 1feeb9dac..a9ad4f03a 100644 --- a/src/test/test_suite/tests/rxnfile_tests.cpp +++ b/src/test/test_suite/tests/rxnfile_tests.cpp @@ -1,40 +1,10 @@ #ifdef MSVC -#pragma region InChI-Trust Licence -/* - * Reaction International Chemical Identifier (RInChI) - * Version 1 - * Software version 1.00 - * 2022-01-14 - * - * The RInChI library and programs are free software developed under the - * auspices of the International Union of Pure and Applied Chemistry (IUPAC). - * - * IUPAC/InChI-Trust Licence No.1.0 for the - * Reaction International Chemical Identifier (RInChI) Software version 1.0 - * Copyright (C) IUPAC and InChI Trust Limited - * - * This library is free software; you can redistribute it and/or modify it - * under the terms of the IUPAC/InChI Trust InChI Licence No.1.0, - * or any later version. - * - * Please note that this library is distributed WITHOUT ANY WARRANTIES - * whatsoever, whether expressed or implied. See the IUPAC/InChI Trust - * Licence for the International Chemical Identifier (InChI) Software - * ("IUPAC/InChI-Trust InChI Licence No. 1.0" in "LICENCE.TXT") - * for more details. - * - * You should have received a copy of the IUPAC/InChI Trust InChI - * Licence No. 1.0 with this library; if not, please write to: - * - * The InChI Trust - * 8 Cavendish Avenue - * Cambridge CB1 7US - * UK - * - * or email to: alan@inchi-trust.org. - * - */ -#pragma endregion +#pragma region RInChI-license +// Copyright (C) 2017 - 2024 InChI Project. All Rights Reserved. +// This file is part of the RInChI source code. +// The contents are covered by the terms of the MIT license +// included in the file ./../../../../LICENCE.txt. +#pragma endregion #endif #include diff --git a/src/test/test_suite/tests/rxnfile_tests.h b/src/test/test_suite/tests/rxnfile_tests.h index 48fc1a6e4..5d8953aa4 100644 --- a/src/test/test_suite/tests/rxnfile_tests.h +++ b/src/test/test_suite/tests/rxnfile_tests.h @@ -2,42 +2,12 @@ #define IUPAC_RINCHI_RXNFILETESTS_HEADER_GUARD #ifdef MSVC -#pragma region InChI-Trust Licence -/* - * Reaction International Chemical Identifier (RInChI) - * Version 1 - * Software version 1.00 - * 2022-01-14 - * - * The RInChI library and programs are free software developed under the - * auspices of the International Union of Pure and Applied Chemistry (IUPAC). - * - * IUPAC/InChI-Trust Licence No.1.0 for the - * Reaction International Chemical Identifier (RInChI) Software version 1.0 - * Copyright (C) IUPAC and InChI Trust Limited - * - * This library is free software; you can redistribute it and/or modify it - * under the terms of the IUPAC/InChI Trust InChI Licence No.1.0, - * or any later version. - * - * Please note that this library is distributed WITHOUT ANY WARRANTIES - * whatsoever, whether expressed or implied. See the IUPAC/InChI Trust - * Licence for the International Chemical Identifier (InChI) Software - * ("IUPAC/InChI-Trust InChI Licence No. 1.0" in "LICENCE.TXT") - * for more details. - * - * You should have received a copy of the IUPAC/InChI Trust InChI - * Licence No. 1.0 with this library; if not, please write to: - * - * The InChI Trust - * 8 Cavendish Avenue - * Cambridge CB1 7US - * UK - * - * or email to: alan@inchi-trust.org. - * - */ -#pragma endregion +#pragma region RInChI-license +// Copyright (C) 2017 - 2024 InChI Project. All Rights Reserved. +// This file is part of the RInChI source code. +// The contents are covered by the terms of the MIT license +// included in the file ./../../../../LICENCE.txt. +#pragma endregion #endif #include "unit_test.h" diff --git a/src/test/test_suite/tests/special_atoms_tests.cpp b/src/test/test_suite/tests/special_atoms_tests.cpp index 5b6203920..5b374cacd 100644 --- a/src/test/test_suite/tests/special_atoms_tests.cpp +++ b/src/test/test_suite/tests/special_atoms_tests.cpp @@ -1,40 +1,10 @@ #ifdef MSVC -#pragma region InChI-Trust Licence -/* - * Reaction International Chemical Identifier (RInChI) - * Version 1 - * Software version 1.00 - * 2022-01-14 - * - * The RInChI library and programs are free software developed under the - * auspices of the International Union of Pure and Applied Chemistry (IUPAC). - * - * IUPAC/InChI-Trust Licence No.1.0 for the - * Reaction International Chemical Identifier (RInChI) Software version 1.0 - * Copyright (C) IUPAC and InChI Trust Limited - * - * This library is free software; you can redistribute it and/or modify it - * under the terms of the IUPAC/InChI Trust InChI Licence No.1.0, - * or any later version. - * - * Please note that this library is distributed WITHOUT ANY WARRANTIES - * whatsoever, whether expressed or implied. See the IUPAC/InChI Trust - * Licence for the International Chemical Identifier (InChI) Software - * ("IUPAC/InChI-Trust InChI Licence No. 1.0" in "LICENCE.TXT") - * for more details. - * - * You should have received a copy of the IUPAC/InChI Trust InChI - * Licence No. 1.0 with this library; if not, please write to: - * - * The InChI Trust - * 8 Cavendish Avenue - * Cambridge CB1 7US - * UK - * - * or email to: alan@inchi-trust.org. - * - */ -#pragma endregion +#pragma region RInChI-license +// Copyright (C) 2017 - 2024 InChI Project. All Rights Reserved. +// This file is part of the RInChI source code. +// The contents are covered by the terms of the MIT license +// included in the file ./../../../../LICENCE.txt. +#pragma endregion #endif #include "special_atoms_tests.h" diff --git a/src/test/test_suite/tests/special_atoms_tests.h b/src/test/test_suite/tests/special_atoms_tests.h index 09ba98645..f433394a7 100644 --- a/src/test/test_suite/tests/special_atoms_tests.h +++ b/src/test/test_suite/tests/special_atoms_tests.h @@ -2,42 +2,12 @@ #define IUPAC_RINCHI_SPECIALATOMSTESTS_HEADER_GUARD #ifdef MSVC -#pragma region InChI-Trust Licence -/* - * Reaction International Chemical Identifier (RInChI) - * Version 1 - * Software version 1.00 - * 2022-01-14 - * - * The RInChI library and programs are free software developed under the - * auspices of the International Union of Pure and Applied Chemistry (IUPAC). - * - * IUPAC/InChI-Trust Licence No.1.0 for the - * Reaction International Chemical Identifier (RInChI) Software version 1.0 - * Copyright (C) IUPAC and InChI Trust Limited - * - * This library is free software; you can redistribute it and/or modify it - * under the terms of the IUPAC/InChI Trust InChI Licence No.1.0, - * or any later version. - * - * Please note that this library is distributed WITHOUT ANY WARRANTIES - * whatsoever, whether expressed or implied. See the IUPAC/InChI Trust - * Licence for the International Chemical Identifier (InChI) Software - * ("IUPAC/InChI-Trust InChI Licence No. 1.0" in "LICENCE.TXT") - * for more details. - * - * You should have received a copy of the IUPAC/InChI Trust InChI - * Licence No. 1.0 with this library; if not, please write to: - * - * The InChI Trust - * 8 Cavendish Avenue - * Cambridge CB1 7US - * UK - * - * or email to: alan@inchi-trust.org. - * - */ -#pragma endregion +#pragma region RInChI-license +// Copyright (C) 2017 - 2024 InChI Project. All Rights Reserved. +// This file is part of the RInChI source code. +// The contents are covered by the terms of the MIT license +// included in the file ./../../../../LICENCE.txt. +#pragma endregion #endif #include "unit_test.h" diff --git a/src/writers/mdl_rdfile_writer.cpp b/src/writers/mdl_rdfile_writer.cpp index 961d4ba66..7ad2a9fe2 100644 --- a/src/writers/mdl_rdfile_writer.cpp +++ b/src/writers/mdl_rdfile_writer.cpp @@ -1,40 +1,10 @@ #ifdef MSVC -#pragma region InChI-Trust Licence -/* - * Reaction International Chemical Identifier (RInChI) - * Version 1 - * Software version 1.00 - * 2022-01-14 - * - * The RInChI library and programs are free software developed under the - * auspices of the International Union of Pure and Applied Chemistry (IUPAC). - * - * IUPAC/InChI-Trust Licence No.1.0 for the - * Reaction International Chemical Identifier (RInChI) Software version 1.0 - * Copyright (C) IUPAC and InChI Trust Limited - * - * This library is free software; you can redistribute it and/or modify it - * under the terms of the IUPAC/InChI Trust InChI Licence No.1.0, - * or any later version. - * - * Please note that this library is distributed WITHOUT ANY WARRANTIES - * whatsoever, whether expressed or implied. See the IUPAC/InChI Trust - * Licence for the International Chemical Identifier (InChI) Software - * ("IUPAC/InChI-Trust InChI Licence No. 1.0" in "LICENCE.TXT") - * for more details. - * - * You should have received a copy of the IUPAC/InChI Trust InChI - * Licence No. 1.0 with this library; if not, please write to: - * - * The InChI Trust - * 8 Cavendish Avenue - * Cambridge CB1 7US - * UK - * - * or email to: alan@inchi-trust.org. - * - */ -#pragma endregion +#pragma region RInChI-license +// Copyright (C) 2017 - 2024 InChI Project. All Rights Reserved. +// This file is part of the RInChI source code. +// The contents are covered by the terms of the MIT license +// included in the file ./../../LICENCE.txt. +#pragma endregion #endif #include diff --git a/src/writers/mdl_rdfile_writer.h b/src/writers/mdl_rdfile_writer.h index b524edcc2..ac91971ef 100644 --- a/src/writers/mdl_rdfile_writer.h +++ b/src/writers/mdl_rdfile_writer.h @@ -2,42 +2,12 @@ #define IUPAC_RINCHI_MDLRDFILEWRITER_HEADER_GUARD #ifdef MSVC -#pragma region InChI-Trust Licence -/* - * Reaction International Chemical Identifier (RInChI) - * Version 1 - * Software version 1.00 - * 2022-01-14 - * - * The RInChI library and programs are free software developed under the - * auspices of the International Union of Pure and Applied Chemistry (IUPAC). - * - * IUPAC/InChI-Trust Licence No.1.0 for the - * Reaction International Chemical Identifier (RInChI) Software version 1.0 - * Copyright (C) IUPAC and InChI Trust Limited - * - * This library is free software; you can redistribute it and/or modify it - * under the terms of the IUPAC/InChI Trust InChI Licence No.1.0, - * or any later version. - * - * Please note that this library is distributed WITHOUT ANY WARRANTIES - * whatsoever, whether expressed or implied. See the IUPAC/InChI Trust - * Licence for the International Chemical Identifier (InChI) Software - * ("IUPAC/InChI-Trust InChI Licence No. 1.0" in "LICENCE.TXT") - * for more details. - * - * You should have received a copy of the IUPAC/InChI Trust InChI - * Licence No. 1.0 with this library; if not, please write to: - * - * The InChI Trust - * 8 Cavendish Avenue - * Cambridge CB1 7US - * UK - * - * or email to: alan@inchi-trust.org. - * - */ -#pragma endregion +#pragma region RInChI-license +// Copyright (C) 2017 - 2024 InChI Project. All Rights Reserved. +// This file is part of the RInChI source code. +// The contents are covered by the terms of the MIT license +// included in the file ./../../LICENCE.txt. +#pragma endregion #endif #include diff --git a/src/writers/mdl_rxnfile_writer.cpp b/src/writers/mdl_rxnfile_writer.cpp index 308abbb8d..bce8aa54a 100644 --- a/src/writers/mdl_rxnfile_writer.cpp +++ b/src/writers/mdl_rxnfile_writer.cpp @@ -1,40 +1,10 @@ #ifdef MSVC -#pragma region InChI-Trust Licence -/* - * Reaction International Chemical Identifier (RInChI) - * Version 1 - * Software version 1.00 - * 2022-01-14 - * - * The RInChI library and programs are free software developed under the - * auspices of the International Union of Pure and Applied Chemistry (IUPAC). - * - * IUPAC/InChI-Trust Licence No.1.0 for the - * Reaction International Chemical Identifier (RInChI) Software version 1.0 - * Copyright (C) IUPAC and InChI Trust Limited - * - * This library is free software; you can redistribute it and/or modify it - * under the terms of the IUPAC/InChI Trust InChI Licence No.1.0, - * or any later version. - * - * Please note that this library is distributed WITHOUT ANY WARRANTIES - * whatsoever, whether expressed or implied. See the IUPAC/InChI Trust - * Licence for the International Chemical Identifier (InChI) Software - * ("IUPAC/InChI-Trust InChI Licence No. 1.0" in "LICENCE.TXT") - * for more details. - * - * You should have received a copy of the IUPAC/InChI Trust InChI - * Licence No. 1.0 with this library; if not, please write to: - * - * The InChI Trust - * 8 Cavendish Avenue - * Cambridge CB1 7US - * UK - * - * or email to: alan@inchi-trust.org. - * - */ -#pragma endregion +#pragma region RInChI-license +// Copyright (C) 2017 - 2024 InChI Project. All Rights Reserved. +// This file is part of the RInChI source code. +// The contents are covered by the terms of the MIT license +// included in the file ./../../LICENCE.txt. +#pragma endregion #endif #include diff --git a/src/writers/mdl_rxnfile_writer.h b/src/writers/mdl_rxnfile_writer.h index 18895278f..be9866dd9 100644 --- a/src/writers/mdl_rxnfile_writer.h +++ b/src/writers/mdl_rxnfile_writer.h @@ -2,42 +2,12 @@ #define IUPAC_RINCHI_MDLRXNFILEWRITER_HEADER_GUARD #ifdef MSVC -#pragma region InChI-Trust Licence -/* - * Reaction International Chemical Identifier (RInChI) - * Version 1 - * Software version 1.00 - * 2022-01-14 - * - * The RInChI library and programs are free software developed under the - * auspices of the International Union of Pure and Applied Chemistry (IUPAC). - * - * IUPAC/InChI-Trust Licence No.1.0 for the - * Reaction International Chemical Identifier (RInChI) Software version 1.0 - * Copyright (C) IUPAC and InChI Trust Limited - * - * This library is free software; you can redistribute it and/or modify it - * under the terms of the IUPAC/InChI Trust InChI Licence No.1.0, - * or any later version. - * - * Please note that this library is distributed WITHOUT ANY WARRANTIES - * whatsoever, whether expressed or implied. See the IUPAC/InChI Trust - * Licence for the International Chemical Identifier (InChI) Software - * ("IUPAC/InChI-Trust InChI Licence No. 1.0" in "LICENCE.TXT") - * for more details. - * - * You should have received a copy of the IUPAC/InChI Trust InChI - * Licence No. 1.0 with this library; if not, please write to: - * - * The InChI Trust - * 8 Cavendish Avenue - * Cambridge CB1 7US - * UK - * - * or email to: alan@inchi-trust.org. - * - */ -#pragma endregion +#pragma region RInChI-license +// Copyright (C) 2017 - 2024 InChI Project. All Rights Reserved. +// This file is part of the RInChI source code. +// The contents are covered by the terms of the MIT license +// included in the file ./../../LICENCE.txt. +#pragma endregion #endif #include From 384e89708a2f719e972d64d3ed6dd2d22fcc31ea Mon Sep 17 00:00:00 2001 From: Jan Holst Jensen Date: Thu, 21 Nov 2024 13:02:24 +0100 Subject: [PATCH 2/3] Remove unnecessary trailing text from LICENCE.txt. Edit copyright notice. Rename contributors file to changelog as it more naturally belongs there. --- CONTRIBUTORS.txt => CHANGELOG.md | 0 LICENCE.txt | 15 +-------------- 2 files changed, 1 insertion(+), 14 deletions(-) rename CONTRIBUTORS.txt => CHANGELOG.md (100%) diff --git a/CONTRIBUTORS.txt b/CHANGELOG.md similarity index 100% rename from CONTRIBUTORS.txt rename to CHANGELOG.md diff --git a/LICENCE.txt b/LICENCE.txt index 82c1a86ec..aa58047fd 100644 --- a/LICENCE.txt +++ b/LICENCE.txt @@ -1,6 +1,6 @@ MIT License -Copyright (C) 2024 InChI Project +Copyright (C) 2024 IUPAC and InChI Trust Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -19,16 +19,3 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -The InChI library and programs are free software developed under the -auspices of the International Union of Pure and Applied Chemistry (IUPAC). -Originally developed at NIST. Modifications and additions by IUPAC and the -InChI Trust. - -Some portions of code were developed/changed by external contributors -(either contractor or volunteer) which are listed in the file -'CONTRIBUTORS.txt'. - -For inquiries, contact -info@inchi-trust.org - From e42e4e85e8d43c8f37874e70d27aec6cef7f8f78 Mon Sep 17 00:00:00 2001 From: Jan Holst Jensen Date: Fri, 6 Dec 2024 15:20:11 +0100 Subject: [PATCH 3/3] Contributors now goes to the changelog. --- CHANGELOG.md | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 12fab8341..7ccbd2a81 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,15 @@ +# 2017-03-21 V1.00 +First official release of RInChI. + +**Contributors** + Biochemfusion Holding ApS + www.biochemfusion.com -Files originally contributed: +Files contributed: +``` src/lib/inchi_api_intf.cpp and .h src/lib/inchi_generator.cpp and .h src/lib/rinchi_utils.cpp and .h @@ -10,6 +17,7 @@ Files originally contributed: src/parsers/generic_line_reader.h src/parsers/mdl_molfile.cpp and .h src/parsers/mdl_molfile_reader.cpp and .h +``` -; End of file listing for Biochemfusion. +; EOF