You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by rp...@apache.org on 2020/09/15 07:19:13 UTC
svn commit: r1881728 - in /httpd/httpd/branches/2.4.x: ./ Makefile.in README.CHANGES STATUS acinclude.m4 changes-entries/ configure.in

Author: rpluem
Date: Tue Sep 15 07:19:13 2020
New Revision: 1881728

URL: http://svn.apache.org/viewvc?rev=1881728&view=rev
Log:
Merge r1879822, r1879831, r1879840 from trunk:

Add a new way to document changes

* Makefile.in: Define the update-changes target to merge the change files
  from the changes directory to the top of the CHANGES file and remove
  them afterwards. If a Subversion binary was found during configure try
  to svn rm them otherwise just delete them.

* configure.in: Search for the Subversion binary.

* acinclude.m4: Set the corresponding Makefile variable for the Subversion
  binary.

* README.CHANGES: New file to document the new approach.


Can we have mercy with people working on case-preserving file systems?


Consider case insensitive filessystems

Consider case insensitive filessystems and thus choose a new non conflicting
name for the directory to store CHANGES entries.

Reviewed by: rpluem, jim, jorton

Added:
    httpd/httpd/branches/2.4.x/README.CHANGES
      - copied, changed from r1879822, httpd/httpd/trunk/README.CHANGES
    httpd/httpd/branches/2.4.x/changes-entries/
      - copied from r1879840, httpd/httpd/trunk/changes-entries/
Modified:
    httpd/httpd/branches/2.4.x/   (props changed)
    httpd/httpd/branches/2.4.x/Makefile.in
    httpd/httpd/branches/2.4.x/STATUS
    httpd/httpd/branches/2.4.x/acinclude.m4
    httpd/httpd/branches/2.4.x/configure.in

Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
  Merged /httpd/httpd/trunk:r1879822,1879831,1879840

Modified: httpd/httpd/branches/2.4.x/Makefile.in
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/Makefile.in?rev=1881728&r1=1881727&r2=1881728&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/Makefile.in (original)
+++ httpd/httpd/branches/2.4.x/Makefile.in Tue Sep 15 07:19:13 2020
@@ -155,6 +155,26 @@ docs:
 	    echo '  http://httpd.apache.org/docs-project/docsformat.html'; \
 	fi
 
+update-changes:
+	@for i in `find changes-entries -type f`; do \
+	    cp CHANGES CHANGES.tmp ; \
+	    awk -vfname=$$i 'BEGIN{done = 0} \
+	                    done == 0 && /^Changes with Apache /{ active = 1; print; next}; \
+	                    /^ *\*/ && active == 1 && done == 0{rec=$$0; while(getline<fname){if (! ($$0 ~ /^ *$$/)){print}}printf "\n";print rec; active = 0; done = 1; next} //;' \
+	    CHANGES.tmp > CHANGES ; \
+	    rm CHANGES.tmp ; \
+	    if [ -n "$(SVN)" ] ; then \
+	        if ! $(SVN) rm $$i 2>/dev/null ; then \
+	            $(RM) $$i ; \
+	        fi ; \
+	    else \
+	        $(RM) $$i ; \
+	    fi ; \
+	done ; \
+	if [ -n "$(SVN)" ] ; then \
+	    $(SVN) diff CHANGES ; \
+	fi
+
 validate-xml:
 	@if test -d $(top_srcdir)/docs/manual/build; then \
 	    cd $(top_srcdir)/docs/manual/build && ./build.sh validate-xml; \

Copied: httpd/httpd/branches/2.4.x/README.CHANGES (from r1879822, httpd/httpd/trunk/README.CHANGES)
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/README.CHANGES?p2=httpd/httpd/branches/2.4.x/README.CHANGES&p1=httpd/httpd/trunk/README.CHANGES&r1=1879822&r2=1881728&rev=1881728&view=diff
==============================================================================
--- httpd/httpd/trunk/README.CHANGES (original)
+++ httpd/httpd/branches/2.4.x/README.CHANGES Tue Sep 15 07:19:13 2020
@@ -1,17 +1,19 @@
 Changes can be documented in two ways now: Either by directly editing the
 CHANGES file like it was done until now or by storing each entry for the
-CHANGES file correctly formated in a separate file in the "changes" directory.
+CHANGES file correctly formated in a separate file in the changes-entries
+directory.
 
 The benefit of the single file per change approach is that it eases backporting
 the CHANGES entry to a stable branch as it avoids the frequent merge conflicts
 as changes are merged in different orders or not at all in the stable branch.
 
 In order to keep the current CHANGES file for the users as is there is a new
-make target called 'update-changes'. It merges all change files in the changes
-directory to the top of the CHANGES file and removes them afterwards.
+make target called 'update-changes'. It merges all change files in the
+changes-entries directory to the top of the CHANGES file and removes them
+afterwards.
 
 This make target can be seen in a similar way as the scripts to update the
 documentation files from its xml sources. It can be executed immediately
-after the new file in the changes directory has been created / merged
+after the new file in the changes-entries directory has been created / merged
 and committed or it can executed later. It should be executed at least before
 a release gets tagged.

Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1881728&r1=1881727&r2=1881728&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Tue Sep 15 07:19:13 2020
@@ -154,16 +154,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
      2.4.x patch: http://people.apache.org/~covener/patches/wstunnel-decline.diff
      +1 covener, jim, rpluem
 
- *) Tooling: Add a new way to document changes
-   Trunk version of patch:
-      http://svn.apache.org/r1879822
-      http://svn.apache.org/r1879831
-      http://svn.apache.org/r1879840
-   Backport version for 2.4.x of patch:
-      Trunk version of patch works
-      svn merge -c 1879822,1879831,1879840 ^/httpd/httpd/trunk .
-   +1: rpluem, jim, jorton
-
   *) Slightly speed-up the execution of the test framework.
      Trunk version of patch:
         https://svn.apache.org/r1880500

Modified: httpd/httpd/branches/2.4.x/acinclude.m4
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/acinclude.m4?rev=1881728&r1=1881727&r2=1881728&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/acinclude.m4 (original)
+++ httpd/httpd/branches/2.4.x/acinclude.m4 Tue Sep 15 07:19:13 2020
@@ -79,6 +79,7 @@ AC_DEFUN([APACHE_GEN_CONFIG_VARS],[
   APACHE_SUBST(LIBTOOL)
   APACHE_SUBST(SHELL)
   APACHE_SUBST(RSYNC)
+  APACHE_SUBST(SVN)
   APACHE_SUBST(MODULE_DIRS)
   APACHE_SUBST(MODULE_CLEANDIRS)
   APACHE_SUBST(PORT)

Modified: httpd/httpd/branches/2.4.x/configure.in
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/configure.in?rev=1881728&r1=1881727&r2=1881728&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/configure.in (original)
+++ httpd/httpd/branches/2.4.x/configure.in Tue Sep 15 07:19:13 2020
@@ -372,6 +372,7 @@ dnl ## Check for programs
 AC_PATH_PROG(RM, rm)
 AC_PATH_PROG(PKGCONFIG, pkg-config)
 AC_PATH_PROG(RSYNC, rsync)
+AC_PATH_PROG(SVN, svn)
 AC_PROG_AWK
 AC_PROG_LN_S
 AC_CHECK_TOOL(RANLIB, ranlib, true)