[chartjs-2] rename chartjs to chartjs-2

borrowed/CMakeLists.txt

@@ -1,12 +1,12 @@
 add_subdirectory(libc)
 add_subdirectory(goffice)
-add_subdirectory(chartjs)
+add_subdirectory(chartjs-2)
 add_subdirectory(guile-json)
 
 set_local_dist(borrowed_DIST_local jenny/jenny.c CMakeLists.txt README)
 set(borrowed_DIST
     ${borrowed_DIST_local}
-    ${chartjs_DIST}
+    ${chartjs-2_DIST}
     ${libc_DIST}
     ${guile-json_DIST}
     ${goffice_DIST}

borrowed/chartjs-2/CMakeLists.txt

@@ -0,0 +1,15 @@
+
+set(chartjs-2_DATA
+  Chart.bundle.min.js
+  Chart.bundle.js
+)
+
+file(GLOB_RECURSE chartjs-2_NOINST_DATA
+    RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+    samples Chart*)
+
+list(REMOVE_ITEM chartjs-2_NOINST_DATA ${chartjs-2_DATA})
+
+install (FILES ${chartjs-2_DATA} DESTINATION  ${CMAKE_INSTALL_DATADIR}/gnucash/chartjs-2)
+
+set_dist_list(chartjs-2_DIST CMakeLists.txt ${chartjs-2_DATA} ${chartjs-2_NOINST_DATA})

borrowed/chartjs/CMakeLists.txt

@@ -1,15 +0,0 @@
-
-set(chartjs_DATA
-  Chart.bundle.min.js
-  Chart.bundle.js
-)
-
-file(GLOB_RECURSE chartjs_NOINST_DATA
-    RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
-    samples Chart*)
-
-list(REMOVE_ITEM chartjs_NOINST_DATA ${chartjs_DATA})
-
-install (FILES ${chartjs_DATA} DESTINATION  ${CMAKE_INSTALL_DATADIR}/gnucash/chartjs)
-
-set_dist_list(chartjs_DIST CMakeLists.txt ${chartjs_DATA} ${chartjs_NOINST_DATA})

gnucash/report/html-chart.scm

@@ -460,7 +460,7 @@ document.getElementById(chartid).onclick = function(evt) {
          ;; clashing on multi-column reports
          (id (symbol->string (gensym "chart"))))
 
-    (push (gnc:html-js-include "chartjs/Chart.bundle.min.js"))
+    (push (gnc:html-js-include "chartjs-2/Chart.bundle.min.js"))
 
     ;; the following hidden h3 is used to query style and copy onto chartjs
     (push "<h3 style='display:none'></h3>")

gnucash/report/test/test-html-utilities-srfi64.scm

@@ -25,7 +25,7 @@
   (test-begin "test-html-includes")
 
   (test-equal "windows path into rfc3986 uri"
-    "file:///C:/Program%20Files%20%28x86%29/gnucash/share/gnucash/chartjs/Chart.bundle.min.js"
-    (make-uri "C:\\Program Files (x86)\\gnucash/share\\gnucash\\chartjs/Chart.bundle.min.js"))
+    "file:///C:/Program%20Files%20%28x86%29/gnucash/share/gnucash/chartjs-2/Chart.bundle.min.js"
+    (make-uri "C:\\Program Files (x86)\\gnucash/share\\gnucash\\chartjs-2/Chart.bundle.min.js"))
 
   (test-end "test-html-includes"))