Fixed #define names for the C code (meson problem)

Author: Alan-R

cma/cmainit.py

@@ -42,7 +42,7 @@
 from hbring import HbRing
 from transaction import NetTransaction
 
-NEOVERSION = "3.5.12"
+NEOVERSION = "3.5.18"
 NEOEDITION = "enterprise"
 
 
@@ -506,16 +506,17 @@ def delete_all(self, json=None):
         """
         qstring = "match (n) optional match (n)-[r]-() delete n,r"
 
-        # print("qstring is %s" % qstring, file=stderr)
+        print("qstring is %s" % qstring, file=stderr)
         start =time.time()
-        # print("delete_all: self.db is %s" % self.db, file=stderr)
+        print("delete_all: self.db is %s" % self.db, file=stderr)
         while True:
             try:
                 result = self.db.run(qstring)
                 # print(f"Waited {time.time()-start:.1f} seconds for neo4j to clean out database.")
                 break
             except NeoExceptions.ServiceUnavailable as oops:
-                pass
+                print("Waiting for Neo4j to come up...")
+                time.sleep(10)
         if CMAdb.debug:
             CMAdb.log.debug(
                 "Cypher query to delete all relationships"

cma/neo4j.py

@@ -121,7 +121,7 @@ class NeoDockerServer(NeoServer):
     """
 
     edition_map = {"community": "", "enterprise": "-enterprise"}
-    good_versions = {"3"}
+    good_versions = {"3", "4"}
 
     initial_password_command = ["neo4j-admin", "set-initial-password"]
 
@@ -175,6 +175,7 @@ def __init__(
                 "yes" if accept_license else "no"
             )
             assert accept_license
+        print(f"DIR: {dir(self)}")
 
         self.host = host
         self.root_directory = root_directory
@@ -390,7 +391,7 @@ def is_password_set(self):
         :return:bool: True if password already set
         """
         name, _, extra = self._getpass()
-        extra = extra.strip()
+        extra = extra.strip() if extra else ""
         return name is not None and not extra
 
     def _unlink_auth_info(self):
@@ -463,7 +464,7 @@ def stupid_docker_test():
         #  print(NeoDockerServer())
         #  print(NeoDockerServer(edition="enterprise", accept_license=True))
         # print(NeoDockerServer(edition="enterprise", version="3.5.0", accept_license=True))
-        neo4j = NeoDockerServer(edition="enterprise", version="3.5.6", accept_license=True)
+        neo4j = NeoDockerServer(edition="enterprise", version="4.1.1", accept_license=True)
         print("Now RUNNING:", neo4j)
         neo4j.start(restart_if_running=False)
         print("Is Neo4j running?", neo4j.is_running())

docker/nanoprobe/meson.build

@@ -52,6 +52,8 @@ static_deps = [
 
 config_data = configuration_data({
     # Things the C code needs
+    'LICENSE_SHORT': 'GPLv3+',
+    'LICENSE_LONG': 'GNU Public License Version 3 or later',
     'PUBKEYSUFFIX': '.pub',
     'PRIVATEKEYSUFFIX': '.secret',
     'CMAADDR': '224.0.2.5:1984',

include/projectcommon.h.in

@@ -93,18 +93,18 @@
 
 
 #define	DIRDELIM		"@DIRDELIM@"
-#define	DISCOVERY_DIR		"@DISCOVERYINSTALL@"
-#define	BPINSTALL_DIR		"@BPINSTALL@"
-#define	QUERYINSTALL_DIR	"@QUERYINSTALL@"
-#define	MONRULEINSTALL_DIR	"@MONRULEINSTALL@"
+#define	DISCOVERY_DIR		"@DISCOVERY_DIR@"
+#define	BPINSTALL_DIR		"@BPINSTALL_DIR@"
+#define	QUERYINSTALL_DIR	"@QUERYINSTALL_DIR@"
+#define	MONRULEINSTALL_DIR	"@MONRULEINSTALL_DIR@"
 #define	NOTIFICATION_SCRIPT_DIR "@NOTIFICATION_SCRIPT_DIR@"
 #define	CRYPTKEYDIR		"@CRYPTKEYDIR@"
 #define	NEO4JCREDFILENAME	"@NEO4JCREDFILENAME@"
 #define	PUBKEYSUFFIX		"@PUBKEYSUFFIX@"
 #define	PRIVATEKEYSUFFIX	"@PRIVATEKEYSUFFIX@"
 #define	CMAADDR			"@CMAADDR@"
 #define	NANOLISTENADDR		"@NANOLISTENADDR@"
-#define	VERSION_STRING		"@PROJVERS@"
+#define	VERSION_STRING		"@VERSION_STRING@"
 #define	SHORT_LICENSE_STRING	"@LICENSE_SHORT@"
 #define	LONG_LICENSE_STRING	"@LICENSE_LONG@"
 #define	CMAINITFILE		"@CMAINITFILE@"