Merge branch 'master' into add-runtime-version

Author: baylesj

.github/workflows/amalgamate.yml

@@ -0,0 +1,39 @@
+name: Amalgamation
+
+on: [check_run, push, pull_request]
+
+env:
+  FORCE_JAVASCRIPT_ACTIONS_TO_NODE24: true
+
+jobs:
+  amalgamation:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: checkout project
+        uses: actions/checkout@v4
+
+      - name: setup python
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.x'
+
+      - name: run amalgamate script
+        run: |
+          python amalgamate.py
+
+      - name: test compile amalgamated source
+        run: |
+          cat << 'EOF' > test_amalgamation.cpp
+          #include "json/json.h"
+          #include <iostream>
+
+          int main() {
+              Json::Value root;
+              root["hello"] = "world";
+              std::cout << root.toStyledString() << std::endl;
+              return 0;
+          }
+          EOF
+          c++ -std=c++11 -I dist dist/jsoncpp.cpp test_amalgamation.cpp -o test_amalgamation
+          ./test_amalgamation

README.md

@@ -88,10 +88,15 @@ meson wrap install jsoncpp
 
 ### Amalgamated source
 
-> [!NOTE]
-> This approach may be outdated.
+For projects requiring a single-header approach, JsonCpp provides a script to generate an amalgamated source and header file.
+
+You can generate the amalgamated files by running the following Python script from the top-level directory:
+
+```sh
+python3 amalgamate.py
+```
 
-For projects requiring a single-header approach, see the [Wiki entry](https://github.com/open-source-parsers/jsoncpp/wiki/Amalgamated-(Possibly-outdated)).
+This will generate a `dist` directory containing `jsoncpp.cpp`, `json/json.h`, and `json/json-forwards.h`. You can then drop these files directly into your project's source tree and compile `jsoncpp.cpp` alongside your other source files.
 
 ## Documentation
 

src/lib_json/CMakeLists.txt

@@ -7,7 +7,6 @@ include(CheckIncludeFileCXX)
 include(CheckTypeSize)
 include(CheckStructHasMember)
 include(CheckCXXSymbolExists)
-include(CheckCXXSourceCompiles)
 
 check_include_file_cxx(clocale HAVE_CLOCALE)
 check_cxx_symbol_exists(localeconv clocale HAVE_LOCALECONV)
@@ -26,11 +25,6 @@ if(NOT (HAVE_CLOCALE AND HAVE_LCONV_SIZE AND HAVE_DECIMAL_POINT AND HAVE_LOCALEC
     endif()
 endif()
 
-check_cxx_source_compiles(
-    "#include <string_view>
-     int main() { std::string_view sv; return 0; }"
-    JSONCPP_HAS_STRING_VIEW)
-
 set(JSONCPP_INCLUDE_DIR ../../include)
 
 set(PUBLIC_HEADERS

src/lib_json/json_value.cpp

@@ -17,10 +17,6 @@
 #include <sstream>
 #include <utility>
 
-#ifdef JSONCPP_HAS_STRING_VIEW
-#include <string_view>
-#endif
-
 // Provide implementation equivalent of std::snprintf for older _MSC compilers
 #if defined(_MSC_VER) && _MSC_VER < 1900
 #include <stdarg.h>