[Home]

Summary:ASTERISK-13815: [patch] Cannot flavour (flavor) version number because make_version_c looks in wrong directory
Reporter:David Woolley (davidw)Labels:
Date Opened:2009-03-24 13:39:10Date Closed:2009-12-14 15:15:20.000-0600
Priority:MinorRegression?No
Status:Closed/CompleteComponents:Core/BuildSystem
Versions:Frequency of
Occurrence
Related
Issues:
Environment:Attachments:( 0) flavor.patch
Description:build_system/make_version_[ch] look for .flavor in .., but are actually run, by the Makefile, with the top level directory as the current directory.

Also, if there is no .version file, but there is a .flavor, when one fixes the bad directory reference, one gets a trailing space in the parenthesized suffix, although, if there is a .version, it is not clear why one actually needs to include it in the extra information, as it is used in the main ASTERISKVERSION string.

****** ADDITIONAL INFORMATION ******

We were trying to create a local SVN environment to track local patches, and flavour would be a useful adjunct to the version number, particularly with SVN mode version numbers.
Comments:By: David Woolley (davidw) 2009-06-02 10:30:51

I'm now able to upload our patch that addresses the .flavor part of this issue.  It doesn't address the inelegant handling of missing .version files when .flavor is present.

This is relative to the 1.6.1.0 tags version.


By: Digium Subversion (svnbot) 2009-06-11 07:12:06

Repository: asterisk
Revision: 200037

U   branches/1.4/build_tools/make_version_h

------------------------------------------------------------------------
r200037 | lmadsen | 2009-06-11 07:12:06 -0500 (Thu, 11 Jun 2009) | 8 lines

Fix path for .flavor and .version.

(issue ASTERISK-13815)
Reported by: davidw
Patches:
     flavor.patch uploaded by davidw (license 780)
Tested by: davidw

------------------------------------------------------------------------

http://svn.digium.com/view/asterisk?view=rev&revision=200037
By: Digium Subversion (svnbot) 2009-06-11 07:13:50

Repository: asterisk
Revision: 200038

_U  trunk/

------------------------------------------------------------------------
r200038 | lmadsen | 2009-06-11 07:13:49 -0500 (Thu, 11 Jun 2009) | 14 lines

Blocked revisions 200037 via svnmerge

........
 r200037 | lmadsen | 2009-06-11 08:12:06 -0400 (Thu, 11 Jun 2009) | 8 lines
 
 Fix path for .flavor and .version.
 
 (issue ASTERISK-13815)
 Reported by: davidw
 Patches:
       flavor.patch uploaded by davidw (license 780)
 Tested by: davidw
........

------------------------------------------------------------------------

http://svn.digium.com/view/asterisk?view=rev&revision=200038
By: Digium Subversion (svnbot) 2009-06-11 07:15:10

Repository: asterisk
Revision: 200039

U   trunk/build_tools/make_version_c
U   trunk/build_tools/make_version_h

------------------------------------------------------------------------
r200039 | lmadsen | 2009-06-11 07:15:10 -0500 (Thu, 11 Jun 2009) | 8 lines

Fix path for .flavor and .version

(issue ASTERISK-13815)
Reported by: davidw
Patches:
     flavor.patch uploaded by davidw (license 780)
Tested by: davidw

------------------------------------------------------------------------

http://svn.digium.com/view/asterisk?view=rev&revision=200039
By: Digium Subversion (svnbot) 2009-06-11 07:16:13

Repository: asterisk
Revision: 200040

_U  branches/1.6.0/
U   branches/1.6.0/build_tools/make_version_c
U   branches/1.6.0/build_tools/make_version_h

------------------------------------------------------------------------
r200040 | lmadsen | 2009-06-11 07:16:13 -0500 (Thu, 11 Jun 2009) | 15 lines

Merged revisions 200039 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
 r200039 | lmadsen | 2009-06-11 08:15:09 -0400 (Thu, 11 Jun 2009) | 8 lines
 
 Fix path for .flavor and .version
 
 (issue ASTERISK-13815)
 Reported by: davidw
 Patches:
       flavor.patch uploaded by davidw (license 780)
 Tested by: davidw
........

------------------------------------------------------------------------

http://svn.digium.com/view/asterisk?view=rev&revision=200040
By: Digium Subversion (svnbot) 2009-06-11 07:16:55

Repository: asterisk
Revision: 200041

_U  branches/1.6.1/
U   branches/1.6.1/build_tools/make_version_c
U   branches/1.6.1/build_tools/make_version_h

------------------------------------------------------------------------
r200041 | lmadsen | 2009-06-11 07:16:55 -0500 (Thu, 11 Jun 2009) | 15 lines

Merged revisions 200039 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
 r200039 | lmadsen | 2009-06-11 08:15:09 -0400 (Thu, 11 Jun 2009) | 8 lines
 
 Fix path for .flavor and .version
 
 (issue ASTERISK-13815)
 Reported by: davidw
 Patches:
       flavor.patch uploaded by davidw (license 780)
 Tested by: davidw
........

------------------------------------------------------------------------

http://svn.digium.com/view/asterisk?view=rev&revision=200041
By: Digium Subversion (svnbot) 2009-06-11 07:19:54

Repository: asterisk
Revision: 200051

_U  branches/1.6.2/
U   branches/1.6.2/build_tools/make_version_c
U   branches/1.6.2/build_tools/make_version_h

------------------------------------------------------------------------
r200051 | lmadsen | 2009-06-11 07:19:53 -0500 (Thu, 11 Jun 2009) | 15 lines

