Fix patch generation script to work with sub-projects

[releng/builder.git] / jjb / autorelease / include-raw-autorelease-release-versions.sh

diff --git a/jjb/autorelease/include-raw-autorelease-release-versions.sh b/jjb/autorelease/include-raw-autorelease-release-versions.sh
index bbf90e22614231696a4b21a06d11de19955630ac..99c40872a5be5d4091caea858ef52d3fcf71788b 100644 (file)
--- a/jjb/autorelease/include-raw-autorelease-release-versions.sh
+++ b/jjb/autorelease/include-raw-autorelease-release-versions.sh
@@ -13,6 +13,9 @@
 # RELEASE_TAG=Helium-SR2  # Example
 # RELEASE_BRANCH=stable/helium  # Example
 
+# Directory to put git format-patches
+PATCH_DIR=`pwd`/patches
+
 if [ "$DATESTAMP" == "true" ]; then
    export RELEASE_TAG=$RELEASE_TAG-`date -u +v%Y%m%d%H%M`
 fi
@@ -25,9 +28,9 @@ git commit -am "Release $RELEASE_TAG"
 mkdir patches
 modules=`xmlstarlet sel -N x=http://maven.apache.org/POM/4.0.0 -t -m '//x:modules' -v '//x:module' pom.xml`
 for module in $modules; do
-    cd $module
-    git format-patch --stdout origin/$RELEASE_BRANCH > ../patches/$module.patch
-    cd ..
+    pushd $module
+    git format-patch --stdout origin/$RELEASE_BRANCH > $PATCH_DIR/${module//\//-}.patch
+    popd
 done
 
 ./scripts/fix-relativepaths.sh