From afa6cd1e52b37d58101620037f21503b3a41d3dd Mon Sep 17 00:00:00 2001
From: Matthew Feickert <matthew.feickert@cern.ch>
Date: Thu, 12 Sep 2024 21:55:07 -0500
Subject: [PATCH] build: Move Git submodules to extern directory

* Move the https://gitlab.com/fastjet/fastjet.git and
  https://github.com/cms-externals/fastjet-contrib.git Git submodules
  into an 'extern' directory to make the directory management cleaner.
---
 .gitmodules                               | 4 ++--
 MANIFEST.in                               | 3 +--
 fastjet-contrib => extern/fastjet-contrib | 0
 fastjet-core => extern/fastjet-core       | 0
 setup.py                                  | 6 +++---
 5 files changed, 6 insertions(+), 7 deletions(-)
 rename fastjet-contrib => extern/fastjet-contrib (100%)
 rename fastjet-core => extern/fastjet-core (100%)

diff --git a/.gitmodules b/.gitmodules
index 6298a925..1090dee3 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,9 +1,9 @@
 [submodule "fastjet"]
-	path = fastjet-core
+	path = extern/fastjet-core
 	url = https://gitlab.com/fastjet/fastjet.git
 [submodule "pybind11"]
 	path = pybind11
 	url = https://github.com/pybind/pybind11.git
 [submodule "fastjet-contrib"]
-	path = fastjet-contrib
+	path = extern/fastjet-contrib
 	url = https://github.com/cms-externals/fastjet-contrib.git
diff --git a/MANIFEST.in b/MANIFEST.in
index 7796d520..9cefe048 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,7 +1,6 @@
 graft src
 graft tests
-graft fastjet-core
-graft fastjet-contrib
+graft extern
 graft pybind11
 global-exclude .git .gitmodules
 include LICENSE README.md pyproject.toml setup.py setup.cfg patch_clustersequence.txt
diff --git a/fastjet-contrib b/extern/fastjet-contrib
similarity index 100%
rename from fastjet-contrib
rename to extern/fastjet-contrib
diff --git a/fastjet-core b/extern/fastjet-core
similarity index 100%
rename from fastjet-core
rename to extern/fastjet-core
diff --git a/setup.py b/setup.py
index e90bcf30..56971382 100644
--- a/setup.py
+++ b/setup.py
@@ -24,9 +24,9 @@
 CGAL_ZIP = "https://github.com/CGAL/cgal/releases/download/v5.6/CGAL-5.6-library.zip"
 
 DIR = pathlib.Path(__file__).parent.resolve()
-FASTJET = DIR / "fastjet-core"
-FASTJET_CONTRIB = DIR / "fastjet-contrib"
-PYTHON = DIR / "src/fastjet"
+FASTJET = DIR / "extern" / "fastjet-core"
+FASTJET_CONTRIB = DIR / "extern" / "fastjet-contrib"
+PYTHON = DIR / "src" / "fastjet"
 OUTPUT = PYTHON / "_fastjet_core"