asterisk

Commit Graph

Author	SHA1	Message	Date
Matt Jordan	0f627c2015	build_tools/make_version: Update version parsing for Git migration External systems - such as the Asterisk Test Suite - require knowledge of the upstream branch. Unfortunately, after moving to Git, the Asterisk version currently consists of only a 'GIT" prefix followed by an object blob, e.g., GIT-as08d7. This makes it difficult for such systems to know what features are available in a particular check out of Asterisk. This patch fixes this by hardcoding the branch in a variable in the make_version script. Since the mainline branches are not changed often - typically only once a year - this is a reasonable approach to solving the problem, and is more reliable than parsing the output of 'git branch -vv'. Branches that track off of an upstream primary branch will then get the benefit of knowing which mainline branch they are currently based off of. ASTERISK-24954 #close Change-Id: I8090d5d548b6d19e917157ed530b914b7eaf9799	10 years ago
Richard Mudgett	7c69310497	build_tools: Allow Asterisk to report git SHAs in version string. Make git more attractive for managing work-in-progress. Especially convenient when a potential patch set needs to be tested on multiple platforms since one can use git to keep all the test environments in sync independent of a subversion server. Now the Asterisk version will show the exact git SHA5 that was used when building (still appended by "M" if there are local modifications) from a git clone of the Asterisk repository so the developer can more easily know what is actually under test. You will now get this: $ asterisk -V Asterisk GIT-1698298 Instead of this: $ asterisk -V Asterisk UNKNOWN__and_probably_unsupported This has zero impact for those not using git with the exception of an extra test in the configure script to gather git's path. This is necessary to prevent "sudo make install" from failing since git may not be in the path in make's shell environment. (closes issue ASTERISK-20483) Reported by: Shaun Ruffell Patches: 0001-build_tools-Allow-Asterisk-to-report-git-SHAs-in-ver.patch (license #5417) patch uploaded by Shaun Ruffell Modified ........ Merged revisions 375189 from http://svn.asterisk.org/svn/asterisk/branches/1.8 ........ Merged revisions 375190 from http://svn.asterisk.org/svn/asterisk/branches/10 git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/11@375191 65c4cc65-6c06-0410-ace0-fbb531ad65f3	13 years ago
Matthew Jordan	d197f69107	Add feature modifier to versions produced from branches Certain branches, such as Certified Asterisk, may have a modifier added to them that specifies the features available in that branch. For branches, this modifier is expected to be reflected in the location of the branch in subversion. For example, a subversion of URL of /certified/branches/1.8.11 would have a feature modifier of 'certified'. This is slightly different then how features are determined for tags, where the feature is part of the actual tag name, e.g., "10.5.0-digiumphones". In keeping with the nomenclature used for tags, the feature specifier for branches is translated and placed after the revision numbers. For the example given previously, this would result in a branch version of "Asterisk SVN-branch-1.8.11-cert-rXXXXXX". ........ Merged revisions 368604 from http://svn.asterisk.org/svn/asterisk/branches/1.8 ........ Merged revisions 368605 from http://svn.asterisk.org/svn/asterisk/branches/10 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@368606 65c4cc65-6c06-0410-ace0-fbb531ad65f3	13 years ago
Richard Mudgett	7b8564ada6	Whitespace chages. git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@181577 65c4cc65-6c06-0410-ace0-fbb531ad65f3	16 years ago
Richard Mudgett	b782f28fa9	Use the correct branch integrated property when generating the version string git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@181542 65c4cc65-6c06-0410-ace0-fbb531ad65f3	16 years ago
Sean Bright	559e644b63	Fix a few build problems on Solaris (and check for an md5 utility in configure instead of the icky loop I was doing before). (closes issue #13842) Reported by: snuffy Patches: bug13842_20081106.diff uploaded by snuffy (license 35) 13842.diff uploaded by seanbright (license 71) Tested by: snuffy git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@157600 65c4cc65-6c06-0410-ace0-fbb531ad65f3	17 years ago
Tilghman Lesher	8ba981911a	Always output a version string, even when we can't figure out what we are. (Closes issue #13223) git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@135648 65c4cc65-6c06-0410-ace0-fbb531ad65f3	17 years ago
Dwayne M. Hubbard	4645221ac1	Merged revisions 101080 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r101080 \| dhubbard \| 2008-01-29 17:50:42 -0600 (Tue, 29 Jan 2008) \| 1 line updated build_tools to handle the autotag directory structure changes; changes related to BE-353. Patch by The Russell and reviewed by The Me. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@101081 65c4cc65-6c06-0410-ace0-fbb531ad65f3	17 years ago
Kevin P. Fleming	100ef27af9	Merged revisions 93180 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r93180 \| kpfleming \| 2007-12-16 22:44:51 -0800 (Sun, 16 Dec 2007) \| 23 lines In http://lists.digium.com/pipermail/asterisk-dev/2007-December/031145.html, rizzo brought up some issues related to the way that the metadata required for menuselect and the rest of the build system is extracted from the source files. Since I had a few hours to kill on an airplane today, I decided to improve this situation... so now the system caches the extracted metadata and uses it to build the menuselect 'tree' as much as it can. The result of this is that when a single source file is changed, only the metadata for that file needs to be extracted again, and the rest is used from the cache files. I also reduced the number of forked processes required to do the metadata extraction; it was actually possible to do most of what we needed in the Makefiles themselves without using any shell scripts at all! On my laptop, these changes resulted in an 80% decrease in the time required for the 'menuselect.makeopts' automatic check to occur after editing a single source file. While doing this work I also cleaned up a few minor things in the Makefiles, adding a check for 'awk' to the configure script and changed all remaining places we use 'grep' or 'awk' to use the ones found by the configure script, and changed the 'prep_tarball' script to build the menuselect metadata so that tarballs of Asterisk will include it and won't require the user to wait while it is extracted after unpacking. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@93184 65c4cc65-6c06-0410-ace0-fbb531ad65f3	18 years ago
Luigi Rizzo	19d616d4dc	simplify/cleanup the scripts git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@92122 65c4cc65-6c06-0410-ace0-fbb531ad65f3	18 years ago
Jason Parker	54daf3288c	Merged revisions 80302 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r80302 \| qwell \| 2007-08-22 13:06:00 -0500 (Wed, 22 Aug 2007) \| 3 lines Fix a bashism (we explicitly request /bin/sh). Remove some oddly placed quotes I found in passing. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@80303 65c4cc65-6c06-0410-ace0-fbb531ad65f3	18 years ago
Kevin P. Fleming	80baf2a40f	Merged revisions 65541 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r65541 \| kpfleming \| 2007-05-22 16:25:41 -0400 (Tue, 22 May 2007) \| 2 lines when building a version string for a developer branch, include the base branch in the version string ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@65542 65c4cc65-6c06-0410-ace0-fbb531ad65f3	18 years ago
Kevin P. Fleming	bf3c67c2d2	Merged revisions 55869 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ................ r55869 \| kpfleming \| 2007-02-21 08:06:47 -0600 (Wed, 21 Feb 2007) \| 10 lines Merged revisions 55868 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r55868 \| kpfleming \| 2007-02-21 08:03:11 -0600 (Wed, 21 Feb 2007) \| 2 lines use new tag version script ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@55870 65c4cc65-6c06-0410-ace0-fbb531ad65f3	18 years ago
Jason Parker	5114f21ba7	Merged revisions 43396 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r43396 \| qwell \| 2006-09-20 16:19:25 -0700 (Wed, 20 Sep 2006) \| 2 lines fix minor typo in the way version is handled ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@43397 65c4cc65-6c06-0410-ace0-fbb531ad65f3	19 years ago
Jason Parker	0264c362b6	a couple Solaris tweaks, to help build properly. git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@40832 65c4cc65-6c06-0410-ace0-fbb531ad65f3	19 years ago
Tilghman Lesher	41b1a82a38	Typo fix git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@25206 65c4cc65-6c06-0410-ace0-fbb531ad65f3	19 years ago
Kevin P. Fleming	574e14cbea	Thanks to the fine work of Russell Bryant and Dancho Lazarov, we now have autoconf and menuselect tools for Asterisk! git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@22267 65c4cc65-6c06-0410-ace0-fbb531ad65f3	19 years ago

17 Commits (11)