Move library include files to the include/upa directory.

upa-url · Aug 31, 2023 · c0eda16 · c0eda16
1 parent 1be4642
commit c0eda16
Show file tree

Hide file tree

Showing 41 changed files with 34 additions and 38 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -80,7 +80,7 @@ endif()
 
 include_directories(
   deps
-  src)
+  include)
 
 if (URL_USE_LIBS)
   find_package(ICU REQUIRED COMPONENTS i18n uc)

diff --git a/examples/urlparse.cpp b/examples/urlparse.cpp
@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 //
 
-#include "url.h"
+#include "upa/url.h"
 #include <fstream>
 #include <iostream>
 // json

diff --git a/src/buffer.h → include/upa/buffer.h b/src/buffer.h → include/upa/buffer.h
diff --git a/src/config.h → include/upa/config.h b/src/config.h → include/upa/config.h
diff --git a/src/str_arg.h → include/upa/str_arg.h b/src/str_arg.h → include/upa/str_arg.h
diff --git a/src/str_view.h → include/upa/str_view.h b/src/str_view.h → include/upa/str_view.h
diff --git a/src/url.h → include/upa/url.h b/src/url.h → include/upa/url.h
diff --git a/src/url_host.h → include/upa/url_host.h b/src/url_host.h → include/upa/url_host.h
diff --git a/src/url_idna.h → include/upa/url_idna.h b/src/url_idna.h → include/upa/url_idna.h
diff --git a/src/url_ip.h → include/upa/url_ip.h b/src/url_ip.h → include/upa/url_ip.h
diff --git a/src/url_percent_encode.h → include/upa/url_percent_encode.h b/src/url_percent_encode.h → include/upa/url_percent_encode.h
diff --git a/src/url_result.h → include/upa/url_result.h b/src/url_result.h → include/upa/url_result.h
diff --git a/src/url_search_params.h → include/upa/url_search_params.h b/src/url_search_params.h → include/upa/url_search_params.h
diff --git a/src/url_utf.h → include/upa/url_utf.h b/src/url_utf.h → include/upa/url_utf.h
diff --git a/src/util.h → include/upa/util.h b/src/util.h → include/upa/util.h
diff --git a/src/url.cpp b/src/url.cpp
@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 //
 
