Moving the 'free' tier license from the non-commerical use license to…

… the LGPL v3.

CMakeLists.txt

@@ -126,9 +126,16 @@ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/config.cmake.in" "${CMAKE_CURRENT_BI
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 add_compile_definitions(HAVE_CONFIG_H=1)
 
-add_library(charisma STATIC charisma.c charisma.h)
+add_library(charisma_static STATIC charisma.c charisma.h)
+set_target_properties(charisma_static PROPERTIES PUBLIC_HEADER "${CMAKE_CURRENT_SOURCE_DIR}/charisma.h")
+target_compile_definitions(charisma_static PUBLIC -DCHARISMA_STATIC)
+
+add_library(charisma SHARED charisma.c charisma.h)
 set_target_properties(charisma PROPERTIES PUBLIC_HEADER "${CMAKE_CURRENT_SOURCE_DIR}/charisma.h")
+set_target_properties(charisma PROPERTIES POSITION_INDEPENDENT_CODE ON)
+target_compile_definitions(charisma PRIVATE -DDLL_EXPORT)
 
+install(TARGETS charisma_static ARCHIVE DESTINATION lib PUBLIC_HEADER DESTINATION include)
 install(TARGETS charisma ARCHIVE DESTINATION lib PUBLIC_HEADER DESTINATION include)
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/CharismaConfig.cmake DESTINATION cmake)
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/CharismaConfigVersion.cmake DESTINATION cmake)

LICENSE

@@ -1,36 +1,165 @@
-RAILGUN NON-COMMERCIAL USE SOFTWARE LICENSE
-
-Please read carefully the following terms and conditions and any accompanying
-documentation before you download and/or use this software and associated
-documentation files (the "Software").
-
-Railgun Labs, LLC ("Railgun") hereby grants you a non-exclusive, non-transferable,
-non-assignable, non-sublicensable free of charge right to use, copy, modify, merge,
-publish and distribute the Software subject to the following conditions:
-
-You shall not through any medium whatsoever commercially exploit the Software or
-use the Software for any commercial purpose. This includes, without limitation,
-incorporation in a commercial product, use in a commercial service, or production
-of other artifacts for commercial purposes.
-
-You understand and agree that Railgun is under no obligation to provide support,
-maintenance services, update services, notices of latent defects, or corrections
-of defects with regard to the Software. Railgun nevertheless reserve the right
-to update, modify, or discontinue the Software at any time.
-
-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.
-
-END OF LICENSE
-
-By using or accessing the Software, you agree to abide by the terms outlined above.
-For commercial licensing opportunities and support services for the Software, please
-visit https://RailgunLabs.com/.
+                   GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+
+  This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
+
+  0. Additional Definitions.
+
+  As used herein, "this License" refers to version 3 of the GNU Lesser
+General Public License, and the "GNU GPL" refers to version 3 of the GNU
+General Public License.
+
+  "The Library" refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
+
+  An "Application" is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed a mode
+of using an interface provided by the Library.
+
+  A "Combined Work" is a work produced by combining or linking an
+Application with the Library.  The particular version of the Library
+with which the Combined Work was made is also called the "Linked
+Version".
+
+  The "Minimal Corresponding Source" for a Combined Work means the
+Corresponding Source for the Combined Work, excluding any source code
+for portions of the Combined Work that, considered in isolation, are
+based on the Application, and not on the Linked Version.
+
+  The "Corresponding Application Code" for a Combined Work means the
+object code and/or source code for the Application, including any data
+and utility programs needed for reproducing the Combined Work from the
+Application, but excluding the System Libraries of the Combined Work.
+
+  1. Exception to Section 3 of the GNU GPL.
+
+  You may convey a covered work under sections 3 and 4 of this License
+without being bound by section 3 of the GNU GPL.
+
+  2. Conveying Modified Versions.
+
+  If you modify a copy of the Library, and, in your modifications, a
+facility refers to a function or data to be supplied by an Application
+that uses the facility (other than as an argument passed when the
+facility is invoked), then you may convey a copy of the modified
+version:
+
+   a) under this License, provided that you make a good faith effort to
+   ensure that, in the event an Application does not supply the
+   function or data, the facility still operates, and performs
+   whatever part of its purpose remains meaningful, or
+
+   b) under the GNU GPL, with none of the additional permissions of
+   this License applicable to that copy.
+
+  3. Object Code Incorporating Material from Library Header Files.
+
+  The object code form of an Application may incorporate material from
+a header file that is part of the Library.  You may convey such object
+code under terms of your choice, provided that, if the incorporated
+material is not limited to numerical parameters, data structure
+layouts and accessors, or small macros, inline functions and templates
+(ten or fewer lines in length), you do both of the following:
+
+   a) Give prominent notice with each copy of the object code that the
+   Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the object code with a copy of the GNU GPL and this license
+   document.
+
+  4. Combined Works.
+
+  You may convey a Combined Work under terms of your choice that,
+taken together, effectively do not restrict modification of the
+portions of the Library contained in the Combined Work and reverse
+engineering for debugging such modifications, if you also do each of
+the following:
+
+   a) Give prominent notice with each copy of the Combined Work that
+   the Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the Combined Work with a copy of the GNU GPL and this license
+   document.
+
+   c) For a Combined Work that displays copyright notices during
+   execution, include the copyright notice for the Library among
+   these notices, as well as a reference directing the user to the
+   copies of the GNU GPL and this license document.
+
+   d) Do one of the following:
+
+       0) Convey the Minimal Corresponding Source under the terms of this
+       License, and the Corresponding Application Code in a form
+       suitable for, and under terms that permit, the user to
+       recombine or relink the Application with a modified version of
+       the Linked Version to produce a modified Combined Work, in the
+       manner specified by section 6 of the GNU GPL for conveying
+       Corresponding Source.
+
+       1) Use a suitable shared library mechanism for linking with the
+       Library.  A suitable mechanism is one that (a) uses at run time
+       a copy of the Library already present on the user's computer
+       system, and (b) will operate properly with a modified version
+       of the Library that is interface-compatible with the Linked
+       Version.
+
+   e) Provide Installation Information, but only if you would otherwise
+   be required to provide such information under section 6 of the
+   GNU GPL, and only to the extent that such information is
+   necessary to install and execute a modified version of the
+   Combined Work produced by recombining or relinking the
+   Application with a modified version of the Linked Version. (If
+   you use option 4d0, the Installation Information must accompany
+   the Minimal Corresponding Source and Corresponding Application
+   Code. If you use option 4d1, you must provide the Installation
+   Information in the manner specified by section 6 of the GNU GPL
+   for conveying Corresponding Source.)
+
+  5. Combined Libraries.
+
+  You may place library facilities that are a work based on the
+Library side by side in a single library together with other library
+facilities that are not Applications and are not covered by this
+License, and convey such a combined library under terms of your
+choice, if you do both of the following:
+
+   a) Accompany the combined library with a copy of the same work based
+   on the Library, uncombined with any other library facilities,
+   conveyed under the terms of this License.
+
+   b) Give prominent notice with the combined library that part of it
+   is a work based on the Library, and explaining where to find the
+   accompanying uncombined form of the same work.
+
+  6. Revised Versions of the GNU Lesser General Public License.
+
+  The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser General Public License from time to time. Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.
+
+  Each version is given a distinguishing version number. If the
+Library as you received it specifies that a certain numbered version
+of the GNU Lesser General Public License "or any later version"
+applies to it, you have the option of following the terms and
+conditions either of that published version or of any later version
+published by the Free Software Foundation. If the Library as you
+received it does not specify a version number of the GNU Lesser
+General Public License, you may choose any version of the GNU Lesser
+General Public License ever published by the Free Software Foundation.
+
+  If the Library as you received it specifies that a proxy can decide
+whether future versions of the GNU Lesser General Public License shall
+apply, that proxy's public statement of acceptance of any version is
+permanent authorization for you to choose that version for the
+Library.

