ENH: allow automatic submodule downloads on clean build

lanl · Aug 6, 2024 · 25be3de · 25be3de
1 parent 6ba229f
commit 25be3de
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/scripts/cmake_build.sh b/scripts/cmake_build.sh
@@ -12,7 +12,7 @@ kokkos_build_type="${3}"
 if { [ ! -d "${ELEMENTS_SOURCE_DIR}/elements" ] || [ ! -d "${ELEMENTS_SOURCE_DIR}/matar/src" ] ;}
 then
     echo "Missing submodules, downloading them...."
-    git submodule update --recursive "${ELEMENTS_SOURCE_DIR}"
+    git submodule update --init --recursive "${ELEMENTS_SOURCE_DIR}"
 fi
 
 if [ ! -d "${TRILINOS_INSTALL_DIR}/lib" ]; then

diff --git a/scripts/setup-env.sh b/scripts/setup-env.sh
@@ -20,7 +20,7 @@ export installdir=${basedir}/install
 
 export devutilsdir=${topdir}/dev-utils
 
-export UNCRUSTIFY_SOURCE_DIR=${devutilsdir}/uncrustify/src
+export UNCRUSTIFY_SOURCE_DIR=${devutilsdir}/uncrustify
 export UNCRUSTIFY_BUILD_DIR=${devutilsdir}/uncrustify/build
 export UNCRUSTIFY_INSTALL_DIR=${devutilsdir}/uncrustify/build
 

diff --git a/scripts/uncrustify-install.sh b/scripts/uncrustify-install.sh
@@ -2,10 +2,10 @@
 
 # Check if the uncrustify build directory exists and is not empty in the parent directory; if not, clone it
 
-if [ ! -d "${UNCRUSTIFY_SOURCE_DIR}" ];
+if [ ! -d "${UNCRUSTIFY_SOURCE_DIR}/src" ];
 then
     echo "Missing Uncrustify submodule, downloading...."
-    git submodule update ${UNCRUSTIFY_SOURCE_DIR}
+    git submodule update --init ${UNCRUSTIFY_SOURCE_DIR}
 fi
 
 if [ ! -f "${UNCRUSTIFY_BUILD_DIR}/uncrustify" ]; then