"Files" <files@poetryunlimited.com> writes:
> This patch corrects minor technical glitches discovered duing rigorous
> testing during build process under dev builds with differing setups.
>
> * trunk/packages/rpm/mandrake-9.1/make-version-patch
> (modified):
> Mandrake ID information no longer clobbers patchfile syntax during build.
>
> * trunk/packages/rpm/mandrake-9.1/Makefile
> (modified):
> Added missing $(shell) call to determine validity of svn setup.
> Made svn info interpretation case insensitive since text may change case.
We use "(thing):" to narrow down explanations of what has changed in a
file to one or more symbol names (functions, macros, etc.). Reading
this log message, I'm expecting to see that in your change, a function
or macro named "modified" was, well, modified. When a change is not
made to a specified function, macro, etc., we don't include a (thing):
prefix for that part of the description.
Your opening log line was fine, but I'll suggest a more accurate
per-file log message bits as we go along.
> Index: trunk/packages/rpm/mandrake-9.1/make-version-patch
> ===================================================================
> --- trunk/packages/rpm/mandrake-9.1/make-version-patch (revision 7238)
> +++ trunk/packages/rpm/mandrake-9.1/make-version-patch (working copy)
> @@ -5,6 +5,11 @@
> echo --- subversion-0.29.0/subversion/include/svn_version.h 2003-09-17 19:36:40.000000000 -0400
> echo +++ subversion-0.29.0-patch/subversion/include/svn_version.h 2003-09-17 21:11:58.000000000 -0400
> }
> +Extra()
> +{
> + echo "+\"\\nMandrake RPM\\n\" \\"
> + sh full-machine-name
> +}
> Patch()
> {
> LINE=`echo $1 | cut -f1 -d:`
> @@ -18,6 +23,7 @@
> # Only used in one instance
> if [[ "$6" == "" ]] ; then
> sed "s/$4/$5/g" line.patch | sed 's/$/ \\/g'
> + Extra
> else
> sed "s/$4/$5/g" line.patch
> fi
> @@ -71,7 +77,3 @@
> fi
> RAW=`grep -n '"dev build"' "$SVN_VERSION" | grep SVN_VER_TAG `
> Patch "$RAW" "$SVN_VERSION" $LINES "$FIND" "$PRE$REPLACE" "$5"
> -if [ "$5" == "" ] ; then
> - echo "+\"\\nMandrake RPM\\n\" \\"
> - sh full-machine-name
> -fi
How about:
* packages/rpm/mandrake-9.1/make-version-patch
(Extra): A new routine for spitting out Mandrake ID info. This code
used to live in the top-level routine, where it unfortunately
clobbered patchfile syntax during the build.
(Patch): Call the new Extra() routine from here now.
> Index: trunk/packages/rpm/mandrake-9.1/Makefile
> ===================================================================
> --- trunk/packages/rpm/mandrake-9.1/Makefile (revision 7238)
> +++ trunk/packages/rpm/mandrake-9.1/Makefile (working copy)
> @@ -135,11 +135,11 @@
>
> # Where the svn executable is
> SVNEXEC := $(shell which svn 2>/dev/null)
> -SVNEXEC := $(if ldd $(SVNEXEC) | grep 'not found',,$(SVNEXEC))
> +SVNEXEC := $(if $(shell ldd $(SVNEXEC) | grep 'not found'),,$(SVNEXEC))
> SVNEXEC := $(if $(BLESSED),,$(SVNEXEC))
>
> # Whether this is being compiled on the trunk
> -TRUNK := $(if $(SVNEXEC),$(shell $(SVNEXEC) info . | grep Url),$(shell pwd))
> +TRUNK := $(if $(SVNEXEC),$(shell $(SVNEXEC) info . | grep -i url:),$(shell pwd))
> TRUNK := $(shell echo $(TRUNK) | grep trunk | wc -l | sed 's/ //g')
>
> ifneq ($(TRUNK),0)
And here, how about:
* packages/rpm/mandrake-9.1/Makefile
Added missing $(shell) call to determine validity of svn setup.
Made svn info interpretation case insensitive since text may change
case.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Sep 29 20:59:19 2003