Makefile.am

@@ -4,7 +4,8 @@ EXTRA_DIST = autogen.sh LICENSE CMakeLists.txt CharismaConfig.cmake.in config.cm
 
 AUTOMAKE_OPTIONS = subdir-objects
 
-nodist_include_HEADERS = charisma.h
+include_HEADERS = charisma.h
 
-lib_LIBRARIES = libcharisma.a
-libcharisma_a_SOURCES = charisma.c charisma.h
+lib_LTLIBRARIES = libcharisma.la
+libcharisma_la_SOURCES = charisma.c charisma.h
+libcharisma_la_LDFLAGS = -no-undefined -version-info 0:0:0

charisma.c

@@ -2,10 +2,13 @@
  *  Charisma - Unicode® character encoder and decoder library.
  *  Copyright (c) 2025 Railgun Labs, LLC
  *
- *  This file is part of Charisma, distributed under a non-commercial use software
- *  license. For the full terms see the included LICENSE file. If you did not
- *  receive a LICENSE file or you would like to purchase a commercial license,
- *  contact us at <https://RailgunLabs.com/contact/>.
+ *  This software is dual-licensed: you can redistribute it and/or modify
+ *  it under the terms of the GNU Lesser General Public License version 3
+ *  as published by the Free Software Foundation. For the terms of this
+ *  license, see <https://www.gnu.org/licenses/>.
+ *
+ *  Alternatively, you can license this software under a proprietary
+ *  license, as set out in <https://railgunlabs.com/charisma/license/>.
  */
 
 #include "charisma.h"
@@ -170,7 +173,7 @@ static bool is_valid_scalar(uchar c)
     return is_scalar;
 }
 
