Change rest of JSONCPP_VERSION_* instances

Author: baylesj

CMakeLists.txt

@@ -68,7 +68,7 @@ project(jsoncpp
         # 1. ./meson.build
         # 2. ./include/json/version.h
         # 3. ./CMakeLists.txt
-        # IMPORTANT: also update the PROJECT_SOVERSION!!
+        # IMPORTANT: also bump the PROJECT_SOVERSION by 1!!!
         VERSION 1.9.4 # <major>[.<minor>[.<patch>[.<tweak>]]]
         LANGUAGES CXX)
 

doc/doxyfile.in

@@ -38,7 +38,7 @@ PROJECT_NAME           = "JsonCpp"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = %JSONCPP_VERSION%
+PROJECT_NUMBER         = %PROJECT_VERSION%
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a
@@ -1215,7 +1215,7 @@ GENERATE_HTMLHELP      = %HTML_HELP%
 # written to the html output directory.
 # This tag requires that the tag GENERATE_HTMLHELP is set to YES.
 
-CHM_FILE               = jsoncpp-%JSONCPP_VERSION%.chm
+CHM_FILE               = jsoncpp-%PROJECT_VERSION%.chm
 
 # The HHC_LOCATION tag can be used to specify the location (absolute path
 # including file name) of the HTML help compiler ( hhc.exe). If non-empty

doc/web_doxyfile.in

@@ -38,7 +38,7 @@ PROJECT_NAME           = "JsonCpp"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = %JSONCPP_VERSION%
+PROJECT_NUMBER         = %PROJECT_VERSION%
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a
@@ -1215,7 +1215,7 @@ GENERATE_HTMLHELP      = %HTML_HELP%
 # written to the html output directory.
 # This tag requires that the tag GENERATE_HTMLHELP is set to YES.
 
-CHM_FILE               = jsoncpp-%JSONCPP_VERSION%.chm
+CHM_FILE               = jsoncpp-%PROJECT_VERSION%.chm
 
 # The HHC_LOCATION tag can be used to specify the location (absolute path
 # including file name) of the HTML help compiler ( hhc.exe). If non-empty

doxybuild.py

@@ -46,7 +46,7 @@ def do_subst_in_file(targetfile, sourcefile, dict):
     with open(sourcefile, 'r') as f:
         contents = f.read()
     for (k,v) in list(dict.items()):
-        v = v.replace('\\','\\\\') 
+        v = v.replace('\\','\\\\')
         contents = re.sub(k, v, contents)
     with open(targetfile, 'w') as f:
         f.write(contents)
@@ -113,7 +113,7 @@ def build_doc(options,  make_release=False):
     def yesno(bool):
         return bool and 'YES' or 'NO'
     subst_keys = {
-        '%JSONCPP_VERSION%': version,
+        '%PROJECT_VERSION%': version,
         '%DOC_TOPDIR%': '',
         '%TOPDIR%': top_dir,
         '%HTML_OUTPUT%': os.path.join('..', output_dir, html_output_dirname),
@@ -158,7 +158,7 @@ def main():
     Generates doxygen documentation in build/doxygen.
     Optionally makes a tarball of the documentation to dist/.
 
-    Must be started in the project top directory.    
+    Must be started in the project top directory.
     """
     from optparse import OptionParser
     parser = OptionParser(usage=usage)

include/json/version.h

@@ -7,16 +7,17 @@
 // 1. /meson.build
 // 2. /include/json/version.h
 // 3. /CMakeLists.txt
-// IMPORTANT: also update the SOVERSION!!
+// IMPORTANT: update both the PROJECT_VERSION_STRING as well as the
+//            major, minor, and patch fields as appropriate here.
 
-#define JSONCPP_VERSION_STRING "1.9.4"
-#define JSONCPP_VERSION_MAJOR 1
-#define JSONCPP_VERSION_MINOR 9
-#define JSONCPP_VERSION_PATCH 4
-#define JSONCPP_VERSION_QUALIFIER
-#define JSONCPP_VERSION_HEXA                                                   \
-  ((JSONCPP_VERSION_MAJOR << 24) | (JSONCPP_VERSION_MINOR << 16) |             \
-   (JSONCPP_VERSION_PATCH << 8))
+#define PROJECT_VERSION_STRING "1.9.4"
+#define PROJECT_VERSION_MAJOR 1
+#define PROJECT_VERSION_MINOR 9
+#define PROJECT_VERSION_PATCH 4
+#define PROJECT_VERSION_QUALIFIER
+#define PROJECT_VERSION_HEXA                                                   \
+  ((PROJECT_VERSION_MAJOR << 24) | (PROJECT_VERSION_MINOR << 16) |             \
+   (PROJECT_VERSION_PATCH << 8))
 
 #ifdef JSONCPP_USING_SECURE_MEMORY
 #undef JSONCPP_USING_SECURE_MEMORY

src/test_lib_json/main.cpp

@@ -3920,9 +3920,9 @@ class VersionTest : public JsonTest::TestCase {};
 
 JSONTEST_FIXTURE_LOCAL(VersionTest, VersionNumbersMatch) {
   std::ostringstream vstr;
-  vstr << JSONCPP_VERSION_MAJOR << '.' << JSONCPP_VERSION_MINOR << '.'
-       << JSONCPP_VERSION_PATCH;
-  JSONTEST_ASSERT_EQUAL(vstr.str(), std::string(JSONCPP_VERSION_STRING));
+  vstr << PROJECT_VERSION_MAJOR << '.' << PROJECT_VERSION_MINOR << '.'
+       << PROJECT_VERSION_PATCH;
+  JSONTEST_ASSERT_EQUAL(vstr.str(), std::string(PROJECT_VERSION_STRING));
 }
 
 #if defined(__GNUC__)