Move src/zxcvbn/ to src/thirdparty/zxcvbn

keepassxreboot · May 20, 2024 · 7627cb5 · 7627cb5
1 parent 696ba36
commit 7627cb5
Show file tree

Hide file tree

Showing 8 changed files with 3 additions and 5 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -467,7 +467,7 @@ if(WITH_COVERAGE)
     append_coverage_compiler_flags()
 
     set(COVERAGE_EXCLUDES
-            "'^(.+/)?(thirdparty|zxcvbn)/.*'"
+            "'^(.+/)?thirdparty/.*'"
             "'^(.+/)?main\\.cpp$$'"
             "'^(.+/)?cli/keepassxc-cli\\.cpp$$'"
             "'^(.+/)?proxy/keepassxc-proxy\\.cpp$$'")
@@ -615,7 +615,7 @@ include_directories(SYSTEM ${ZLIB_INCLUDE_DIR})
 
 find_library(ZXCVBN_LIBRARIES zxcvbn)
 if(NOT ZXCVBN_LIBRARIES)
-    add_subdirectory(src/zxcvbn)
+    add_subdirectory(src/thirdparty/zxcvbn)
     set(ZXCVBN_LIBRARIES zxcvbn)
 endif(NOT ZXCVBN_LIBRARIES)
 

diff --git a/COPYING b/COPYING
@@ -249,7 +249,7 @@ Files: src/streams/qtiocompressor.*
 Copyright: 2009-2012, Nokia Corporation and/or its subsidiary(-ies)
 License: LGPL-2.1 or GPL-3
 
-Files: src/zxcvbn/zxcvbn.*
+Files: src/thirdparty/zxcvbn/zxcvbn.*
 Copyright: 2015-2017, Tony Evans
 License: MIT
 

diff --git a/cmake/CLangFormat.cmake b/cmake/CLangFormat.cmake
@@ -16,7 +16,6 @@
 set(EXCLUDED_DIRS
         # third-party directories
         src/thirdparty
-        src/zxcvbn
         # objective-c directories
         src/quickunlock/touchid
         src/autotype/mac

diff --git a/codecov.yaml b/codecov.yaml
@@ -23,6 +23,5 @@ fixes:
 ignore:
   - "src/gui/styles/**"
   - "src/thirdparty/**"
-  - "src/zxcvbn/**"
 comment:
   require_changes: true
diff --git a/src/zxcvbn/CMakeLists.txt → src/thirdparty/zxcvbn/CMakeLists.txt b/src/zxcvbn/CMakeLists.txt → src/thirdparty/zxcvbn/CMakeLists.txt
diff --git a/src/zxcvbn/dict-src.h → src/thirdparty/zxcvbn/dict-src.h b/src/zxcvbn/dict-src.h → src/thirdparty/zxcvbn/dict-src.h
diff --git a/src/zxcvbn/zxcvbn.c → src/thirdparty/zxcvbn/zxcvbn.c b/src/zxcvbn/zxcvbn.c → src/thirdparty/zxcvbn/zxcvbn.c
diff --git a/src/zxcvbn/zxcvbn.h → src/thirdparty/zxcvbn/zxcvbn.h b/src/zxcvbn/zxcvbn.h → src/thirdparty/zxcvbn/zxcvbn.h