-int32_t utf8_decode(const uint8_t *text, int32_t length, int32_t *index, uchar *c) // cppcheck-suppress misra-c2012-8.7
+CHARISMA_API int32_t utf8_decode(const uint8_t *text, int32_t length, int32_t *index, uchar *c) // cppcheck-suppress misra-c2012-8.7
 {
     int32_t ret = UNSET;
 
@@ -441,17 +444,17 @@ static int32_t decode16(const uint16_t *text, int32_t length, int32_t *index, uc
     return ret;
 }
 
-int32_t utf16be_decode(const uint16_t *text, int32_t length, int32_t *index, uchar *c) // cppcheck-suppress misra-c2012-8.7
+CHARISMA_API int32_t utf16be_decode(const uint16_t *text, int32_t length, int32_t *index, uchar *c) // cppcheck-suppress misra-c2012-8.7
 {
     return decode16(text, length, index, c, &swap16_be);
 }
 
-int32_t utf16le_decode(const uint16_t *text, int32_t length, int32_t *index, uchar *c) // cppcheck-suppress misra-c2012-8.7
+CHARISMA_API int32_t utf16le_decode(const uint16_t *text, int32_t length, int32_t *index, uchar *c) // cppcheck-suppress misra-c2012-8.7
 {
     return decode16(text, length, index, c, &swap16_le);
 }
 
-int32_t utf16_decode(const uint16_t *text, int32_t length, int32_t *index, uchar *c) // cppcheck-suppress misra-c2012-8.7
+CHARISMA_API int32_t utf16_decode(const uint16_t *text, int32_t length, int32_t *index, uchar *c) // cppcheck-suppress misra-c2012-8.7
 {
     return decode16(text, length, index, c, &swap16_nop);
 }
@@ -502,22 +505,22 @@ static int32_t decode32(const uint32_t *text, int32_t length, int32_t *index, uc
     return ret;
 }
 
-int32_t utf32be_decode(const uint32_t *text, int32_t length, int32_t *index, uchar *c) // cppcheck-suppress misra-c2012-8.7
+CHARISMA_API int32_t utf32be_decode(const uint32_t *text, int32_t length, int32_t *index, uchar *c) // cppcheck-suppress misra-c2012-8.7
 {
     return decode32(text, length, index, c, &swap32_be);
 }
 
-int32_t utf32le_decode(const uint32_t *text, int32_t length, int32_t *index, uchar *c) // cppcheck-suppress misra-c2012-8.7
+CHARISMA_API int32_t utf32le_decode(const uint32_t *text, int32_t length, int32_t *index, uchar *c) // cppcheck-suppress misra-c2012-8.7
 {
     return decode32(text, length, index, c, &swap32_le);
 }
 
-int32_t utf32_decode(const uint32_t *text, int32_t length, int32_t *index, uchar *c) // cppcheck-suppress misra-c2012-8.7
+CHARISMA_API int32_t utf32_decode(const uint32_t *text, int32_t length, int32_t *index, uchar *c) // cppcheck-suppress misra-c2012-8.7
 {
     return decode32(text, length, index, c, &swap32_nop);
 }
 
-int32_t utf8_encode(uchar c, uint8_t *buf) // cppcheck-suppress misra-c2012-8.7
+CHARISMA_API int32_t utf8_encode(uchar c, uint8_t *buf) // cppcheck-suppress misra-c2012-8.7
 {
     // LCOV_EXCL_START
     assert(buf);
@@ -585,17 +588,17 @@ static int32_t encode16(uchar c, uint16_t *buf, ByteSwap16 swap)
     return ret;
 }
 
-int32_t utf16be_encode(uchar c, uint16_t *buf) // cppcheck-suppress misra-c2012-8.7
+CHARISMA_API int32_t utf16be_encode(uchar c, uint16_t *buf) // cppcheck-suppress misra-c2012-8.7
 {
     return encode16(c, buf, &swap16_be);
 }
 
-int32_t utf16le_encode(uchar c, uint16_t *buf) // cppcheck-suppress misra-c2012-8.7
+CHARISMA_API int32_t utf16le_encode(uchar c, uint16_t *buf) // cppcheck-suppress misra-c2012-8.7
 {
     return encode16(c, buf, &swap16_le);
 }
 
-int32_t utf16_encode(uchar c, uint16_t *buf) // cppcheck-suppress misra-c2012-8.7
+CHARISMA_API int32_t utf16_encode(uchar c, uint16_t *buf) // cppcheck-suppress misra-c2012-8.7
 {
     return encode16(c, buf, &swap16_nop);
 }
@@ -622,17 +625,17 @@ static int32_t encode32(uchar c, uint32_t *buf, ByteSwap32 swap) // cppcheck-sup
     return ret;
 }
 
-int32_t utf32be_encode(uchar c, uint32_t *buf) // cppcheck-suppress misra-c2012-8.7
+CHARISMA_API int32_t utf32be_encode(uchar c, uint32_t *buf) // cppcheck-suppress misra-c2012-8.7
 {
     return encode32(c, buf, &swap32_be);
 }
 
-int32_t utf32le_encode(uchar c, uint32_t *buf) // cppcheck-suppress misra-c2012-8.7
+CHARISMA_API int32_t utf32le_encode(uchar c, uint32_t *buf) // cppcheck-suppress misra-c2012-8.7
 {
     return encode32(c, buf, &swap32_le);
 }
 
-int32_t utf32_encode(uchar c, uint32_t *buf) // cppcheck-suppress misra-c2012-8.7
+CHARISMA_API int32_t utf32_encode(uchar c, uint32_t *buf) // cppcheck-suppress misra-c2012-8.7
 {
     return encode32(c, buf, &swap32_nop);
 }