THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY.
The following task has a new comment added:
FS#43 - Tag each build with unique commit ID
User who did this - Ovidiu Sas (osas)
----------
I just browsed the Makefile and I realized that it was already implemented ...
What is the meaning of EXTRAVERSION?
----------
More information can be found at the following URL:
http://sip-router.org/tracker/index.php?do=details&task_id=43#comment42
You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.
THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY.
The following task has a new comment added:
FS#43 - Tag each build with unique commit ID
User who did this - Andrei Pelinescu-Onciul (andrei)
----------
It's already supported. Try -V, e.g.:
../ser -V
version: ser 3.0.99-dev1 (i386/linux) a120c1-dirty
See commit GIT#51690b9. Basically each compilation attemp looks to see ig .git was modified and if it was it regenerates autover.h.
main.c and the core_cmd.c depend on autover.h, so any change will rebuild them.
autover.h contains REPO_VER, which is printed by -V or by the core.version rpc.
Besides using the first 6 letters of the commit, it will also have "-dirty" appended if the build is from a repository with non-commited changes.
Your solution uses only the top commit on a give branch (won't work if I change branches), requires a make cfg and will rebuild everything.
I don't think we need to add the commit id to the tar.gz (one could always use tar -Ozxf foo.tar.gz autover.h).
----------
More information can be found at the following URL:
http://sip-router.org/tracker/index.php?do=details&task_id=43#comment41
You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.
THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY.
The following task has a new comment added:
FS#43 - Tag each build with unique commit ID
User who did this - Ovidiu Sas (osas)
----------
Hmmm ... I just realize that the current patch will not work properly for tarballs (no git info built in it).
Here's a new patch that will have a proper output for both type of builds (from tarballs and from src):
diff --git a/Makefile.defs b/Makefile.defs
index 97824b5..9c981fe 100644
--- a/Makefile.defs
+++ b/Makefile.defs
@@ -157,6 +157,11 @@ PATCHLEVEL = 0
SUBLEVEL = 1
EXTRAVERSION =
+USE_GIT_ID := $(shell if [ -d .git ] ; then echo true; else echo false; fi)
+ifeq ($(USE_GIT_ID),true)
+ EXTRAVERSION := -$(shell git rev-parse --short kamailio_3.0)
+endif
+
# memory debugger switcher
# 0 - off (release mode)
# 1 - on (devel mode)
----------
More information can be found at the following URL:
http://sip-router.org/tracker/index.php?do=details&task_id=43#comment40
You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.
THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY.
A new Flyspray task has been opened. Details are below.
User who did this - Ovidiu Sas (osas)
Attached to Project - sip-router
Summary - Tag each build with unique commit ID
Task Type - Improvement
Category - utils
Status - Unconfirmed
Assigned To -
Operating System - All
Severity - Low
Priority - Normal
Reported Version - Development
Due in Version - Undecided
Due Date - Undecided
Details - This patch is for kamailio, but it can be applied to the main sip-router build system.
The idea is to tag the build with the latest commit identifier in order to easily identify builds made out of a source tree.
Since the commit identifier is long (40 chars), using the first 7 chars of the commit identifier should be enough.
The tag will populate the EXTRAVERSION variable during 'make cfg' with the output of 'git rev-parse --short kamailio_3.0' for kamailio flavour or with 'git rev-parse --short HEAD' for vanilla flavour.
diff --git a/Makefile.defs b/Makefile.defs
index 97824b5..5b5c18a 100644
--- a/Makefile.defs
+++ b/Makefile.defs
@@ -155,7 +155,7 @@ INSTALL_FLAVOUR=$(FLAVOUR)
VERSION = 3
PATCHLEVEL = 0
SUBLEVEL = 1
-EXTRAVERSION =
+EXTRAVERSION := $(shell git rev-parse --short kamailio_3.0)
# memory debugger switcher
# 0 - off (release mode)
@@ -164,7 +164,7 @@ MEMDBG ?= 0
SER_VER = $(shell expr $(VERSION) \* 1000000 + $(PATCHLEVEL) \* 1000 + \
$(SUBLEVEL) )
-RELEASE:=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
+RELEASE:=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)-$(EXTRAVERSION)
OS := $(shell uname -s | sed -e s/SunOS/solaris/ -e s/CYGWIN.*/cygwin/ \
| tr "[A-Z]" "[a-z]")
Regards,
Ovidiu Sas
More information can be found at the following URL:
http://sip-router.org/tracker/index.php?do=details&task_id=43
You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.
Hello,
couple of developers from SIP and VoIP area are in Berlin this week and
plan to meet for dinner and beer Thursday, March 25, 19:00 at the
traditional place by now:
Lemke Brauhaus
Luisenplatz 1, 10585 Berlin
Across the corner with Charlottenburg Castle
http://www.brauhaus-lemke.com/index.php?area=4
If you are around, just pop up. You can write me if you need more
details about how to get there.
Cheers,
Daniel
--
Daniel-Constantin Mierla
* http://www.asipto.com/
Hello,
if you are a student (or you know a student) interested in working with
SIP Router over the summer, earning some money as well, please apply for
GSoC Conferencing Presence support (or forward this email).
The description of the project is done at:
http://www.sip-communicator.org/index.php/GSOC2010/Kamailio4575
If you have technical details about the project please ask them on
sr-dev(a)lists.sip-router.org. For GSoC related questions, please address
to: gsoc(a)sip-communicator.dev.java.net.
A good FAQ for applicants is available at:
http://www.sip-communicator.org/index.php/GSOC2010/HowToApply
Application must be done directly to the google site, link provided in
the FAQ.
I will be in charge of mentoring this particular project, helping you as
much as possible to understand the current presence server architecture
and the core API of sip router.
Cheers,
Daniel
--
Daniel-Constantin Mierla
* http://www.asipto.com/