Merged revisions 200039 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
 r200039 | lmadsen | 2009-06-11 08:15:09 -0400 (Thu, 11 Jun 2009) | 8 lines
 
 Fix path for .flavor and .version
 
 (issue ASTERISK-13815)
 Reported by: davidw
 Patches:
       flavor.patch uploaded by davidw (license 780)
 Tested by: davidw
........

------------------------------------------------------------------------

http://svn.digium.com/view/asterisk?view=rev&revision=200051
By: Leif Madsen (lmadsen) 2009-06-11 07:21:37

The first half of this issue has been committed, but the handling of a missing .version when .flavor exists needs to be resolved. Thanks!
By: Digium Subversion (svnbot) 2009-12-14 15:09:57.000-0600

Repository: asterisk
Revision: 234699

U   branches/1.4/build_tools/make_version_h

------------------------------------------------------------------------
r234699 | tilghman | 2009-12-14 15:09:57 -0600 (Mon, 14 Dec 2009) | 5 lines

Deal with the situation where .flavor exists but .version does not.
Also make the script slightly more portable, in keeping with autoconf syntax.
(closes issue ASTERISK-13815)
Reported by: davidw

------------------------------------------------------------------------

http://svn.digium.com/view/asterisk?view=rev&revision=234699
By: Digium Subversion (svnbot) 2009-12-14 15:13:19.000-0600

Repository: asterisk
Revision: 234700

_U  trunk/
U   trunk/build_tools/make_version_c
U   trunk/build_tools/make_version_h

------------------------------------------------------------------------
r234700 | tilghman | 2009-12-14 15:13:18 -0600 (Mon, 14 Dec 2009) | 12 lines

Merged revisions 234699 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
 r234699 | tilghman | 2009-12-14 15:09:56 -0600 (Mon, 14 Dec 2009) | 5 lines
 
 Deal with the situation where .flavor exists but .version does not.
 Also make the script slightly more portable, in keeping with autoconf syntax.
 (closes issue ASTERISK-13815)
  Reported by: davidw
........

------------------------------------------------------------------------

http://svn.digium.com/view/asterisk?view=rev&revision=234700
By: Digium Subversion (svnbot) 2009-12-14 15:15:00.000-0600

Repository: asterisk
Revision: 234701

_U  branches/1.6.0/
U   branches/1.6.0/build_tools/make_version_c
U   branches/1.6.0/build_tools/make_version_h

------------------------------------------------------------------------
r234701 | tilghman | 2009-12-14 15:15:00 -0600 (Mon, 14 Dec 2009) | 19 lines

Merged revisions 234700 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
 r234700 | tilghman | 2009-12-14 15:13:18 -0600 (Mon, 14 Dec 2009) | 12 lines
 
 Merged revisions 234699 via svnmerge from
 https://origsvn.digium.com/svn/asterisk/branches/1.4
 
 ........
   r234699 | tilghman | 2009-12-14 15:09:56 -0600 (Mon, 14 Dec 2009) | 5 lines
   
   Deal with the situation where .flavor exists but .version does not.
   Also make the script slightly more portable, in keeping with autoconf syntax.
   (closes issue ASTERISK-13815)
    Reported by: davidw
 ........
................

------------------------------------------------------------------------

http://svn.digium.com/view/asterisk?view=rev&revision=234701
By: Digium Subversion (svnbot) 2009-12-14 15:15:09.000-0600

Repository: asterisk
Revision: 234702

_U  branches/1.6.1/
U   branches/1.6.1/build_tools/make_version_c
U   branches/1.6.1/build_tools/make_version_h

------------------------------------------------------------------------
r234702 | tilghman | 2009-12-14 15:15:09 -0600 (Mon, 14 Dec 2009) | 19 lines

Merged revisions 234700 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
 r234700 | tilghman | 2009-12-14 15:13:18 -0600 (Mon, 14 Dec 2009) | 12 lines
 
 Merged revisions 234699 via svnmerge from
 https://origsvn.digium.com/svn/asterisk/branches/1.4
 
 ........
   r234699 | tilghman | 2009-12-14 15:09:56 -0600 (Mon, 14 Dec 2009) | 5 lines
   
   Deal with the situation where .flavor exists but .version does not.
   Also make the script slightly more portable, in keeping with autoconf syntax.
   (closes issue ASTERISK-13815)
    Reported by: davidw
 ........
................

------------------------------------------------------------------------

http://svn.digium.com/view/asterisk?view=rev&revision=234702
By: Digium Subversion (svnbot) 2009-12-14 15:15:19.000-0600

Repository: asterisk
Revision: 234703

_U  branches/1.6.2/
U   branches/1.6.2/build_tools/make_version_c
U   branches/1.6.2/build_tools/make_version_h

------------------------------------------------------------------------
r234703 | tilghman | 2009-12-14 15:15:19 -0600 (Mon, 14 Dec 2009) | 19 lines

Merged revisions 234700 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
 r234700 | tilghman | 2009-12-14 15:13:18 -0600 (Mon, 14 Dec 2009) | 12 lines
 
 Merged revisions 234699 via svnmerge from
 https://origsvn.digium.com/svn/asterisk/branches/1.4
 
 ........
   r234699 | tilghman | 2009-12-14 15:09:56 -0600 (Mon, 14 Dec 2009) | 5 lines
   
   Deal with the situation where .flavor exists but .version does not.
   Also make the script slightly more portable, in keeping with autoconf syntax.
   (closes issue ASTERISK-13815)
    Reported by: davidw
 ........
................

------------------------------------------------------------------------

http://svn.digium.com/view/asterisk?view=rev&revision=234703