kfogel@collab.net wrote:
>"Jostein Chr. Andersen" <jostein@josander.net> writes:
>  
>
>>Will this in subversion/include/svn_version.h make it:
>>    #define SVN_VER_MICRO      0 (beta1)
>>or:
>>    #define SVN_VER_MICRO      0b1
>>
>>wich should give: svn, version 1.0.0b1
>>    
>>
>
>We want "beta1" as the string, to match the tarball's suffix (this is
>what we standardized on and put in HACKING.)
>  
>
SVN_VER_TAG is the right place to do this. The _MAJOR, _MINOR and _MICRO
constants must be numbers. There's also SVN_VER_NUMTAG that helps
generate the version number without spaces (used by mod_dav_svn and
displayed by "svn --version --quiet").
Here's the patch you want:
Index: svn_version.h
===================================================================
--- svn_version.h	(revision 8550)
+++ svn_version.h	(working copy)
@@ -48,14 +48,14 @@
  *
  * Modify when incompatible changes are made to published interfaces.
  */
-#define SVN_VER_MAJOR      0
+#define SVN_VER_MAJOR      1
 
 /** Minor version number.
  *
  * Modify when new functionality is added or new interfaces are
  * defined, but all changes are backward compatible.
  */
-#define SVN_VER_MINOR      37
+#define SVN_VER_MINOR      0
 
 /** Patch number.
  *
@@ -80,7 +80,7 @@
  * During the distribution process, we automatically replace this text
  * with something like "r1504".
  */
-#define SVN_VER_TAG        "dev build"
+#define SVN_VER_TAG        "Beta 1"
 
 
 /** Number tag: a string indicating whether this is a released version.
@@ -92,7 +92,7 @@
  * During the distribution process, we automatically replace this text
  * with "" to indicate a baselined version.
  */
-#define SVN_VER_NUMTAG     "+"
+#define SVN_VER_NUMTAG     "-beta1"
 
 
 /** Revision number: The repository revision number of this release.
Compilation finished at Thu Feb 19 18:22:28
The problem is that SVN_VER_TAG always gets substituted into the
SVN_VERSION string, which is unfortunate because we don't want an empty
set of parentheses in the released "svn --version" output. I'll get a
patch to fix this into the repo tonight.
-- 
Brane Čibej   <brane_at_xbc.nu>   http://www.xbc.nu/brane/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Feb 19 18:26:14 2004