Fix platform issues with md5sum utility (#4077)

kuzudb · Aug 14, 2024 · ed6d847 · ed6d847
1 parent c76e05c
commit ed6d847
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 11 deletions.
diff --git a/.github/workflows/ci-workflow.yml b/.github/workflows/ci-workflow.yml
@@ -461,7 +461,7 @@ jobs:
 
       - name: Ensure generated grammar files are up to date
         run: |
-          cat src/antlr4/keywords.txt src/antlr4/Cypher.g4 | md5sum > tmphashfile
+          python3 scripts/antlr4/hash.py src/antlr4/keywords.txt src/antlr4/Cypher.g4 > tmphashfile
           cmp tmphashfile scripts/antlr4/hash.md5
           rm tmphashfile
 

diff --git a/scripts/antlr4/generate_grammar.cmake b/scripts/antlr4/generate_grammar.cmake
@@ -2,18 +2,13 @@
 # This is to make sure clean build from source needn't have Java installed.
 # We can't use checksums because of windows line ending normalization.
 
+find_package(Python3 REQUIRED COMPONENTS Interpreter)
 
 
 file(READ hash.md5 OLDHASH)
-execute_process(
-    COMMAND cat ${ROOT_DIR}/src/antlr4/keywords.txt ${ROOT_DIR}/src/antlr4/Cypher.g4
-    COMMAND md5sum OUTPUT_VARIABLE NEWHASH
-    RESULTS_VARIABLE RESVAR
-    ERROR_VARIABLE ERRVAR)
 
-if(NOT "${RESVAR}" STREQUAL "0 0")
-    message(DEBUG "${ERRVAR}")
-endif()
+execute_process(
+    COMMAND ${Python3_EXECUTABLE} hash.py ${ROOT_DIR}/src/antlr4/keywords.txt ${ROOT_DIR}/src/antlr4/Cypher.g4 OUTPUT_VARIABLE NEWHASH)
 
 if("${OLDHASH}" STREQUAL "${NEWHASH}")
     message(DEBUG " Not regenerating grammar files as Cypher.g4 and keywords.txt is unchanged.")
@@ -35,7 +30,6 @@ endif()
 file(MAKE_DIRECTORY generated)
 
 find_package(Java REQUIRED)
-find_package(Python3 REQUIRED COMPONENTS Interpreter)
 
 # use script to generate final Cypher.g4 file and update tools/shell/include/keywords.h
 execute_process(COMMAND ${Python3_EXECUTABLE} keywordhandler.py ${ROOT_DIR}/src/antlr4/Cypher.g4 ${ROOT_DIR}/src/antlr4/keywords.txt Cypher.g4 ${ROOT_DIR}/tools/shell/include/keywords.h)

diff --git a/scripts/antlr4/hash.md5 b/scripts/antlr4/hash.md5
@@ -1 +1 @@
-e9d15715485e7edcd27e1374e1ef57cc  -
+e9d15715485e7edcd27e1374e1ef57cc
diff --git a/scripts/antlr4/hash.py b/scripts/antlr4/hash.py
@@ -0,0 +1,2 @@
+import hashlib, sys
+print(hashlib.md5((''.join(open(sys.argv[1])) + ''.join(open(sys.argv[2]))).encode('utf-8')).hexdigest())
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		e9d15715485e7edcd27e1374e1ef57cc -
		e9d15715485e7edcd27e1374e1ef57cc
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		import hashlib, sys
		print(hashlib.md5((''.join(open(sys.argv[1])) + ''.join(open(sys.argv[2]))).encode('utf-8')).hexdigest())