From 5388bd0306716b3acaf0a2e4e451de1b1c17fb50 Mon Sep 17 00:00:00 2001
From: Victor Gaydov <victor@enise.org>
Date: Fri, 10 Sep 2021 13:12:21 +0300
Subject: [PATCH] Refine 3rdparty/ layout

---
 .gitmodules                            | 4 ++--
 3rdparty/SConscript                    | 2 +-
 3rdparty/_distfiles                    | 1 +
 3rdparty/distfiles                     | 1 -
 3rdparty/{vendor => }/hedley/COPYING   | 0
 3rdparty/{vendor => }/hedley/NEWS      | 0
 3rdparty/{vendor => }/hedley/README.md | 0
 3rdparty/{vendor => }/hedley/hedley.h  | 0
 scripts/docs/authors.sh                | 2 +-
 scripts/scons/thirdparty.py            | 2 +-
 10 files changed, 6 insertions(+), 6 deletions(-)
 create mode 160000 3rdparty/_distfiles
 delete mode 160000 3rdparty/distfiles
 rename 3rdparty/{vendor => }/hedley/COPYING (100%)
 rename 3rdparty/{vendor => }/hedley/NEWS (100%)
 rename 3rdparty/{vendor => }/hedley/README.md (100%)
 rename 3rdparty/{vendor => }/hedley/hedley.h (100%)

diff --git a/.gitmodules b/.gitmodules
index 7848336bd..2976816c8 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
-[submodule "3rdparty/distfiles"]
-	path = 3rdparty/distfiles
+[submodule "3rdparty/_distfiles"]
+	path = 3rdparty/_distfiles
 	url = https://github.com/roc-streaming/distfiles.git
diff --git a/3rdparty/SConscript b/3rdparty/SConscript
index eeffdd861..ae5843c45 100644
--- a/3rdparty/SConscript
+++ b/3rdparty/SConscript
@@ -76,7 +76,7 @@ if 'all' in download_dependencies:
 system_dependencies = external_dependencies - download_dependencies
 
 if 'hedley' in vendored_dependencies:
-    env.Append(CPPPATH=['#3rdparty/vendor/hedley'])
+    env.Append(CPPPATH=['#3rdparty/hedley'])
 
 if 'libuv' in system_dependencies:
     conf = Configure(env, custom_tests=env.CustomTests)
diff --git a/3rdparty/_distfiles b/3rdparty/_distfiles
new file mode 160000
index 000000000..34cc7ce58
--- /dev/null
+++ b/3rdparty/_distfiles
@@ -0,0 +1 @@
+Subproject commit 34cc7ce5877cf44430dcd994931aee4aef5e2e93
diff --git a/3rdparty/distfiles b/3rdparty/distfiles
deleted file mode 160000
index 84d64cace..000000000
--- a/3rdparty/distfiles
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 84d64cace75717b31575bb6255bf7fe7ef363a3f
diff --git a/3rdparty/vendor/hedley/COPYING b/3rdparty/hedley/COPYING
similarity index 100%
rename from 3rdparty/vendor/hedley/COPYING
rename to 3rdparty/hedley/COPYING
diff --git a/3rdparty/vendor/hedley/NEWS b/3rdparty/hedley/NEWS
similarity index 100%
rename from 3rdparty/vendor/hedley/NEWS
rename to 3rdparty/hedley/NEWS
diff --git a/3rdparty/vendor/hedley/README.md b/3rdparty/hedley/README.md
similarity index 100%
rename from 3rdparty/vendor/hedley/README.md
rename to 3rdparty/hedley/README.md
diff --git a/3rdparty/vendor/hedley/hedley.h b/3rdparty/hedley/hedley.h
similarity index 100%
rename from 3rdparty/vendor/hedley/hedley.h
rename to 3rdparty/hedley/hedley.h
diff --git a/scripts/docs/authors.sh b/scripts/docs/authors.sh
index df15b3910..a70a7d8c2 100755
--- a/scripts/docs/authors.sh
+++ b/scripts/docs/authors.sh
@@ -98,7 +98,7 @@ temp="$(mktemp)"
 cat "$file" > "$temp"
 
 add_contributors "${temp}" "$(basename "$(pwd)")"
-add_contributors "${temp}" "$(basename "$(pwd)")/3rdparty/distfiles"
+add_contributors "${temp}" "$(basename "$(pwd)")/3rdparty/_distfiles"
 add_contributors "${temp}" "roc-go"
 add_contributors "${temp}" "roc-java"
 add_contributors "${temp}" "rt-tests"
diff --git a/scripts/scons/thirdparty.py b/scripts/scons/thirdparty.py
index 95f1f90ea..04b4b5606 100644
--- a/scripts/scons/thirdparty.py
+++ b/scripts/scons/thirdparty.py
@@ -52,7 +52,7 @@ def ThirdParty(
         os.chdir(project_root)
 
         if env.Execute(
-            '%s scripts/build/3rdparty.py %s 3rdparty/distfiles %s %s %s %s %s' % (
+            '%s scripts/build/3rdparty.py %s 3rdparty/_distfiles %s %s %s %s %s' % (
                 quote(env.PythonExecutable()),
                 quote(os.path.relpath(build_root, project_root)),
                 quote(toolchain),