Change dir structure

hajimes · Jan 6, 2024 · a8ff289 · a8ff289
1 parent caf404e
commit a8ff289
Show file tree

Hide file tree

Showing 10 changed files with 8 additions and 9 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "src/mmh3/_mmh3/smhasher"]
-	path = src/mmh3/_mmh3/smhasher
+	path = util/smhasher
 	url = https://github.com/aappleby/smhasher.git
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -2,7 +2,6 @@ include src/mmh3/*.c
 include src/mmh3/*.h
 include src/mmh3/*.pyi
 include src/mmh3/py.typed
-include src/mmh3/_mmh3/*
 include README.md
 include LICENSE
 include CHANGELOG.md

diff --git a/setup.py b/setup.py
@@ -1,7 +1,7 @@
 from setuptools import Extension, setup
 
 mmh3module = Extension(
-    "mmh3", sources=["./src/mmh3/mmh3module.c", "./src/mmh3/_mmh3/murmurhash3.c"]
+    "mmh3", sources=["./src/mmh3/mmh3module.c", "./src/mmh3/murmurhash3.c"]
 )
 
 setup(

diff --git a/src/mmh3/mmh3module.c b/src/mmh3/mmh3module.c
@@ -11,7 +11,7 @@
 #include <byteswap.h>
 #endif
 
-#include "_mmh3/murmurhash3.h"
+#include "murmurhash3.h"
 #include "hashlib.h"
 
 #if defined(_MSC_VER)

diff --git a/src/mmh3/_mmh3/murmurhash3.c → src/mmh3/murmurhash3.c b/src/mmh3/_mmh3/murmurhash3.c → src/mmh3/murmurhash3.c
diff --git a/src/mmh3/_mmh3/murmurhash3.h → src/mmh3/murmurhash3.h b/src/mmh3/_mmh3/murmurhash3.h → src/mmh3/murmurhash3.h
diff --git a/src/mmh3/_mmh3/FILE_HEADER → util/FILE_HEADER b/src/mmh3/_mmh3/FILE_HEADER → util/FILE_HEADER
diff --git a/src/mmh3/_mmh3/README.md → util/README.md b/src/mmh3/_mmh3/README.md → util/README.md
@@ -5,7 +5,7 @@ This directory contains C files that were generated from the
 
 ## Updating _mmh3
 
-Use the `refresh.py` script in this directory to generate PEP 7-compliant C code from Appleby's original SMHasher project, instead of editing `_mmh3` files manually. Add transformation code to the `refresh.py` script to perform further edits.
+Use the `refresh.py` script **within this directory** to generate PEP 7-compliant C code from Appleby's original SMHasher project, instead of editing `_mmh3` files manually. Add transformation code to the `refresh.py` script to perform further edits.
 
 After file generation, use `clang-format` (with `.clang-format` in the top directory of the `mmh3` project) to format the generated code.
 
@@ -17,5 +17,5 @@ After file generation, use `clang-format` (with `.clang-format` in the top direc
 
 ## Generated files
 
-1. `./murmurhash3.c`
-1. `./murmurhash3.h`
+1. `../src/mmh3/murmurhash3.c`
+1. `../src/mmh3/murmurhash3.h`
diff --git a/src/mmh3/_mmh3/refresh.py → util/refresh.py b/src/mmh3/_mmh3/refresh.py → util/refresh.py
@@ -640,8 +640,8 @@ def lowercase_function_names(subcode: str) -> str:
     new_header_name = "murmurhash3.h"
     file_header_name = "FILE_HEADER"
 
-    new_source_path = os.path.join(dir_path, new_source_name)
-    new_header_path = os.path.join(dir_path, new_header_name)
+    new_source_path = os.path.join(dir_path, "../src/mmh3", new_source_name)
+    new_header_path = os.path.join(dir_path, "../src/mmh3", new_header_name)
     file_header_path = os.path.join(dir_path, file_header_name)
 
     with open(original_source_path, "r") as source_file, open(

diff --git a/src/mmh3/_mmh3/smhasher → util/smhasher b/src/mmh3/_mmh3/smhasher → util/smhasher