-#include "url.h"
+#include "upa/url.h"
 
 namespace upa {
 namespace detail {

diff --git a/src/url_idna.cpp b/src/url_idna.cpp
@@ -7,8 +7,8 @@
 // Copyright 2013 The Chromium Authors. All rights reserved.
 //
 
-#include "url_idna.h"
-#include "util.h"
+#include "upa/url_idna.h"
+#include "upa/util.h"
 // ICU
 #include "unicode/uidna.h"
 #if (U_ICU_VERSION_MAJOR_NUM) >= 59

diff --git a/src/url_ip.cpp b/src/url_ip.cpp
@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 //
 
-#include "url_ip.h"
+#include "upa/url_ip.h"
 
 namespace upa {
 

diff --git a/src/url_percent_encode.cpp b/src/url_percent_encode.cpp
@@ -7,7 +7,7 @@
 // Copyright 2013 The Chromium Authors. All rights reserved.
 //
 
-#include "url_percent_encode.h"
+#include "upa/url_percent_encode.h"
 
 namespace upa { // NOLINT(modernize-concat-nested-namespaces)
 

diff --git a/src/url_search_params.cpp b/src/url_search_params.cpp
@@ -3,8 +3,7 @@
 // found in the LICENSE file.
 //
 
-#include "url.h"
-#include "url_search_params.h"
+#include "upa/url.h"
 
 
 namespace upa {

diff --git a/src/url_utf.cpp b/src/url_utf.cpp
@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 //
 
-#include "url_utf.h"
+#include "upa/url_utf.h"
 #include <cassert>
 
 namespace upa {

diff --git a/test/fuzz-url.cpp b/test/fuzz-url.cpp
@@ -5,7 +5,7 @@
 
 // Relative URL parsing fuzzer
 
-#include "url.h"
+#include "upa/url.h"
 #include <cassert>
 #include <type_traits>
 

diff --git a/test/test-buffer.cpp b/test/test-buffer.cpp
@@ -3,9 +3,9 @@
 // found in the LICENSE file.
 //
 
-#include <string>
 #include "doctest-main.h"
-#include "buffer.h" // must be included after doctest.h
+#include "upa/buffer.h" // must be included after doctest.h
+#include <string>
 
 using str = std::char_traits<char>;
 

diff --git a/test/test-ipv4.cpp b/test/test-ipv4.cpp
@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 //
 
-#include "url.h"
+#include "upa/url.h"
 #include "doctest-main.h"
 
 

diff --git a/test/test-ipv6.cpp b/test/test-ipv6.cpp
@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 //
 
-#include "url.h"
+#include "upa/url.h"
 #include "doctest-main.h"
 #include <algorithm>
 #include <cassert>

diff --git a/test/test-str_arg.cpp b/test/test-str_arg.cpp
@@ -7,7 +7,7 @@
 // NOTE: To pass test this file must just compile without errors.
 //
 
-#include "str_arg.h"
+#include "upa/str_arg.h"
 //#include "doctest-main.h"
 
 

diff --git a/test/test-url-port.cpp b/test/test-url-port.cpp
@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 //
 
-#include "url.h"
+#include "upa/url.h"
 #include "doctest-main.h"
 
 

diff --git a/test/test-url-setters.cpp b/test/test-url-setters.cpp
@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 //
 
-#include "url.h"
+#include "upa/url.h"
 #include "doctest-main.h"
 
 

diff --git a/test/test-url.cpp b/test/test-url.cpp
@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 //
 
-#include "url.h"
+#include "upa/url.h"
 #include "doctest-main.h"
 #include "test-utils.h"
 

diff --git a/test/test-url_host.cpp b/test/test-url_host.cpp
@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 //
 
-#include "url_host.h"
+#include "upa/url_host.h"
 #include "doctest-main.h"
 
 

diff --git a/test/test-url_percent_encode.cpp b/test/test-url_percent_encode.cpp
@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 //
 
-#include "url_percent_encode.h"
+#include "upa/url_percent_encode.h"
 #include "doctest-main.h"
 #include "test-utils.h"
 

diff --git a/test/test-url_search_params.cpp b/test/test-url_search_params.cpp
@@ -3,8 +3,7 @@
 // found in the LICENSE file.
 //
 
-#include "url.h"
-#include "url_search_params.h"
+#include "upa/url.h"
 #include "doctest-main.h"
 #include "test-utils.h"
 #include <map>

diff --git a/test/test-utf.cpp b/test/test-utf.cpp
@@ -3,8 +3,8 @@
 // found in the LICENSE file.
 //
 
-#include "url_utf.h"
-#include "str_arg.h"
+#include "upa/str_arg.h"
+#include "upa/url_utf.h"
 #include "doctest-main.h"
 
 

diff --git a/test/test-util.cpp b/test/test-util.cpp
@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 //
 
-#include "util.h"
+#include "upa/util.h"
 #include "doctest-main.h"
 
 

diff --git a/test/test-utils.h b/test/test-utils.h
@@ -6,16 +6,16 @@
 #ifndef UPA_TEST_UTILS_H
 #define UPA_TEST_UTILS_H
 
-#include "config.h"
+#include "upa/config.h"
 #include <algorithm>
 #include <initializer_list>
 #include <iomanip>
-#include <utility> // std::pair
-#include <string>
 #include <sstream>
+#include <string>
 #ifdef __cpp_char8_t
 # include <string_view>
 #endif
+#include <utility> // std::pair
 
 
 #ifdef __cpp_char8_t

diff --git a/test/url_cleanup.h b/test/url_cleanup.h
@@ -7,7 +7,7 @@
 #define UPA_URL_CLEANUP_H
 
 // For ICU cleanup
-#include "url_idna.h"
+#include "upa/url_idna.h"
 #include "unicode/uclean.h"
 
 namespace upa {

diff --git a/test/wpt-url-setters-stripping.cpp b/test/wpt-url-setters-stripping.cpp
@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 //
 
-#include "url.h"
+#include "upa/url.h"
 #include "doctest-main.h"
 #include "test-utils.h"
 #include <algorithm>

diff --git a/test/wpt-url.cpp b/test/wpt-url.cpp
@@ -7,10 +7,10 @@
 // url library tests
 //
 
-#include "url.h"
-#include "url_cleanup.h"
+#include "upa/url.h"
 #include "ddt/DataDrivenTest.hpp"
 #include "test-utils.h"
+#include "url_cleanup.h"
 
 #include "picojson_fffd.h"
 

diff --git a/test/wpt-url_search_params.cpp b/test/wpt-url_search_params.cpp
@@ -3,8 +3,7 @@
 // found in the LICENSE file.
 //
 
-#include "url.h"
-#include "url_search_params.h"
+#include "upa/url.h"
 #include "doctest-main.h"
 #include "test-utils.h"
 #include <map>

diff --git a/test/wpt-urlencoded-parser.cpp b/test/wpt-urlencoded-parser.cpp
@@ -3,8 +3,7 @@
 // found in the LICENSE file.
 //
 
-#include "url.h"
-#include "url_search_params.h"
+#include "upa/url.h"
 #include "url_cleanup.h"
 
 // https://github.com/kazuho/picojson

diff --git a/tools/dumpCharBitSets.cpp b/tools/dumpCharBitSets.cpp
@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 //
 
-#include "url_percent_encode.h"
+#include "upa/url_percent_encode.h"
 #include <iomanip>
 #include <iostream>