tools: fix dep_updaters dir updates

Replace directories instead of just copying to take removed files into account. PR-URL: #51294 Reviewed-By: Luigi Pinca <[email protected]> Reviewed-By: Marco Ippolito <[email protected]> Reviewed-By: Rafael Gonzaga <[email protected]> Reviewed-By: Benjamin Gruenbaum <[email protected]>
nodejs · Mar 25, 2024 · 3b3a297 · 3b3a297
1 parent ed97b04
commit 3b3a297
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 8 deletions.
diff --git a/tools/dep_updaters/update-c-ares.sh b/tools/dep_updaters/update-c-ares.sh
@@ -63,8 +63,7 @@ cp "$DEPS_DIR/cares/cares.gyp" "$WORKSPACE/cares"
 cp "$DEPS_DIR/cares/"*.gn "$DEPS_DIR/cares/"*.gni "$WORKSPACE/cares"
 
 echo "Replacing existing c-ares"
-rm -rf "$DEPS_DIR/cares"
-mv "$WORKSPACE/cares" "$DEPS_DIR/"
+replace_dir "$DEPS_DIR/cares" "$WORKSPACE/cares"
 
 # Update the version number on maintaining-dependencies.md
 # and print the new version as the last line of the script as we need

diff --git a/tools/dep_updaters/update-nghttp3.sh b/tools/dep_updaters/update-nghttp3.sh
@@ -59,7 +59,7 @@ autoreconf -i
 
 ./configure --prefix="$PWD/build" --enable-lib-only
 
-cp -R lib/* "$DEPS_DIR/ngtcp2/nghttp3/lib/"
+replace_dir "$DEPS_DIR/ngtcp2/nghttp3/lib" "lib"
 
 # Update the version number on maintaining-dependencies.md
 # and print the new version as the last line of the script as we need

diff --git a/tools/dep_updaters/update-ngtcp2.sh b/tools/dep_updaters/update-ngtcp2.sh
@@ -63,9 +63,8 @@ autoreconf -i
 
 ./configure --prefix="$PWD/build" --enable-lib-only 
 
-cp -R lib/* "$DEPS_DIR/ngtcp2/ngtcp2/lib/"
-
-cp -R crypto/* "$DEPS_DIR/ngtcp2/ngtcp2/crypto/"
+replace_dir "$DEPS_DIR/ngtcp2/ngtcp2/lib" "lib"
+replace_dir "$DEPS_DIR/ngtcp2/ngtcp2/crypto" "crypto"
 
 # Update the version number on maintaining-dependencies.md
 # and print the new version as the last line of the script as we need

diff --git a/tools/dep_updaters/update-uvwasi.sh b/tools/dep_updaters/update-uvwasi.sh
@@ -68,8 +68,8 @@ mv "$WORKSPACE/"*.gyp "$WORKSPACE/"*.gn "$WORKSPACE/"*.gni "$DEPS_DIR/uvwasi/"
 cd "$DEPS_DIR/uvwasi/"
 
 echo "Copying new files to deps folder"
-cp -r "$UVWASI_ZIP/include" "$DEPS_DIR/uvwasi/"
-cp -r "$UVWASI_ZIP/src" "$DEPS_DIR/uvwasi/"
+replace_dir "$DEPS_DIR/uvwasi/include" "$UVWASI_ZIP/include"
+replace_dir "$DEPS_DIR/uvwasi/src" "$UVWASI_ZIP/src"
 cp "$UVWASI_ZIP/LICENSE" "$DEPS_DIR/uvwasi/"
 rm -rf "$UVWASI_ZIP"
 

diff --git a/tools/dep_updaters/utils.sh b/tools/dep_updaters/utils.sh
@@ -77,3 +77,11 @@ log_and_verify_sha256sum() {
     fi
   fi
 }
+
+# This function replaces the directory of a dependency with the new one.
+replace_dir() {
+  old_dir="$1"
+  new_dir="$2"
+  rm -rf "$old_dir"
+  mv "$new_dir" "$old_dir"
+}