svn commit: r1889078 - /httpd/site/trunk/tools/tag.sh

[ja...@apache.org]

Author: jailletc36
Date: Wed Apr 21 21:37:50 2021
New Revision: 1889078

URL: http://svn.apache.org/viewvc?rev=1889078&view=rev
Log:
'make update-changes' can't work at this point.
So check if 'changes-entries' is empty before going further.

Modified:
    httpd/site/trunk/tools/tag.sh

Modified: httpd/site/trunk/tools/tag.sh
URL: http://svn.apache.org/viewvc/httpd/site/trunk/tools/tag.sh?rev=1889078&r1=1889077&r2=1889078&view=diff
==============================================================================
--- httpd/site/trunk/tools/tag.sh (original)
+++ httpd/site/trunk/tools/tag.sh Wed Apr 21 21:37:50 2021
@@ -142,7 +142,19 @@ rm -rf build
 
 # Update CHANGES file with entries from change-entries directory.
 # See http://svn.apache.org/viewvc/httpd/httpd/trunk/README.CHANGES?view=co
-make update-changes
+#
+# FIXME: Makefile is not available at this point, so make update-changes
+#        can't work.
+#        We need to run ./buildconf (which asks for APR, ...) and .configure.
+#        Comment this step for now and make sure changes have already been
+#        correctly merged
+#
+# make update-changes
+if test "$(ls -A $src_dir/changes-entries)"; then
+  echo "The 'changes-entries' directory should be empty."
+  echo "Run 'make update-changes' and commit changes before using $0"
+  exit 1
+fi
 
 cd "$src_dir"
 #    Set AP_SERVER_DEVBUILD_BOOLEAN to 0 in include/ap_release.h.